ansxor.ca
forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Quiet some logs, fix a bug (#8404)
* Composer, 142k
* Log geolocation error at most once per session
* Clean thumb cache, 1.4m
* Quiet generic network errors
* Handle undefined notification payloads
authored by
Eric Bailey
and committed by
GitHub
342f820e
df2f62e9
+14
-1
src/lib/hooks/useNotificationHandler.ts
+14
-1
src/lib/hooks/useNotificationHandler.ts
···
26
26
| 'chat-message'
27
27
| 'starterpack-joined'
28
28
29
+
/**
30
+
* Manually overridden type, but retains the possibility of
31
+
* `notification.request.trigger.payload` being `undefined`, as specified in
32
+
* the source types.
33
+
*/
29
34
type NotificationPayload =
35
+
| undefined
30
36
| {
31
37
reason: Exclude<NotificationReason, 'chat-message'>
32
38
uri: string
···
47
53
} satisfies Notifications.NotificationBehavior
48
54
49
55
// These need to stay outside the hook to persist between account switches
50
-
let storedPayload: NotificationPayload | undefined
56
+
let storedPayload: NotificationPayload
51
57
let prevDate = 0
52
58
53
59
const logger = Logger.create(Logger.Context.Notifications)
···
191
197
logger.debug('Notifications: received', {e})
192
198
193
199
const payload = e.request.trigger.payload as NotificationPayload
200
+
201
+
if (!payload) {
202
+
return DEFAULT_HANDLER_OPTIONS
203
+
}
204
+
194
205
if (
195
206
payload.reason === 'chat-message' &&
196
207
payload.recipientDid === currentAccount?.did
···
230
241
) {
231
242
const payload = e.notification.request.trigger
232
243
.payload as NotificationPayload
244
+
245
+
if (!payload) return
233
246
234
247
logger.debug(
235
248
'User pressed a notification, opening notifications tab',
+11
-1
src/logger/sentry/setup/index.ts
+11
-1
src/logger/sentry/setup/index.ts
···
27
27
environment: process.env.NODE_ENV,
28
28
dist,
29
29
release,
30
-
ignoreErrors: [`t is not defined`, `Can't find variable: t`],
30
+
ignoreErrors: [
31
+
/*
32
+
* Unknown internals errors
33
+
*/
34
+
`t is not defined`,
35
+
`Can't find variable: t`,
36
+
/*
37
+
* Un-useful errors
38
+
*/
39
+
`Network request failed`,
40
+
],
31
41
})
+17
-8
src/state/geolocation.tsx
+17
-8
src/state/geolocation.tsx
···
48
48
/**
49
49
* Local promise used within this file only.
50
50
*/
51
-
let geolocationResolution: Promise<void> | undefined
51
+
let geolocationResolution: Promise<{success: boolean}> | undefined
52
52
53
53
/**
54
54
* Begin the process of resolving geolocation. This should be called once at
···
65
65
* and fail closed.
66
66
*/
67
67
if (__DEV__) {
68
-
geolocationResolution = new Promise(y => y())
68
+
geolocationResolution = new Promise(y => y({success: true}))
69
69
device.set(['geolocation'], DEFAULT_GEOLOCATION)
70
70
return
71
71
}
72
72
73
73
geolocationResolution = new Promise(async resolve => {
74
+
let success = true
75
+
74
76
try {
75
77
// Try once, fail fast
76
78
const geolocation = await getGeolocation()
···
83
85
throw new Error(`geolocation: nothing returned from initial request`)
84
86
}
85
87
} catch (e: any) {
86
-
logger.error(`geolocation: failed initial request`, {
88
+
success = false
89
+
90
+
logger.debug(`geolocation: failed initial request`, {
87
91
safeMessage: e.message,
88
92
})
89
93
···
97
101
device.set(['geolocation'], geolocation)
98
102
emitGeolocationUpdate(geolocation)
99
103
logger.debug(`geolocation: success`, {geolocation})
104
+
success = true
100
105
} else {
101
106
// endpoint should throw on all failures, this is insurance
102
107
throw new Error(`geolocation: nothing returned from retries`)
···
107
112
logger.debug(`geolocation: failed retries`, {safeMessage: e.message})
108
113
})
109
114
} finally {
110
-
resolve(undefined)
115
+
resolve({success})
111
116
}
112
117
})
113
118
}
···
127
132
logger.debug(`geolocation: using cache`, {cached})
128
133
} else {
129
134
logger.debug(`geolocation: no cache`)
130
-
await geolocationResolution
131
-
logger.debug(`geolocation: resolved`, {
132
-
resolved: device.get(['geolocation']),
133
-
})
135
+
const {success} = await geolocationResolution
136
+
if (success) {
137
+
logger.debug(`geolocation: resolved`, {
138
+
resolved: device.get(['geolocation']),
139
+
})
140
+
} else {
141
+
logger.error(`geolocation: failed to resolve`)
142
+
}
134
143
}
135
144
}
136
145
+1
-1
src/view/com/composer/Composer.tsx
+1
-1
src/view/com/composer/Composer.tsx
+2
-2
src/view/com/composer/videos/VideoTranscodeBackdrop.tsx
+2
-2
src/view/com/composer/videos/VideoTranscodeBackdrop.tsx
···
1
1
import {clearCache, createVideoThumbnail} from 'react-native-compressor'
2
2
import Animated, {FadeIn} from 'react-native-reanimated'
3
3
import {Image} from 'expo-image'
4
-
import {QueryClient, useQuery} from '@tanstack/react-query'
4
+
import {type QueryClient, useQuery} from '@tanstack/react-query'
5
5
6
6
import {atoms as a} from '#/alf'
7
7
8
8
export const RQKEY = 'video-thumbnail'
9
9
10
10
export function clearThumbnailCache(queryClient: QueryClient) {
11
-
clearCache()
11
+
clearCache().catch(() => {})
12
12
queryClient.resetQueries({queryKey: [RQKEY]})
13
13
}
14
14