Live video on the AT Protocol
stream.place
Compare changes
Choose any two refs to compare.
+1
js/app/components/login/login.tsx
+1
js/app/components/login/login.tsx
+6
-1
js/app/features/bluesky/blueskyProvider.tsx
+6
-1
js/app/features/bluesky/blueskyProvider.tsx
···
2
2
import { storage } from "@streamplace/components";
3
3
import { useURL } from "expo-linking";
4
4
import { useEffect, useState } from "react";
5
+
import { Platform } from "react-native";
5
6
import { useStore } from "store";
6
7
import { useIsReady, useOAuthSession, useUserProfile } from "store/hooks";
7
8
import { navigateToRoute } from "utils/navigation";
···
23
24
loadOAuthClient();
24
25
25
26
// load return route from storage on mount
27
+
if (Platform.OS !== "web") {
28
+
return;
29
+
}
26
30
storage.getItem("returnRoute").then((stored) => {
27
31
if (stored) {
28
32
try {
···
82
86
if (
83
87
lastAuthStatus !== "loggedIn" &&
84
88
authStatus === "loggedIn" &&
85
-
returnRoute
89
+
returnRoute &&
90
+
Platform.OS === "web"
86
91
) {
87
92
console.log(
88
93
"Login successful, navigating back to returnRoute:",
+8
-3
js/app/hooks/useBlueskyNotifications.tsx
+8
-3
js/app/hooks/useBlueskyNotifications.tsx
···
1
1
import { useToast } from "@streamplace/components";
2
2
import { CircleX } from "lucide-react-native";
3
3
import { useEffect } from "react";
4
+
import { Platform } from "react-native";
5
+
import clearQueryParams from "utils/clear-query-params";
4
6
import { useStore } from "../store";
5
7
6
8
function titleCase(str: string) {
···
18
20
let toast = useToast();
19
21
const notification = useStore((state) => state.notification);
20
22
const clearNotification = useStore((state) => state.clearNotification);
23
+
24
+
// we've already saved the notif to the store
25
+
clearQueryParams(["error", "error_description"]);
21
26
22
27
useEffect(() => {
23
28
if (notification) {
···
41
46
{
42
47
duration: 100,
43
48
variant: notification.type,
44
-
actionLabel: "Copy message",
49
+
actionLabel: Platform.OS === "web" ? "Copy message" : undefined,
45
50
iconLeft: CircleX,
46
51
onAction: () => {
47
52
navigator.clipboard.writeText(
···
59
64
notification.message,
60
65
{
61
66
variant: notification.type,
62
-
actionLabel: "Copy message",
67
+
actionLabel: Platform.OS === "web" ? "Copy message" : undefined,
63
68
onAction: () => {
64
69
navigator.clipboard.writeText(notification.message);
65
70
},
···
74
79
notification.message,
75
80
{
76
81
variant: notification.type,
77
-
actionLabel: "Copy message",
82
+
actionLabel: Platform.OS === "web" ? "Copy message" : undefined,
78
83
onAction: () => {
79
84
navigator.clipboard.writeText(notification.message);
80
85
},
+2
-16
js/app/store/slices/blueskySlice.ts
+2
-16
js/app/store/slices/blueskySlice.ts
···
19
19
PlaceStreamServerSettings,
20
20
StreamplaceAgent,
21
21
} from "streamplace";
22
+
import clearQueryParams from "utils/clear-query-params";
22
23
import { privateKeyToAccount } from "viem/accounts";
23
24
import { StateCreator } from "zustand";
24
25
import createOAuthClient, {
···
117
118
createServerSettingsRecord: (debugRecording: boolean) => Promise<void>;
118
119
}
119
120
120
-
const clearQueryParams = () => {
121
-
if (Platform.OS !== "web") {
122
-
return;
123
-
}
124
-
const u = new URL(document.location.href);
125
-
const params = new URLSearchParams(u.search);
126
-
if (u.search === "") {
127
-
return;
128
-
}
129
-
params.delete("iss");
130
-
params.delete("state");
131
-
params.delete("code");
132
-
u.search = params.toString();
133
-
window.history.replaceState(null, "", u.toString());
134
-
};
135
-
136
121
const uploadThumbnail = async (
137
122
handle: string,
138
123
u: URL,
···
217
202
notification: null,
218
203
219
204
clearNotification: () => {
205
+
clearQueryParams();
220
206
set({ notification: null });
221
207
},
222
208
+15
js/app/utils/clear-query-params.ts
+15
js/app/utils/clear-query-params.ts
···
1
+
import { Platform } from "react-native";
2
+
3
+
export default function clearQueryParams(par = ["iss", "state", "code"]) {
4
+
if (Platform.OS !== "web") {
5
+
return;
6
+
}
7
+
const u = new URL(document.location.href);
8
+
const params = new URLSearchParams(u.search);
9
+
if (u.search === "") {
10
+
return;
11
+
}
12
+
par.forEach((p) => params.delete(p));
13
+
u.search = params.toString();
14
+
window.history.replaceState(null, "", u.toString());
15
+
}