comparing 1f0b7387a7d017cbd32a882d79b23414f7011696 and main on gmstn.systems/gemstone-app

+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/gmstn.ts

···

       116
       116
        
           agent: Agent;

     

       117
       117
        
       }): Promise<Result<undefined, string>> => {

     

       118
       118
        
           const now = new Date();

     

       119
       119
       -
           const rkey = TID.create(now.getTime(), Math.random());

     

       119
       119
       +
           const rkey = TID.create(now.getTime() * 1_000, Math.random());

     

       120
       120
        
       

     

       121
       121
        
           const record: Omit<SystemsGmstnDevelopmentChannelInvite, "$type"> = {

     

       122
       122
        
               // @ts-expect-error we want to explicitly use the ISO string variant

+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