comparing f943d117bb716ceee33fe210449d59ef9bdd5ab6 and main on gmstn.systems/gemstone-app

+3 -9

src/components/Settings/LatticeInfo.tsx

···

       3
       3
        
       import type { AtUri } from "@/lib/types/atproto";

     

       4
       4
        
       import type { SystemsGmstnDevelopmentLattice } from "@/lib/types/lexicon/systems.gmstn.development.lattice";

     

       5
       5
        
       import { useCurrentPalette } from "@/providers/ThemeProvider";

     

       6
       6
       -
       import { getOwnerInfoFromLattice } from "@/queries/get-owner-info-from-lattice";

     

       7
       7
       -
       import { useQuery } from "@tanstack/react-query";

     

       6
       6
       +
       import { useLatticeInfoQuery } from "@/queries/hooks/useLatticeInfoQuery";

     

       8
       7
        
       import { BadgeCheck, X } from "lucide-react-native";

     

       9
       8
        
       import { View } from "react-native";

     

       10
       9
        
       

     
···

       17
       16
        
           };

     

       18
       17
        
       }) => {

     

       19
       18
        
           const latticeDomain = lattice.uri.rKey;

     

       20
       20
       -
           const { isLoading, data: latticeInfo } = useQuery({

     

       21
       21
       -
               queryKey: ["shardInfo", latticeDomain],

     

       22
       22
       -
               queryFn: async () => {

     

       23
       23
       -
                   return await getOwnerInfoFromLattice(latticeDomain);

     

       24
       24
       -
               },

     

       25
       25
       -
               retry: 1,

     

       26
       26
       -
           });

     

       19
       19
       +
           const { useQuery } = useLatticeInfoQuery(latticeDomain);

     

       20
       20
       +
           const { isLoading, data: latticeInfo } = useQuery();

     

       27
       21
        
           const { semantic } = useCurrentPalette();

     

       28
       22
        
       

     

       29
       23
        
           return (

+3 -9

src/components/Settings/ShardInfo.tsx

···

       3
       3
        
       import type { AtUri } from "@/lib/types/atproto";

     

       4
       4
        
       import type { SystemsGmstnDevelopmentShard } from "@/lib/types/lexicon/systems.gmstn.development.shard";

     

       5
       5
        
       import { useCurrentPalette } from "@/providers/ThemeProvider";

     

       6
       6
       -
       import { getOwnerInfoFromShard } from "@/queries/get-owner-info-from-shard";

     

       7
       7
       -
       import { useQuery } from "@tanstack/react-query";

     

       6
       6
       +
       import { useShardInfoQuery } from "@/queries/hooks/useShardInfoQuery";

     

       8
       7
        
       import { BadgeCheck, X } from "lucide-react-native";

     

       9
       8
        
       import { View } from "react-native";

     

       10
       9
        
       

     
···

       17
       16
        
           };

     

       18
       17
        
       }) => {

     

       19
       18
        
           const shardDomain = shard.uri.rKey;

     

       20
       20
       -
           const { isLoading, data: shardInfo } = useQuery({

     

       21
       21
       -
               queryKey: ["shardInfo", shardDomain],

     

       22
       22
       -
               queryFn: async () => {

     

       23
       23
       -
                   return await getOwnerInfoFromShard(shardDomain);

     

       24
       24
       -
               },

     

       25
       25
       -
               retry: 1,

     

       26
       26
       -
           });

     

       19
       19
       +
           const { useQuery } = useShardInfoQuery(shardDomain);

     

       20
       20
       +
           const { isLoading, data: shardInfo } = useQuery();

     

       27
       21
        
           const { semantic } = useCurrentPalette();

     

       28
       22
        
       

     

       29
       23
        
           return (

+17

src/queries/hooks/useLatticeInfoQuery.ts

···

       1
       1
       +
       import { getOwnerInfoFromLattice } from "@/queries/get-owner-info-from-lattice";

     

       2
       2
       +
       import { useQuery } from "@tanstack/react-query";

     

       3
       3
       +
       

     

       4
       4
       +
       export const useLatticeInfoQuery = (latticeDomain: string) => {

     

       5
       5
       +
           const queryKey = ["latticeInfo", latticeDomain];

     

       6
       6
       +
           return {

     

       7
       7
       +
               queryKey,

     

       8
       8
       +
               useQuery: () =>

     

       9
       9
       +
                   useQuery({

     

       10
       10
       +
                       queryKey,

     

       11
       11
       +
                       queryFn: async () => {

     

       12
       12
       +
                           return await getOwnerInfoFromLattice(latticeDomain);

     

       13
       13
       +
                       },

     

       14
       14
       +
                       retry: 1,

     

       15
       15
       +
                   }),

     

       16
       16
       +
           };

     

       17
       17
       +
       };

+17

src/queries/hooks/useShardInfoQuery.ts

···

       1
       1
       +
       import { getOwnerInfoFromShard } from "@/queries/get-owner-info-from-shard";

     

       2
       2
       +
       import { useQuery } from "@tanstack/react-query";

     

       3
       3
       +
       

     

       4
       4
       +
       export const useShardInfoQuery = (shardDomain: string) => {

     

       5
       5
       +
           const queryKey = ["shardInfo", shardDomain];

     

       6
       6
       +
           return {

     

       7
       7
       +
               queryKey,

     

       8
       8
       +
               useQuery: () =>

     

       9
       9
       +
                   useQuery({

     

       10
       10
       +
                       queryKey,

     

       11
       11
       +
                       queryFn: async () => {

     

       12
       12
       +
                           return await getOwnerInfoFromShard(shardDomain);

     

       13
       13
       +
                       },

     

       14
       14
       +
                       retry: 1,

     

       15
       15
       +
                   }),

     

       16
       16
       +
           };

     

       17
       17
       +
       };

+1 -5

src/queries/get-channels-from-pds.ts

···

       92
       92
        
       

     

       93
       93
        
               if (!success) return { ok: false, error: z.treeifyError(error) };

     

       94
       94
        
       

     

       95
       95
       -
               allRecords.push(

     

       96
       96
       -
                   ...responses.map((data) => {

     

       97
       97
       -
                       return data;

     

       98
       98
       -
                   }),

     

       99
       99
       -
               );

     

       95
       95
       +
               allRecords.push(...responses);

     

       100
       96
        
       

     

       101
       97
        
               if (records.length < 100) continueLoop = false;

     

       102
       98
        
               cursor = nextCursor;

+4 -5

src/queries/get-invites-from-pds.ts

···

       15
       15
        
       }): Promise<

     

       16
       16
        
           Result<

     

       17
       17
        
               Array<{

     

       18
       18
       +
                   cid: string;

     

       18
       19
        
                   uri: string;

     

       19
       20
        
                   value: SystemsGmstnDevelopmentChannelInvite;

     

       20
       21
        
               }>,

     
···

       41
       42
        
       }): Promise<

     

       42
       43
        
           Result<

     

       43
       44
        
               Array<{

     

       45
       45
       +
                   cid: string;

     

       44
       46
        
                   uri: string;

     

       45
       47
        
                   value: SystemsGmstnDevelopmentChannelInvite;

     

       46
       48
        
               }>,

     
···

       48
       50
        
           >

     

       49
       51
        
       > => {

     

       50
       52
        
           const allRecords: Array<{

     

       53
       53
       +
               cid: string;

     

       51
       54
        
               uri: string;

     

       52
       55
        
               value: SystemsGmstnDevelopmentChannelInvite;

     

       53
       56
        
           }> = [];

     
···

       86
       89
        
                   .safeParse(records);

     

       87
       90
        
               if (!success) return { ok: false, error: z.treeifyError(error) };

     

       88
       91
        
       

     

       89
       89
       -
               allRecords.push(

     

       90
       90
       -
                   ...responses.map((data) => {

     

       91
       91
       -
                       return { uri: data.uri, value: data.value };

     

       92
       92
       -
                   }),

     

       93
       93
       -
               );

     

       92
       92
       +
               allRecords.push(...responses);

     

       94
       93
        
       

     

       95
       94
        
               if (records.length < 100) continueLoop = false;

     

       96
       95
        
               cursor = nextCursor;

+4 -5

src/queries/get-lattices-from-pds.ts

···

       15
       15
        
       }): Promise<

     

       16
       16
        
           Result<

     

       17
       17
        
               Array<{

     

       18
       18
       +
                   cid: string;

     

       18
       19
        
                   uri: string;

     

       19
       20
        
                   value: SystemsGmstnDevelopmentLattice;

     

       20
       21
        
               }>,

     
···

       41
       42
        
       }): Promise<

     

       42
       43
        
           Result<

     

       43
       44
        
               Array<{

     

       45
       45
       +
                   cid: string;

     

       44
       46
        
                   uri: string;

     

       45
       47
        
                   value: SystemsGmstnDevelopmentLattice;

     

       46
       48
        
               }>,

     
···

       48
       50
        
           >

     

       49
       51
        
       > => {

     

       50
       52
        
           const allRecords: Array<{

     

       53
       53
       +
               cid: string;

     

       51
       54
        
               uri: string;

     

       52
       55
        
               value: SystemsGmstnDevelopmentLattice;

     

       53
       56
        
           }> = [];

     
···

       87
       90
        
       

     

       88
       91
        
               if (!success) return { ok: false, error: z.treeifyError(error) };

     

       89
       92
        
       

     

       90
       90
       -
               allRecords.push(

     

       91
       91
       -
                   ...responses.map((data) => {

     

       92
       92
       -
                       return { uri: data.uri, value: data.value };

     

       93
       93
       -
                   }),

     

       94
       94
       -
               );

     

       93
       93
       +
               allRecords.push(...responses);

     

       95
       94
        
       

     

       96
       95
        
               if (records.length < 100) continueLoop = false;

     

       97
       96
        
               cursor = nextCursor;

+4 -5

src/queries/get-shards-from-pds.ts

···

       17
       17
        
       }): Promise<

     

       18
       18
        
           Result<

     

       19
       19
        
               Array<{

     

       20
       20
       +
                   cid: string;

     

       20
       21
        
                   uri: string;

     

       21
       22
        
                   value: SystemsGmstnDevelopmentShard;

     

       22
       23
        
               }>,

     
···

       43
       44
        
       }): Promise<

     

       44
       45
        
           Result<

     

       45
       46
        
               Array<{

     

       47
       47
       +
                   cid: string;

     

       46
       48
        
                   uri: string;

     

       47
       49
        
                   value: SystemsGmstnDevelopmentShard;

     

       48
       50
        
               }>,

     
···

       50
       52
        
           >

     

       51
       53
        
       > => {

     

       52
       54
        
           const allRecords: Array<{

     

       55
       55
       +
               cid: string;

     

       53
       56
        
               uri: string;

     

       54
       57
        
               value: SystemsGmstnDevelopmentShard;

     

       55
       58
        
           }> = [];

     
···

       89
       92
        
       

     

       90
       93
        
               if (!success) return { ok: false, error: z.treeifyError(error) };

     

       91
       94
        
       

     

       92
       92
       -
               allRecords.push(

     

       93
       93
       -
                   ...responses.map((data) => {

     

       94
       94
       -
                       return { uri: data.uri, value: data.value };

     

       95
       95
       -
                   }),

     

       96
       96
       -
               );

     

       95
       95
       +
               allRecords.push(...responses);

     

       97
       96
        
       

     

       98
       97
        
               if (records.length < 100) continueLoop = false;

     

       99
       98
        
               cursor = nextCursor;

+6 -3

src/app/_layout.tsx

···

       16
       16
        
       import { Slot, SplashScreen } from "expo-router";

     

       17
       17
        
       import { useEffect } from "react";

     

       18
       18
        
       import { Platform, View } from "react-native";

     

       19
       19
       +
       import { GestureHandlerRootView } from "react-native-gesture-handler";

     

       19
       20
        
       

     

       20
       21
        
       const RootLayoutInner = () => {

     

       21
       22
        
           const [loaded, error] = useFonts({

     
···

       71
       72
        
       

     

       72
       73
        
       const RootLayout = () => {

     

       73
       74
        
           return (

     

       74
       74
       -
               <RootProviders>

     

       75
       75
       -
                   <RootLayoutInner />

     

       76
       76
       -
               </RootProviders>

     

       75
       75
       +
               <GestureHandlerRootView>

     

       76
       76
       +
                   <RootProviders>

     

       77
       77
       +
                       <RootLayoutInner />

     

       78
       78
       +
                   </RootProviders>

     

       79
       79
       +
               </GestureHandlerRootView>

     

       77
       80
        
           );

     

       78
       81
        
       };

     

       79
       82

+2 -2

src/components/Settings/LatticeSettings.tsx

···

       16
       16
        
           const { atoms, typography } = useFacet();

     

       17
       17
        
           const session = useOAuthSessionGuaranteed();

     

       18
       18
        
           const [showRegisterModal, setShowRegisterModal] = useState(false);

     

       19
       19
       -
           const { useQuery } = useLatticesQuery(session)

     

       19
       19
       +
           const { useQuery } = useLatticesQuery(session);

     

       20
       20
        
       

     

       21
       21
       -
           const { data: lattices, isLoading } = useQuery()

     

       21
       21
       +
           const { data: lattices, isLoading } = useQuery();

     

       22
       22
        
       

     

       23
       23
        
           return isLoading ? (

     

       24
       24
        
               <Loading />

+2 -2

src/components/Settings/ShardSettings.tsx

···

       16
       16
        
           const { atoms, typography } = useFacet();

     

       17
       17
        
           const session = useOAuthSessionGuaranteed();

     

       18
       18
        
           const [showRegisterModal, setShowRegisterModal] = useState(false);

     

       19
       19
       -
           const { useQuery } = useShardsQuery(session)

     

       19
       19
       +
           const { useQuery } = useShardsQuery(session);

     

       20
       20
        
       

     

       21
       21
       -
           const { data: shards, isLoading } = useQuery()

     

       21
       21
       +
           const { data: shards, isLoading } = useQuery();

     

       22
       22
        
       

     

       23
       23
        
           return isLoading ? (

     

       24
       24
        
               <Loading />

+5 -2

src/components/Settings/RegisterLatticeModalContent.tsx

···

       62
       62
        
                   },

     

       63
       63
        
               });

     

       64
       64
        
       

     

       65
       65
       +
           const readyToSubmit = !!inputText.trim();

     

       66
       66
       +
       

     

       65
       67
        
           return (

     

       66
       68
        
               <View

     

       67
       69
        
                   style={{

     
···

       98
       100
        
                       />

     

       99
       101
        
                   </View>

     

       100
       102
        
                   <Pressable

     

       103
       103
       +
                       disabled={!readyToSubmit}

     

       101
       104
        
                       onPress={() => {

     

       102
       105
        
                           newLatticeMutation();

     

       103
       106
        
                       }}

     
···

       108
       111
        
                           ) : (

     

       109
       112
        
                               <View

     

       110
       113
        
                                   style={{

     

       111
       111
       -
                                       backgroundColor: inputText.trim()

     

       114
       114
       +
                                       backgroundColor: readyToSubmit

     

       112
       115
        
                                           ? hovered

     

       113
       116
        
                                               ? lighten(semantic.primary, 7)

     

       114
       117
        
                                               : semantic.primary

     

       115
       118
        
                                           : registerError

     

       116
       119
        
                                             ? semantic.error

     

       117
       117
       -
                                             : semantic.border,

     

       120
       120
       +
                                             : semantic.textPlaceholder,

     

       118
       121
        
                                       borderRadius: atoms.radii.lg,

     

       119
       122
        
                                       alignItems: "center",

     

       120
       123
        
                                       paddingVertical: 10,

+5 -2

src/components/Settings/RegisterShardModalContent.tsx

···

       62
       62
        
                   },

     

       63
       63
        
               });

     

       64
       64
        
       

     

       65
       65
       +
           const readyToSubmit = !!inputText.trim();

     

       66
       66
       +
       

     

       65
       67
        
           return (

     

       66
       68
        
               <View

     

       67
       69
        
                   style={{

     
···

       98
       100
        
                       />

     

       99
       101
        
                   </View>

     

       100
       102
        
                   <Pressable

     

       103
       103
       +
                       disabled={!readyToSubmit}

     

       101
       104
        
                       onPress={() => {

     

       102
       105
        
                           newShardMutation();

     

       103
       106
        
                       }}

     
···

       108
       111
        
                           ) : (

     

       109
       112
        
                               <View

     

       110
       113
        
                                   style={{

     

       111
       111
       -
                                       backgroundColor: inputText.trim()

     

       114
       114
       +
                                       backgroundColor: readyToSubmit

     

       112
       115
        
                                           ? hovered

     

       113
       116
        
                                               ? lighten(semantic.primary, 7)

     

       114
       117
        
                                               : semantic.primary

     

       115
       118
        
                                           : registerError

     

       116
       119
        
                                             ? semantic.error

     

       117
       117
       -
                                             : semantic.border,

     

       120
       120
       +
                                             : semantic.textPlaceholder,

     

       118
       121
        
                                       borderRadius: atoms.radii.lg,

     

       119
       122
        
                                       alignItems: "center",

     

       120
       123
        
                                       paddingVertical: 10,

+2 -5

src/components/Settings/ChannelInfo.tsx

···

       2
       2
        
       import { InviteUserModalContent } from "@/components/Settings/InviteUserModalContent";

     

       3
       3
        
       import { useFacet } from "@/lib/facet";

     

       4
       4
        
       import { fade } from "@/lib/facet/src/lib/colors";

     

       5
       5
       -
       import type { AtUri } from "@/lib/types/atproto";

     

       6
       5
        
       import type { SystemsGmstnDevelopmentChannel } from "@/lib/types/lexicon/systems.gmstn.development.channel";

     

       7
       7
       -
       import { atUriToString } from "@/lib/utils/atproto";

     

       8
       6
        
       import { useCurrentPalette } from "@/providers/ThemeProvider";

     

       9
       7
        
       import { Hash, UserRoundPlus } from "lucide-react-native";

     

       10
       8
        
       import { useState } from "react";

     
···

       15
       13
        
       }: {

     

       16
       14
        
           channel: {

     

       17
       15
        
               value: SystemsGmstnDevelopmentChannel;

     

       18
       18
       -
               uri: Required<AtUri>;

     

       16
       16
       +
               uriStr: string;

     

       19
       17
        
               cid: string;

     

       20
       18
        
           };

     

       21
       19
        
       }) => {

     

       22
       20
        
           const { semantic } = useCurrentPalette();

     

       23
       21
        
           const { atoms } = useFacet();

     

       24
       22
        
           const [showInviteModal, setShowInviteModal] = useState(false);

     

       25
       25
       -
           const channelAtUri = atUriToString(channel.uri);

     

       26
       23
        
       

     

       27
       24
        
           return (

     

       28
       25
        
               <View style={{ flexDirection: "row", alignItems: "center", gap: 4 }}>

     
···

       80
       77
        
                           >

     

       81
       78
        
                               <InviteUserModalContent

     

       82
       79
        
                                   setShowInviteModal={setShowInviteModal}

     

       83
       83
       -
                                   channelAtUri={channelAtUri}

     

       80
       80
       +
                                   channelAtUri={channel.uriStr}

     

       84
       81
        
                                   channelCid={channel.cid}

     

       85
       82
        
                               />

     

       86
       83
        
                           </Pressable>

+1 -1

src/components/Settings/ChannelSettings.tsx

···

       98
       98
        
                                           { color: semantic.textInverse },

     

       99
       99
        
                                       ]}

     

       100
       100
        
                                   >

     

       101
       101
       -
                                      Add 

     

       101
       101
       +
                                       Add

     

       102
       102
        
                                   </Text>

     

       103
       103
        
                               </View>

     

       104
       104
        
                           )}

-1

src/components/Settings/InviteUserModalContent.tsx

···

       61
       61
        
                               $type: "com.atproto.repo.strongRef",

     

       62
       62
        
                           },

     

       63
       63
        
                       });

     

       64
       64
       -
                       console.log(inviteRes)

     

       65
       64
        
                       if (!inviteRes.ok) throw new Error(inviteRes.error);

     

       66
       65
        
                   },

     

       67
       66
        
                   onSuccess: async () => {

+3

src/components/Navigation/TopBar/ProfileModalContent.tsx

···

       29
       29
        
                   <Link href="/profile" style={listItemStyles} asChild>

     

       30
       30
        
                       <LinkText label="Profile" />

     

       31
       31
        
                   </Link>

     

       32
       32
       +
                   <Link href="/invites" style={listItemStyles} asChild>

     

       33
       33
       +
                       <LinkText label="Invites" />

     

       34
       34
       +
                   </Link>

     

       32
       35
        
                   <Link href="/settings" style={listItemStyles} asChild>

     

       33
       36
        
                       <LinkText label="Settings" />

     

       34
       37
        
                   </Link>

+4

src/lib/consts.ts

···

       19
       19
        
       };

     

       20
       20
        
       

     

       21
       21
        
       export const DEFAULT_STALE_TIME = 5 * 60 * 1000;

     

       22
       22
       +
       

     

       23
       23
       +
       export const CONSTELLATION_URL = new URL(

     

       24
       24
       +
           "https://constellation.microcosm.blue/",

     

       25
       25
       +
       );

+18

src/lib/types/constellation.ts

···

       1
       1
       +
       import { didSchema, nsidSchema } from "@/lib/types/atproto";

     

       2
       2
       +
       import { z } from "zod";

     

       3
       3
       +
       

     

       4
       4
       +
       export const constellationBacklinkSchema = z.object({

     

       5
       5
       +
           did: didSchema,

     

       6
       6
       +
           collection: nsidSchema,

     

       7
       7
       +
           rkey: z.string(),

     

       8
       8
       +
       });

     

       9
       9
       +
       export type ConstellationBacklink = z.infer<typeof constellationBacklinkSchema>;

     

       10
       10
       +
       

     

       11
       11
       +
       export const constellationBacklinkResponseSchema = z.object({

     

       12
       12
       +
           total: z.number(),

     

       13
       13
       +
           records: z.array(constellationBacklinkSchema),

     

       14
       14
       +
           cursor: z.optional(z.string().nullish()),

     

       15
       15
       +
       });

     

       16
       16
       +
       export type ConstellationBacklinkResponse = z.infer<

     

       17
       17
       +
           typeof constellationBacklinkResponseSchema

     

       18
       18
       +
       >;

+2 -5

src/lib/utils/constellation.ts

···

       1
       1
        
       import { CONSTELLATION_URL } from "@/lib/consts";

     

       2
       2
       -
       import type {

     

       3
       3
       -
           ConstellationBacklinkResponse} from "@/lib/types/constellation";

     

       4
       4
       -
       import {

     

       5
       5
       -
           constellationBacklinkResponseSchema,

     

       6
       6
       -
       } from "@/lib/types/constellation";

     

       2
       2
       +
       import type { ConstellationBacklinkResponse } from "@/lib/types/constellation";

     

       3
       3
       +
       import { constellationBacklinkResponseSchema } from "@/lib/types/constellation";

     

       7
       4
        
       import type { Result } from "@/lib/utils/result";

     

       8
       5
        
       import type { ZodError } from "zod";

     

       9
       6

+2

src/queries/get-invites-from-constellation.ts

···

       19
       19
        
               unknown

     

       20
       20
        
           >

     

       21
       21
        
       > => {

     

       22
       22
       +
           // FIXME: If there are too many records, we can't get them all

     

       23
       23
       +
           // because we aren't tracking the cursor and looping calls to get the backlinks

     

       22
       24
        
           const backlinksResult = await getConstellationBacklinks({

     

       23
       25
        
               subject: did,

     

       24
       26
        
               source: {

+17

src/lib/utils/arrays.ts

···

       1
       1
       +
       export const partition = <T>(

     

       2
       2
       +
           array: Array<T>,

     

       3
       3
       +
           predicate: (value: T, index: number, array: Array<T>) => boolean,

     

       4
       4
       +
       ): [Array<T>, Array<T>] => {

     

       5
       5
       +
           const truthy: Array<T> = [];

     

       6
       6
       +
           const falsy: Array<T> = [];

     

       7
       7
       +
       

     

       8
       8
       +
           array.forEach((value, index, arr) => {

     

       9
       9
       +
               if (predicate(value, index, arr)) {

     

       10
       10
       +
                   truthy.push(value);

     

       11
       11
       +
               } else {

     

       12
       12
       +
                   falsy.push(value);

     

       13
       13
       +
               }

     

       14
       14
       +
           });

     

       15
       15
       +
       

     

       16
       16
       +
           return [truthy, falsy];

     

       17
       17
       +
       };

+2

src/queries/hooks/useConstellationInvitesQuery.ts

···

       2
       2
        
       import type { OAuthSession } from "@atproto/oauth-client";

     

       3
       3
        
       import { useQuery } from "@tanstack/react-query";

     

       4
       4
        
       

     

       5
       5
       +
       // TODO: use prism instead, so that we can get the backlink, the invite, and the channel's actual record

     

       6
       6
       +
       // and not just the strongRef.

     

       5
       7
        
       export const useConstellationInvitesQuery = (session: OAuthSession) => {

     

       6
       8
        
           const queryKey = ["invites", session.did];

     

       7
       9
        
           return {

+21

src/queries/get-invite-from-pds.ts

···

       1
       1
       +
       import type { AtUri } from "@/lib/types/atproto";

     

       2
       2
       +
       import type { SystemsGmstnDevelopmentChannelInvite } from "@/lib/types/lexicon/systems.gmstn.development.channel.invite";

     

       3
       3
       +
       import { systemsGmstnDevelopmentChannelInviteRecordSchema } from "@/lib/types/lexicon/systems.gmstn.development.channel.invite";

     

       4
       4
       +
       import { getRecordFromFullAtUri } from "@/lib/utils/atproto";

     

       5
       5
       +
       import type { Result } from "@/lib/utils/result";

     

       6
       6
       +
       

     

       7
       7
       +
       export const getInviteFromPds = async (

     

       8
       8
       +
           atUri: Required<AtUri>,

     

       9
       9
       +
       ): Promise<Result<SystemsGmstnDevelopmentChannelInvite, unknown>> => {

     

       10
       10
       +
           const record = await getRecordFromFullAtUri(atUri);

     

       11
       11
       +
           if (!record.ok) return { ok: false, error: record.error };

     

       12
       12
       +
       

     

       13
       13
       +
           const {

     

       14
       14
       +
               success,

     

       15
       15
       +
               error,

     

       16
       16
       +
               data: invite,

     

       17
       17
       +
           } = systemsGmstnDevelopmentChannelInviteRecordSchema.safeParse(record.data);

     

       18
       18
       +
           if (!success) return { ok: false, error };

     

       19
       19
       +
       

     

       20
       20
       +
           return { ok: true, data: invite };

     

       21
       21
       +
       };

+30

src/queries/hooks/useInviteQuery.ts

···

       1
       1
       +
       import type { AtUri } from "@/lib/types/atproto";

     

       2
       2
       +
       import { getInviteFromPds } from "@/queries/get-invite-from-pds";

     

       3
       3
       +
       import { useQuery } from "@tanstack/react-query";

     

       4
       4
       +
       

     

       5
       5
       +
       export const useInviteQuery = (atUri: Required<AtUri>) => {

     

       6
       6
       +
           const queryKey = ["invite", atUri.authority, atUri.rKey];

     

       7
       7
       +
           return {

     

       8
       8
       +
               queryKey,

     

       9
       9
       +
               useQuery: () =>

     

       10
       10
       +
                   useQuery({

     

       11
       11
       +
                       queryKey,

     

       12
       12
       +
                       queryFn: async () => {

     

       13
       13
       +
                           return await pdsInviteQueryFn(atUri);

     

       14
       14
       +
                       },

     

       15
       15
       +
                   }),

     

       16
       16
       +
           };

     

       17
       17
       +
       };

     

       18
       18
       +
       

     

       19
       19
       +
       const pdsInviteQueryFn = async (atUri: Required<AtUri>) => {

     

       20
       20
       +
           const invites = await getInviteFromPds(atUri);

     

       21
       21
       +
       

     

       22
       22
       +
           if (!invites.ok) {

     

       23
       23
       +
               console.error("pdsInviteQueryFn error.", invites.error);

     

       24
       24
       +
               throw new Error(

     

       25
       25
       +
                   `Something went wrong while getting the user's invite record directly.}`,

     

       26
       26
       +
               );

     

       27
       27
       +
           }

     

       28
       28
       +
       

     

       29
       29
       +
           return invites.data;

     

       30
       30
       +
       };

+1

src/providers/authed/MembershipsProvider.tsx

···

       94
       94
        
           const { session, isLoading, agent } = oauth;

     

       95
       95
        
           const isOAuthReady = !isLoading && !!agent && !!session;

     

       96
       96
        
       

     

       97
       97
       +
           // TODO: move this to own query hook

     

       97
       98
        
           const membershipsQuery = useQuery({

     

       98
       99
        
               queryKey: ["membership", session?.did],

     

       99
       100
        
               enabled: isOAuthReady,

+15 -15

src/queries/initiate-handshake-to.ts

···

       24
       24
        
           if (!latticeUrlResult.ok)

     

       25
       25
        
               return { ok: false, error: latticeUrlResult.error };

     

       26
       26
        
       

     

       27
       27
       -
           let jwt = "";

     

       28
       28
       -
           if (did.startsWith("did:web:localhost")) {

     

       29
       29
       -
               if (__DEV__)

     

       30
       30
       -
                   jwt = await requestInterServiceJwtFromPds({ oauth, aud: did });

     

       31
       31
       -
               else

     

       32
       32
       -
                   return {

     

       33
       33
       -
                       ok: false,

     

       34
       34
       -
                       error: `Cannot initiate handshake to a lattice at localhost. Provided handshake target's DID was ${did}`,

     

       35
       35
       -
                   };

     

       36
       36
       -
           } else {

     

       37
       37
       -
               // do proxy

     

       38
       38
       -
               // for now we return error

     

       39
       39
       -
               // FIXME: actually do service proxying.

     

       40
       40
       -
               return { ok: false, error: "Service proxying not yet implemented" };

     

       41
       41
       -
           }

     

       27
       27
       +
           // FIXME: actually do service proxying.

     

       28
       28
       +
           const jwt = await requestInterServiceJwtFromPds({ oauth, aud: did });

     

       29
       29
       +
           // if (did.startsWith("did:web:localhost")) {

     

       30
       30
       +
           //     if (__DEV__)

     

       31
       31
       +
           //         jwt = await requestInterServiceJwtFromPds({ oauth, aud: did });

     

       32
       32
       +
           //     else

     

       33
       33
       +
           //         return {

     

       34
       34
       +
           //             ok: false,

     

       35
       35
       +
           //             error: `Cannot initiate handshake to a lattice at localhost. Provided handshake target's DID was ${did}`,

     

       36
       36
       +
           //         };

     

       37
       37
       +
           // } else {

     

       38
       38
       +
           //     // do proxy

     

       39
       39
       +
           //     // for now we return error

     

       40
       40
       +
           //     return { ok: false, error: "Service proxying not yet implemented" };

     

       41
       41
       +
           // }

     

       42
       42
        
       

     

       43
       43
        
           const latticeBaseUrl = latticeUrlResult.data.origin;

     

       44
       44

+67 -1

src/lib/utils/atproto/index.ts

···

       9
       9
        
           atUriAuthoritySchema,

     

       10
       10
        
           nsidSchema,

     

       11
       11
        
       } from "@/lib/types/atproto";

     

       12
       12
       -
       import { comAtprotoRepoGetRecordResponseSchema } from "@/lib/types/lexicon/com.atproto.repo.getRecord";

     

       12
       12
       +
       import type {

     

       13
       13
       +
           ComAtprotoRepoGetRecordResponse} from "@/lib/types/lexicon/com.atproto.repo.getRecord";

     

       14
       14
       +
       import {

     

       15
       15
       +
           comAtprotoRepoGetRecordResponseSchema,

     

       16
       16
       +
       } from "@/lib/types/lexicon/com.atproto.repo.getRecord";

     

       13
       17
        
       import type { Result } from "@/lib/utils/result";

     

       14
       18
        
       import type { DidDocumentResolver } from "@atcute/identity-resolver";

     

       15
       19
        
       import {

     
···

       84
       88
        
           return { ok: true, data: record.value };

     

       85
       89
        
       };

     

       86
       90
        
       

     

       91
       91
       +
       export const getCommitFromFullAtUri = async ({

     

       92
       92
       +
           authority,

     

       93
       93
       +
           collection,

     

       94
       94
       +
           rKey,

     

       95
       95
       +
       }: AtUri): Promise<Result<ComAtprotoRepoGetRecordResponse, unknown>> => {

     

       96
       96
       +
           const didDocResult = await resolveDidDoc(authority);

     

       97
       97
       +
           if (!didDocResult.ok) return { ok: false, error: didDocResult.error };

     

       98
       98
       +
       

     

       99
       99
       +
           if (!collection || !rKey)

     

       100
       100
       +
               return {

     

       101
       101
       +
                   ok: false,

     

       102
       102
       +
                   error: "No rkey or collection found in provided AtUri object",

     

       103
       103
       +
               };

     

       104
       104
       +
       

     

       105
       105
       +
           const { service: services } = didDocResult.data;

     

       106
       106
       +
           if (!services)

     

       107
       107
       +
               return {

     

       108
       108
       +
                   ok: false,

     

       109
       109
       +
                   error: { message: "Resolved DID document has no service field." },

     

       110
       110
       +
               };

     

       111
       111
       +
       

     

       112
       112
       +
           const pdsService = services.find(

     

       113
       113
       +
               (service) =>

     

       114
       114
       +
                   service.id === "#atproto_pds" &&

     

       115
       115
       +
                   service.type === "AtprotoPersonalDataServer",

     

       116
       116
       +
           );

     

       117
       117
       +
       

     

       118
       118
       +
           if (!pdsService)

     

       119
       119
       +
               return {

     

       120
       120
       +
                   ok: false,

     

       121
       121
       +
                   error: {

     

       122
       122
       +
                       message:

     

       123
       123
       +
                           "Resolved DID document has no PDS service listed in the document.",

     

       124
       124
       +
                   },

     

       125
       125
       +
               };

     

       126
       126
       +
       

     

       127
       127
       +
           const pdsEndpointRecord = pdsService.serviceEndpoint;

     

       128
       128
       +
           let pdsEndpointUrl;

     

       129
       129
       +
           try {

     

       130
       130
       +
               // @ts-expect-error yes, we are coercing something that is explicitly not a string into a string, but in this case we want to be specific. only serviceEndpoints with valid atproto pds URLs should be allowed.

     

       131
       131
       +
               pdsEndpointUrl = new URL(pdsEndpointRecord).origin;

     

       132
       132
       +
           } catch (err) {

     

       133
       133
       +
               return { ok: false, error: err };

     

       134
       134
       +
           }

     

       135
       135
       +
           const req = new Request(

     

       136
       136
       +
               `${pdsEndpointUrl}/xrpc/com.atproto.repo.getRecord?repo=${didDocResult.data.id}&collection=${collection}&rkey=${rKey}`,

     

       137
       137
       +
           );

     

       138
       138
       +
       

     

       139
       139
       +
           const res = await fetch(req);

     

       140
       140
       +
           const data: unknown = await res.json();

     

       141
       141
       +
       

     

       142
       142
       +
           const {

     

       143
       143
       +
               success: responseParseSuccess,

     

       144
       144
       +
               error: responseParseError,

     

       145
       145
       +
               data: record,

     

       146
       146
       +
           } = comAtprotoRepoGetRecordResponseSchema.safeParse(data);

     

       147
       147
       +
           if (!responseParseSuccess) {

     

       148
       148
       +
               return { ok: false, error: responseParseError };

     

       149
       149
       +
           }

     

       150
       150
       +
           return { ok: true, data: record };

     

       151
       151
       +
       };

     

       152
       152
       +
       

     

       87
       153
        
       export const didDocResolver: DidDocumentResolver =

     

       88
       154
        
           new CompositeDidDocumentResolver({

     

       89
       155
        
               methods: {

+1 -1

assets/oauth-client-metadata.json

···

       3
       3
        
           "client_name": "Gemstone",

     

       4
       4
        
           "client_uri": "https://app.gmstn.systems",

     

       5
       5
        
           "redirect_uris": [

     

       6
       6
       -
               "systems.gmstn.app:/oauth/callback"

     

       6
       6
       +
               "systems.gmstn.app:/login/"

     

       7
       7
        
           ],

     

       8
       8
        
           "scope": "atproto transition:generic",

     

       9
       9
        
           "token_endpoint_auth_method": "none",

+3 -1

package.json

···

       13
       13
        
               "dev:web": "expo start --web",

     

       14
       14
        
               "dev:android": "expo start --android",

     

       15
       15
        
               "dev:ios": "expo start --ios",

     

       16
       16
       -
               "dev:expo": "expo start"

     

       16
       16
       +
               "dev:expo": "expo start",

     

       17
       17
       +
               "export:web": "expo export -p web",

     

       18
       18
       +
               "export:web:serve": "expo serve"

     

       17
       19
        
           },

     

       18
       20
        
           "dependencies": {

     

       19
       21
        
               "@atcute/atproto": "^3.1.7",

+7 -5

src/components/Chat/index.tsx

···

       13
       13
        
       

     

       14
       14
        
       export const Chat = ({ channelAtUri }: { channelAtUri: AtUri }) => {

     

       15
       15
        
           const [inputText, setInputText] = useState("");

     

       16
       16
       -
           const { messages, sendMessageToChannel, isConnected } =

     

       17
       17
       -
               useChannel(channelAtUri);

     

       18
       16
        
           const record = useChannelRecordByAtUriObject(channelAtUri);

     

       19
       17
        
           const { semantic } = useCurrentPalette();

     

       20
       18
        
           const { typography, atoms } = useFacet();

     

       19
       19
       +
           const channel = useChannel(channelAtUri);

     

       20
       20
       +
           const { isLoading } = useProfile();

     

       21
       21
       +
       

     

       22
       22
       +
           if (!channel) return <></>;

     

       23
       23
       +
       

     

       24
       24
       +
           const { messages, sendMessageToChannel, isConnected } = channel;

     

       21
       25
        
       

     

       22
       26
        
           const handleSend = () => {

     

       23
       27
        
               if (inputText.trim()) {

     
···

       26
       30
        
               }

     

       27
       31
        
           };

     

       28
       32
        
       

     

       29
       29
       -
           const { isLoading } = useProfile();

     

       30
       30
       -
       

     

       31
       33
        
           if (!record)

     

       32
       34
        
               return (

     

       33
       35
        
                   <View>

     

       34
       36
        
                       <Text>

     

       35
       35
       -
                           Something has gone wrong. Could not resolve channel record

     

       37
       37
       +
                           Something has gone wrong.Could not resolve channel record

     

       36
       38
        
                           from given at:// URI.

     

       37
       39
        
                       </Text>

     

       38
       40
        
                   </View>

+17 -9

src/lib/hooks/useChannel.ts

···

       20
       20
        
           const { sessionInfo, socket } = findChannelSession(channel);

     

       21
       21
        
       

     

       22
       22
        
           useEffect(() => {

     

       23
       23
       -
               if (!sessionInfo)

     

       24
       24
       -
                   throw new Error(

     

       23
       23
       +
               if (!sessionInfo) {

     

       24
       24
       +
                   console.warn(

     

       25
       25
        
                       "Channel did not resolve to a valid sessionInfo object.",

     

       26
       26
        
                   );

     

       27
       27
       -
               if (!socket)

     

       28
       28
       -
                   throw new Error(

     

       27
       27
       +
                   return;

     

       28
       28
       +
               }

     

       29
       29
       +
               if (!socket) {

     

       30
       30
       +
                   console.warn(

     

       29
       31
        
                       "Session info did not resolve to a valid websocket connection. This should not happen and is likely a bug. Check the sessions map object.",

     

       30
       32
        
                   );

     

       33
       33
       +
                   return;

     

       34
       34
       +
               }

     

       31
       35
        
       

     

       32
       36
        
               // attach handlers here

     

       33
       37
        
       

     
···

       117
       121
        
               };

     

       118
       122
        
           }, [socket, sessionInfo, channel]);

     

       119
       123
        
       

     

       120
       120
       -
           if (!oAuthSession) throw new Error("No OAuth session");

     

       121
       121
       -
           if (!sessionInfo)

     

       122
       122
       -
               throw new Error(

     

       124
       124
       +
           if (!oAuthSession) {console.warn("No OAuth session"); return }

     

       125
       125
       +
           if (!sessionInfo) {

     

       126
       126
       +
               console.warn(

     

       123
       127
        
                   "Channel did not resolve to a valid sessionInfo object.",

     

       124
       128
        
               );

     

       125
       125
       -
           if (!socket)

     

       126
       126
       -
               throw new Error(

     

       129
       129
       +
               return;

     

       130
       130
       +
           }

     

       131
       131
       +
           if (!socket) {

     

       132
       132
       +
               console.warn(

     

       127
       133
        
                   "Session info did not resolve to a valid websocket connection. This should not happen and is likely a bug. Check the sessions map object.",

     

       128
       134
        
               );

     

       135
       135
       +
               return;

     

       136
       136
       +
           }

     

       129
       137
        
       

     

       130
       138
        
           const channelStringified = atUriToString(channel);

     

       131
       139

+1 -3

src/providers/authed/SessionsProvider.tsx

···

       98
       98
        
       

     

       99
       99
        
                   console.log("tried to find", channel);

     

       100
       100
        
                   if (!sessionInfo)

     

       101
       101
       -
                       throw new Error(

     

       102
       102
       -
                           "Provided channel at:// URI (object) could not be found in any existing lattice sessions",

     

       103
       103
       -
                       );

     

       101
       101
       +
                       return { sessionInfo: undefined, socket: undefined };

     

       104
       102
        
       

     

       105
       103
        
                   return { sessionInfo, socket: sessionsMap.get(sessionInfo) };

     

       106
       104
        
               },

+1 -1

src/lib/utils/atproto/oauth.web.ts

···

       6
       6
        
       } from "@atproto/oauth-client-browser";

     

       7
       7
        
       import type { ExpoOAuthClientOptions } from "@atproto/oauth-client-expo";

     

       8
       8
        
       import { ExpoOAuthClient as PbcWebExpoOAuthClient } from "@atproto/oauth-client-expo";

     

       9
       9
       -
       import oAuthMetadata from "../../../../assets/oauth-client-metadata.json";

     

       9
       9
       +
       import oAuthMetadata from "../../../../public/oauth-client-metadata.json";

     

       10
       10
        
       import { __DEV__loopbackOAuthMetadata } from "@/lib/consts";

     

       11
       11
        
       

     

       12
       12
        
       // suuuuuch a hack holy shit

+82 -23

src/components/Auth/Login.web.tsx

···

       1
       1
       +
       import { GmstnLogoColor } from "@/components/icons/gmstn/GmstnLogoColor";

     

       2
       2
       +
       import { Text } from "@/components/primitives/Text";

     

       3
       3
       +
       import { useFacet } from "@/lib/facet";

     

       4
       4
       +
       import { lighten } from "@/lib/facet/src/lib/colors";

     

       1
       5
        
       import { useOAuthSetter, useOAuthValue } from "@/providers/OAuthProvider";

     

       6
       6
       +
       import { useCurrentPalette } from "@/providers/ThemeProvider";

     

       2
       7
        
       import { Agent } from "@atproto/api";

     

       8
       8
       +
       import { ArrowRight } from "lucide-react-native";

     

       3
       9
        
       import { useState } from "react";

     

       4
       4
       -
       import { Button, StyleSheet, TextInput, View } from "react-native";

     

       10
       10
       +
       import { Pressable, TextInput, View } from "react-native";

     

       5
       11
        
       

     

       6
       12
        
       export const Login = () => {

     

       13
       13
       +
           const { semantic } = useCurrentPalette();

     

       14
       14
       +
           const { atoms, typography } = useFacet();

     

       7
       15
        
           const [atprotoHandle, setAtprotoHandle] = useState("");

     

       8
       16
        
           const oAuth = useOAuthValue();

     

       9
       17
        
           const setOAuth = useOAuthSetter();

     
···

       30
       38
        
           };

     

       31
       39
        
       

     

       32
       40
        
           return (

     

       33
       33
       -
               <View>

     

       34
       34
       -
                   <TextInput

     

       35
       35
       -
                       style={styles.input}

     

       36
       36
       -
                       value={atprotoHandle}

     

       37
       37
       -
                       onChangeText={setAtprotoHandle}

     

       38
       38
       -
                       placeholder="alice.bsky.social"

     

       39
       39
       -
                       onSubmitEditing={handleSubmit}

     

       40
       40
       -
                   />

     

       41
       41
       -
                   <Button title="Log in with your PDS ->" onPress={handleSubmit} />

     

       41
       41
       +
               <View

     

       42
       42
       +
                   style={{

     

       43
       43
       +
                       flex: 1,

     

       44
       44
       +
                       flexDirection: "column",

     

       45
       45
       +
                       alignItems: "center",

     

       46
       46
       +
                       justifyContent: "center",

     

       47
       47
       +
                       gap: 16,

     

       48
       48
       +
                   }}

     

       49
       49
       +
               >

     

       50
       50
       +
                   <View style={{ alignItems: "center" }}>

     

       51
       51
       +
                       <View style={{ padding: 8, paddingLeft: 12, paddingTop: 12 }}>

     

       52
       52
       +
                           <GmstnLogoColor height={36} width={36} />

     

       53
       53
       +
                       </View>

     

       54
       54
       +
                       <Text

     

       55
       55
       +
                           style={[

     

       56
       56
       +
                               typography.sizes.xl,

     

       57
       57
       +
                               typography.weights.byName.medium,

     

       58
       58
       +
                           ]}

     

       59
       59
       +
                       >

     

       60
       60
       +
                           Gemstone

     

       61
       61
       +
                       </Text>

     

       62
       62
       +
                   </View>

     

       63
       63
       +
                   <View style={{ gap: 10 }}>

     

       64
       64
       +
                       <TextInput

     

       65
       65
       +
                           style={[{

     

       66
       66
       +
                               flex: 1,

     

       67
       67
       +
                               borderWidth: 1,

     

       68
       68
       +
                               borderColor: semantic.border,

     

       69
       69
       +
                               borderRadius: atoms.radii.lg,

     

       70
       70
       +
                               paddingHorizontal: 14,

     

       71
       71
       +
                               paddingVertical: 12,

     

       72
       72
       +
                               marginRight: 8,

     

       73
       73
       +
                               fontSize: 16,

     

       74
       74
       +
                               color: semantic.text

     

       75
       75
       +
                           }, typography.weights.byName.light]}

     

       76
       76
       +
                           value={atprotoHandle}

     

       77
       77
       +
                           onChangeText={setAtprotoHandle}

     

       78
       78
       +
                           placeholder="alice.bsky.social"

     

       79
       79
       +
                           onSubmitEditing={handleSubmit}

     

       80
       80
       +
                           placeholderTextColor={semantic.textPlaceholder}

     

       81
       81
       +
                       />

     

       82
       82
       +
                       <Pressable onPress={handleSubmit}>

     

       83
       83
       +
                           {({ hovered }) => (

     

       84
       84
       +
                               <View

     

       85
       85
       +
                                   style={{

     

       86
       86
       +
                                       backgroundColor: hovered

     

       87
       87
       +
                                           ? lighten(semantic.primary, 7)

     

       88
       88
       +
                                           : semantic.primary,

     

       89
       89
       +
                                       flexDirection: "row",

     

       90
       90
       +
                                       gap: 4,

     

       91
       91
       +
                                       alignItems: "center",

     

       92
       92
       +
                                       justifyContent: "center",

     

       93
       93
       +
                                       paddingVertical: 10,

     

       94
       94
       +
                                       borderRadius: atoms.radii.lg,

     

       95
       95
       +
                                   }}

     

       96
       96
       +
                               >

     

       97
       97
       +
                                   <Text

     

       98
       98
       +
                                       style={[

     

       99
       99
       +
                                           { color: semantic.textInverse },

     

       100
       100
       +
                                           typography.weights.byName.normal,

     

       101
       101
       +
                                       ]}

     

       102
       102
       +
                                   >

     

       103
       103
       +
                                       Log in with ATProto

     

       104
       104
       +
                                   </Text>

     

       105
       105
       +
                                   <ArrowRight

     

       106
       106
       +
                                       height={16}

     

       107
       107
       +
                                       width={16}

     

       108
       108
       +
                                       color={semantic.textInverse}

     

       109
       109
       +
                                   />

     

       110
       110
       +
                               </View>

     

       111
       111
       +
                           )}

     

       112
       112
       +
                       </Pressable>

     

       113
       113
       +
                   </View>

     

       42
       114
        
               </View>

     

       43
       115
        
           );

     

       44
       116
        
       };

     

       45
       45
       -
       

     

       46
       46
       -
       const styles = StyleSheet.create({

     

       47
       47
       -
           input: {

     

       48
       48
       -
               flex: 1,

     

       49
       49
       -
               borderWidth: 1,

     

       50
       50
       -
               borderColor: "#ccc",

     

       51
       51
       -
               borderRadius: 8,

     

       52
       52
       -
               paddingHorizontal: 12,

     

       53
       53
       -
               paddingVertical: 8,

     

       54
       54
       -
               marginRight: 8,

     

       55
       55
       -
               fontSize: 16,

     

       56
       56
       -
           },

     

       57
       57
       -
       });

Compare changes