forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
[Share Extension] Move away from deprecated API, implement JS side of things (#5509)
+59
-29
+18
-6
src/lib/hooks/useIntentHandler.ts
+18
-6
src/lib/hooks/useIntentHandler.ts
···
1
1
import React from 'react'
2
2
import * as Linking from 'expo-linking'
3
3
4
-
import {logEvent} from 'lib/statsig/statsig'
5
-
import {isNative} from 'platform/detection'
6
-
import {useSession} from 'state/session'
7
-
import {useComposerControls} from 'state/shell'
8
-
import {useCloseAllActiveElements} from 'state/util'
4
+
import {logEvent} from '#/lib/statsig/statsig'
5
+
import {isNative} from '#/platform/detection'
6
+
import {useSession} from '#/state/session'
7
+
import {useComposerControls} from '#/state/shell'
8
+
import {useCloseAllActiveElements} from '#/state/util'
9
9
import {useIntentDialogs} from '#/components/intents/IntentDialogs'
10
10
import {Referrer} from '../../../modules/expo-bluesky-swiss-army'
11
11
···
52
52
composeIntent({
53
53
text: params.get('text'),
54
54
imageUrisStr: params.get('imageUris'),
55
+
videoUri: params.get('videoUri'),
55
56
})
56
57
return
57
58
}
···
80
81
({
81
82
text,
82
83
imageUrisStr,
84
+
videoUri,
83
85
}: {
84
86
text: string | null
85
-
imageUrisStr: string | null // unused for right now, will be used later with intents
87
+
imageUrisStr: string | null
88
+
videoUri: string | null
86
89
}) => {
87
90
if (!hasSession) return
88
91
89
92
closeAllActiveElements()
93
+
94
+
// Whenever a video URI is present, we don't support adding images right now.
95
+
if (videoUri) {
96
+
openComposer({
97
+
text: text ?? undefined,
98
+
videoUri,
99
+
})
100
+
return
101
+
}
90
102
91
103
const imageUris = imageUrisStr
92
104
?.split(',')
+32
-20
src/state/queries/video/video.ts
+32
-20
src/state/queries/video/video.ts
···
7
7
8
8
import {AbortError} from '#/lib/async/cancelable'
9
9
import {SUPPORTED_MIME_TYPES, SupportedMimeTypes} from '#/lib/constants'
10
-
import {logger} from '#/logger'
11
-
import {isWeb} from '#/platform/detection'
12
10
import {
13
11
ServerError,
14
12
UploadLimitError,
15
13
VideoTooLargeError,
16
-
} from 'lib/media/video/errors'
17
-
import {CompressedVideo} from 'lib/media/video/types'
18
-
import {useCompressVideoMutation} from 'state/queries/video/compress-video'
19
-
import {useVideoAgent} from 'state/queries/video/util'
20
-
import {useUploadVideoMutation} from 'state/queries/video/video-upload'
14
+
} from '#/lib/media/video/errors'
15
+
import {CompressedVideo} from '#/lib/media/video/types'
16
+
import {logger} from '#/logger'
17
+
import {isWeb} from '#/platform/detection'
18
+
import {useCompressVideoMutation} from '#/state/queries/video/compress-video'
19
+
import {useVideoAgent} from '#/state/queries/video/util'
20
+
import {useUploadVideoMutation} from '#/state/queries/video/video-upload'
21
21
22
22
type Status = 'idle' | 'compressing' | 'processing' | 'uploading' | 'done'
23
23
···
101
101
102
102
export function useUploadVideo({
103
103
setStatus,
104
+
initialVideoUri,
104
105
}: {
105
106
setStatus: (status: string) => void
106
107
onSuccess: () => void
108
+
initialVideoUri?: string
107
109
}) {
108
110
const {_} = useLingui()
109
111
const queryClient = useQueryClient()
···
237
239
signal: state.abortController.signal,
238
240
})
239
241
240
-
const selectVideo = (asset: ImagePickerAsset) => {
241
-
// compression step on native converts to mp4, so no need to check there
242
-
if (isWeb) {
243
-
const mimeType = getMimeType(asset)
244
-
if (!SUPPORTED_MIME_TYPES.includes(mimeType as SupportedMimeTypes)) {
245
-
throw new Error(_(msg`Unsupported video type: ${mimeType}`))
242
+
const selectVideo = React.useCallback(
243
+
(asset: ImagePickerAsset) => {
244
+
// compression step on native converts to mp4, so no need to check there
245
+
if (isWeb) {
246
+
const mimeType = getMimeType(asset)
247
+
if (!SUPPORTED_MIME_TYPES.includes(mimeType as SupportedMimeTypes)) {
248
+
throw new Error(_(msg`Unsupported video type: ${mimeType}`))
249
+
}
246
250
}
247
-
}
248
251
249
-
dispatch({
250
-
type: 'SetAsset',
251
-
asset,
252
-
})
253
-
onSelectVideo(asset)
254
-
}
252
+
dispatch({
253
+
type: 'SetAsset',
254
+
asset,
255
+
})
256
+
onSelectVideo(asset)
257
+
},
258
+
[_, onSelectVideo],
259
+
)
255
260
256
261
const clearVideo = () => {
257
262
dispatch({type: 'Reset'})
···
264
269
height,
265
270
})
266
271
}, [])
272
+
273
+
// Whenever we receive an initial video uri, we should immediately run compression if necessary
274
+
useEffect(() => {
275
+
if (initialVideoUri) {
276
+
selectVideo({uri: initialVideoUri} as ImagePickerAsset)
277
+
}
278
+
}, [initialVideoUri, selectVideo])
267
279
268
280
return {
269
281
state,
+1
src/state/shell/composer/index.tsx
+1
src/state/shell/composer/index.tsx
+2
src/view/com/composer/Composer.tsx
+2
src/view/com/composer/Composer.tsx
···
137
137
openEmojiPicker,
138
138
text: initText,
139
139
imageUris: initImageUris,
140
+
videoUri: initVideoUri,
140
141
cancelRef,
141
142
}: Props & {
142
143
cancelRef?: React.RefObject<CancelRef>
···
199
200
onPressPublish(true)
200
201
}
201
202
},
203
+
initialVideoUri: initVideoUri,
202
204
})
203
205
const hasVideo = Boolean(videoUploadState.asset || videoUploadState.video)
204
206
+1
src/view/shell/Composer.ios.tsx
+1
src/view/shell/Composer.ios.tsx