(
retries: number,
- cond: (err: any) => boolean,
- fn: () => Promise,
+ shouldRetry: (err: any) => boolean,
+ action: () => Promise
,
+ delay?: number,
): Promise
{
let lastErr
while (retries > 0) {
try {
- return await fn()
+ return await action()
} catch (e: any) {
lastErr = e
- if (cond(e)) {
+ if (shouldRetry(e)) {
+ if (delay) {
+ await timeout(delay)
+ }
retries--
continue
}
diff --git a/src/lib/hooks/useCallOnce.ts b/src/lib/hooks/useCallOnce.ts
new file mode 100644
index 0000000000..fa01cf4aa3
--- /dev/null
+++ b/src/lib/hooks/useCallOnce.ts
@@ -0,0 +1,20 @@
+import {useCallback} from 'react'
+
+export enum OnceKey {
+ PreferencesThread = 'preferences:thread',
+}
+
+const called: Record = {
+ [OnceKey.PreferencesThread]: false,
+}
+
+export function useCallOnce(key: OnceKey) {
+ return useCallback(
+ (cb: () => void) => {
+ if (called[key] === true) return
+ called[key] = true
+ cb()
+ },
+ [key],
+ )
+}
diff --git a/src/lib/hooks/useHandleRef.ts b/src/lib/hooks/useHandleRef.ts
deleted file mode 100644
index 167ba270b6..0000000000
--- a/src/lib/hooks/useHandleRef.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {useState} from 'react'
-import {AnimatedRef, measure, MeasuredDimensions} from 'react-native-reanimated'
-
-export type HandleRef = {
- (node: any): void
- current: null | number
-}
-
-// This is a lighterweight alternative to `useAnimatedRef()` for imperative UI thread actions.
-// Render it like , then pass `ref.current` to `measureHandle()` and such.
-export function useHandleRef(): HandleRef {
- return useState(() => {
- const ref = (node: any) => {
- if (node) {
- ref.current =
- node._nativeTag ??
- node.__nativeTag ??
- node.canonical?.nativeTag ??
- null
- } else {
- ref.current = null
- }
- }
- ref.current = null
- return ref
- })[0] as HandleRef
-}
-
-// When using this version, you need to read ref.current on the JS thread, and pass it to UI.
-export function measureHandle(
- current: number | null,
-): MeasuredDimensions | null {
- 'worklet'
- if (current !== null) {
- return measure((() => current) as AnimatedRef)
- } else {
- return null
- }
-}
diff --git a/src/lib/hooks/useHideBottomBarBorder.tsx b/src/lib/hooks/useHideBottomBarBorder.tsx
new file mode 100644
index 0000000000..e21184fda4
--- /dev/null
+++ b/src/lib/hooks/useHideBottomBarBorder.tsx
@@ -0,0 +1,50 @@
+import {createContext, useCallback, useContext, useState} from 'react'
+import {useFocusEffect} from '@react-navigation/native'
+
+type HideBottomBarBorderSetter = () => () => void
+
+const HideBottomBarBorderContext = createContext(false)
+const HideBottomBarBorderSetterContext =
+ createContext(null)
+
+export function useHideBottomBarBorderSetter() {
+ const hideBottomBarBorder = useContext(HideBottomBarBorderSetterContext)
+ if (!hideBottomBarBorder) {
+ throw new Error(
+ 'useHideBottomBarBorderSetter must be used within a HideBottomBarBorderProvider',
+ )
+ }
+ return hideBottomBarBorder
+}
+
+export function useHideBottomBarBorderForScreen() {
+ const hideBorder = useHideBottomBarBorderSetter()
+
+ useFocusEffect(
+ useCallback(() => {
+ const cleanup = hideBorder()
+ return () => cleanup()
+ }, [hideBorder]),
+ )
+}
+
+export function useHideBottomBarBorder() {
+ return useContext(HideBottomBarBorderContext)
+}
+
+export function Provider({children}: {children: React.ReactNode}) {
+ const [refCount, setRefCount] = useState(0)
+
+ const setter = useCallback(() => {
+ setRefCount(prev => prev + 1)
+ return () => setRefCount(prev => prev - 1)
+ }, [])
+
+ return (
+
+ 0}>
+ {children}
+
+
+ )
+}
diff --git a/src/lib/hooks/useNavigationDeduped.ts b/src/lib/hooks/useNavigationDeduped.ts
index dc18742c02..136e5fb961 100644
--- a/src/lib/hooks/useNavigationDeduped.ts
+++ b/src/lib/hooks/useNavigationDeduped.ts
@@ -14,6 +14,7 @@ export type DebouncedNavigationProp = Pick<
| 'dispatch'
| 'goBack'
| 'getState'
+ | 'getParent'
>
export function useNavigationDeduped() {
@@ -46,6 +47,9 @@ export function useNavigationDeduped() {
getState: () => {
return navigation.getState()
},
+ getParent: (...args: Parameters) => {
+ return navigation.getParent(...args)
+ },
}),
[dedupe, navigation],
)
diff --git a/src/lib/media/manip.ts b/src/lib/media/manip.ts
index 62cbc55ac5..c7a429a243 100644
--- a/src/lib/media/manip.ts
+++ b/src/lib/media/manip.ts
@@ -1,8 +1,9 @@
-import {Image as RNImage, Share as RNShare} from 'react-native'
+import {Image as RNImage} from 'react-native'
import uuid from 'react-native-uuid'
import {
cacheDirectory,
copyAsync,
+ createDownloadResumable,
deleteAsync,
EncodingType,
getInfoAsync,
@@ -14,7 +15,6 @@ import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
import * as MediaLibrary from 'expo-media-library'
import * as Sharing from 'expo-sharing'
import {Buffer} from 'buffer'
-import RNFetchBlob from 'rn-fetch-blob'
import {POST_IMG_MAX} from '#/lib/constants'
import {logger} from '#/logger'
@@ -68,28 +68,13 @@ export async function downloadAndResize(opts: DownloadAndResizeOpts) {
return
}
- let downloadRes
+ const path = createPath(appendExt)
+
try {
- const downloadResPromise = RNFetchBlob.config({
- fileCache: true,
- appendExt,
- }).fetch('GET', opts.uri)
- const to1 = setTimeout(() => downloadResPromise.cancel(), opts.timeout)
- downloadRes = await downloadResPromise
- clearTimeout(to1)
-
- const status = downloadRes.info().status
- if (status !== 200) {
- return
- }
-
- const localUri = normalizePath(downloadRes.path(), true)
- return await doResize(localUri, opts)
+ await downloadImage(opts.uri, path, opts.timeout)
+ return await doResize(path, opts)
} finally {
- // TODO Whenever we remove `rn-fetch-blob`, we will need to replace this `flush()` with a `deleteAsync()` -hailey
- if (downloadRes) {
- downloadRes.flush()
- }
+ safeDeleteAsync(path)
}
}
@@ -98,32 +83,16 @@ export async function shareImageModal({uri}: {uri: string}) {
// TODO might need to give an error to the user in this case -prf
return
}
- const downloadResponse = await RNFetchBlob.config({
- fileCache: true,
- }).fetch('GET', uri)
- // NOTE
- // assuming PNG
// we're currently relying on the fact our CDN only serves pngs
// -prf
-
- let imagePath = downloadResponse.path()
- imagePath = normalizePath(await moveToPermanentPath(imagePath, '.png'), true)
-
- // NOTE
- // for some reason expo-sharing refuses to work on iOS
- // ...and visa versa
- // -prf
- if (isIOS) {
- await RNShare.share({url: imagePath})
- } else {
- await Sharing.shareAsync(imagePath, {
- mimeType: 'image/png',
- UTI: 'image/png',
- })
- }
-
- safeDeleteAsync(imagePath)
+ const imageUri = await downloadImage(uri, createPath('png'), 5e3)
+ const imagePath = await moveToPermanentPath(imageUri, '.png')
+ safeDeleteAsync(imageUri)
+ await Sharing.shareAsync(imagePath, {
+ mimeType: 'image/png',
+ UTI: 'image/png',
+ })
}
const ALBUM_NAME = 'Bluesky'
@@ -134,11 +103,8 @@ export async function saveImageToMediaLibrary({uri}: {uri: string}) {
// assuming PNG
// we're currently relying on the fact our CDN only serves pngs
// -prf
- const downloadResponse = await RNFetchBlob.config({
- fileCache: true,
- }).fetch('GET', uri)
- let imagePath = downloadResponse.path()
- imagePath = normalizePath(await moveToPermanentPath(imagePath, '.png'), true)
+ const imageUri = await downloadImage(uri, createPath('png'), 5e3)
+ const imagePath = await moveToPermanentPath(imageUri, '.png')
// save
try {
@@ -403,3 +369,24 @@ export function getResizedDimensions(originalDims: {
height: Math.round(originalDims.height * ratio),
}
}
+
+function createPath(ext: string) {
+ // cacheDirectory will never be null on native, so the null check here is not necessary except for typescript.
+ // we use a web-only function for downloadAndResize on web
+ return `${cacheDirectory ?? ''}/${uuid.v4()}.${ext}`
+}
+
+async function downloadImage(uri: string, path: string, timeout: number) {
+ const dlResumable = createDownloadResumable(uri, path, {cache: true})
+
+ const to1 = setTimeout(() => dlResumable.cancelAsync(), timeout)
+
+ const dlRes = await dlResumable.downloadAsync()
+ clearTimeout(to1)
+
+ if (!dlRes?.uri) {
+ throw new Error('Failed to download image - dlRes is undefined')
+ }
+
+ return normalizePath(dlRes.uri)
+}
diff --git a/src/lib/routes/router.ts b/src/lib/routes/router.ts
index 45f9c85fdb..c74192f298 100644
--- a/src/lib/routes/router.ts
+++ b/src/lib/routes/router.ts
@@ -1,8 +1,8 @@
-import {Route, RouteParams} from './types'
+import {type Route, type RouteParams} from './types'
-export class Router {
+export class Router> {
routes: [string, Route][] = []
- constructor(description: Record) {
+ constructor(description: Record) {
for (const [screen, pattern] of Object.entries(description)) {
if (typeof pattern === 'string') {
this.routes.push([screen, createRoute(pattern)])
@@ -14,7 +14,7 @@ export class Router {
}
}
- matchName(name: string): Route | undefined {
+ matchName(name: keyof T | (string & {})): Route | undefined {
for (const [screenName, route] of this.routes) {
if (screenName === name) {
return route
@@ -45,7 +45,7 @@ function createRoute(pattern: string): Route {
})
const matcherRe = new RegExp(`^${matcherReInternal}([?]|$)`, 'i')
return {
- match(path: string) {
+ match(path) {
const {pathname, searchParams} = new URL(path, 'http://throwaway.com')
const addedParams = Object.fromEntries(searchParams.entries())
@@ -55,10 +55,10 @@ function createRoute(pattern: string): Route {
}
return undefined
},
- build(params: Record) {
+ build(params = {}) {
const str = pattern.replace(
/:([\w]+)/g,
- (_m, name) => params[name] || 'undefined',
+ (_m, name) => params[encodeURIComponent(name)] || 'undefined',
)
let hasQp = false
diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts
index 6f102d438a..c92be34c23 100644
--- a/src/lib/routes/types.ts
+++ b/src/lib/routes/types.ts
@@ -52,7 +52,18 @@ export type CommonNavigatorParams = {
AccountSettings: undefined
PrivacyAndSecuritySettings: undefined
ContentAndMediaSettings: undefined
- SettingsInterests: undefined
+ NotificationSettings: undefined
+ ReplyNotificationSettings: undefined
+ MentionNotificationSettings: undefined
+ QuoteNotificationSettings: undefined
+ LikeNotificationSettings: undefined
+ RepostNotificationSettings: undefined
+ NewFollowerNotificationSettings: undefined
+ LikesOnRepostsNotificationSettings: undefined
+ RepostsOnRepostsNotificationSettings: undefined
+ ActivityNotificationSettings: undefined
+ MiscellaneousNotificationSettings: undefined
+ InterestsSettings: undefined
AboutSettings: undefined
AppIconSettings: undefined
Search: {q?: string}
@@ -61,7 +72,7 @@ export type CommonNavigatorParams = {
MessagesConversation: {conversation: string; embed?: string; accept?: true}
MessagesSettings: undefined
MessagesInbox: undefined
- NotificationSettings: undefined
+ LegacyNotificationSettings: undefined
Feeds: undefined
Start: {name: string; rkey: string}
StarterPack: {name: string; rkey: string; new?: boolean}
@@ -104,8 +115,6 @@ export type FlatNavigatorParams = CommonNavigatorParams & {
Search: {q?: string}
Feeds: undefined
Notifications: undefined
- Hashtag: {tag: string; author?: string}
- Topic: {topic: string}
Messages: {pushToConversation?: string; animation?: 'push' | 'pop'}
}
@@ -118,15 +127,8 @@ export type AllNavigatorParams = CommonNavigatorParams & {
NotificationsTab: undefined
Notifications: undefined
MyProfileTab: undefined
- Hashtag: {tag: string; author?: string}
- Topic: {topic: string}
MessagesTab: undefined
Messages: {animation?: 'push' | 'pop'}
- Start: {name: string; rkey: string}
- StarterPack: {name: string; rkey: string; new?: boolean}
- StarterPackShort: {code: string}
- StarterPackWizard: undefined
- StarterPackEdit: {rkey?: string}
}
// NOTE
@@ -143,5 +145,5 @@ export type RouteParams = Record
export type MatchResult = {params: RouteParams}
export type Route = {
match: (path: string) => MatchResult | undefined
- build: (params: RouteParams) => string
+ build: (params?: Record) => string
}
diff --git a/src/lib/statsig/gates.ts b/src/lib/statsig/gates.ts
index c67bb60a3a..fca3f609af 100644
--- a/src/lib/statsig/gates.ts
+++ b/src/lib/statsig/gates.ts
@@ -6,6 +6,8 @@ export type Gate =
| 'explore_show_suggested_feeds'
| 'old_postonboarding'
| 'onboarding_add_video_feed'
+ | 'post_threads_v2_unspecced'
+ | 'reengagement_features'
| 'remove_show_latest_button'
| 'test_gate_1'
| 'test_gate_2'
diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts
index ad194714a3..288f428c10 100644
--- a/src/lib/strings/url-helpers.ts
+++ b/src/lib/strings/url-helpers.ts
@@ -193,6 +193,11 @@ export function convertBskyAppUrlIfNeeded(url: string): string {
return startUriToStarterPackUri(urlp.pathname)
}
+ // special-case search links
+ if (urlp.pathname === '/search') {
+ return `/search?q=${urlp.searchParams.get('q')}`
+ }
+
return urlp.pathname
} catch (e) {
console.error('Unexpected error in convertBskyAppUrlIfNeeded()', e)
diff --git a/src/locale/helpers.ts b/src/locale/helpers.ts
index 8d650a234c..380f996b91 100644
--- a/src/locale/helpers.ts
+++ b/src/locale/helpers.ts
@@ -1,4 +1,4 @@
-import {AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
+import {type AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
import * as bcp47Match from 'bcp-47-match'
import lande from 'lande'
diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po
index 7f3d35dfce..e668726899 100644
--- a/src/locale/locales/en/messages.po
+++ b/src/locale/locales/en/messages.po
@@ -74,8 +74,8 @@ msgstr ""
msgid "{0, plural, one {# second} other {# seconds}}"
msgstr ""
-#: src/view/shell/bottom-bar/BottomBar.tsx:223
-#: src/view/shell/bottom-bar/BottomBar.tsx:255
+#: src/view/shell/bottom-bar/BottomBar.tsx:225
+#: src/view/shell/bottom-bar/BottomBar.tsx:257
#: src/view/shell/Drawer.tsx:487
msgid "{0, plural, one {# unread item} other {# unread items}}"
msgstr ""
@@ -95,7 +95,8 @@ msgstr ""
msgid "{0, plural, one {following} other {following}}"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:529
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:474
+#: src/view/com/post-thread/PostThreadItem.tsx:541
msgid "{0, plural, one {like} other {likes}}"
msgstr ""
@@ -103,11 +104,13 @@ msgstr ""
msgid "{0, plural, one {post} other {posts}}"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:513
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:458
+#: src/view/com/post-thread/PostThreadItem.tsx:525
msgid "{0, plural, one {quote} other {quotes}}"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:495
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:440
+#: src/view/com/post-thread/PostThreadItem.tsx:507
msgid "{0, plural, one {repost} other {reposts}}"
msgstr ""
@@ -142,7 +145,7 @@ msgstr ""
msgid "{0} joined this week"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/Scrubber.tsx:201
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/Scrubber.tsx:202
msgid "{0} of {1}"
msgstr ""
@@ -209,155 +212,155 @@ msgstr ""
msgid "{estimatedTimeMins, plural, one {minute} other {minutes}}"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:335
+#: src/view/com/notifications/NotificationFeedItem.tsx:336
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} followed you"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:361
+#: src/view/com/notifications/NotificationFeedItem.tsx:362
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your custom feed"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:254
+#: src/view/com/notifications/NotificationFeedItem.tsx:255
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:466
+#: src/view/com/notifications/NotificationFeedItem.tsx:467
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:439
+#: src/view/com/notifications/NotificationFeedItem.tsx:440
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} removed their verifications from your account"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:278
+#: src/view/com/notifications/NotificationFeedItem.tsx:279
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} reposted your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:490
+#: src/view/com/notifications/NotificationFeedItem.tsx:491
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} reposted your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:385
+#: src/view/com/notifications/NotificationFeedItem.tsx:386
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} signed up with your starter pack"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:414
+#: src/view/com/notifications/NotificationFeedItem.tsx:415
msgid "{firstAuthorLink} and <0>{additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} verified you"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:347
+#: src/view/com/notifications/NotificationFeedItem.tsx:348
msgid "{firstAuthorLink} followed you"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:324
+#: src/view/com/notifications/NotificationFeedItem.tsx:325
msgid "{firstAuthorLink} followed you back"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:373
+#: src/view/com/notifications/NotificationFeedItem.tsx:374
msgid "{firstAuthorLink} liked your custom feed"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:266
+#: src/view/com/notifications/NotificationFeedItem.tsx:267
msgid "{firstAuthorLink} liked your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:478
+#: src/view/com/notifications/NotificationFeedItem.tsx:479
msgid "{firstAuthorLink} liked your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:451
+#: src/view/com/notifications/NotificationFeedItem.tsx:452
msgid "{firstAuthorLink} removed their verification from your account"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:290
+#: src/view/com/notifications/NotificationFeedItem.tsx:291
msgid "{firstAuthorLink} reposted your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:502
+#: src/view/com/notifications/NotificationFeedItem.tsx:503
msgid "{firstAuthorLink} reposted your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:397
+#: src/view/com/notifications/NotificationFeedItem.tsx:398
msgid "{firstAuthorLink} signed up with your starter pack"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:426
+#: src/view/com/notifications/NotificationFeedItem.tsx:427
msgid "{firstAuthorLink} verified you"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:328
+#: src/view/com/notifications/NotificationFeedItem.tsx:329
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} followed you"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:354
+#: src/view/com/notifications/NotificationFeedItem.tsx:355
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your custom feed"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:247
+#: src/view/com/notifications/NotificationFeedItem.tsx:248
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:459
+#: src/view/com/notifications/NotificationFeedItem.tsx:460
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} liked your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:432
+#: src/view/com/notifications/NotificationFeedItem.tsx:433
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} removed their verifications from your account"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:271
+#: src/view/com/notifications/NotificationFeedItem.tsx:272
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} reposted your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:483
+#: src/view/com/notifications/NotificationFeedItem.tsx:484
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} reposted your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:378
+#: src/view/com/notifications/NotificationFeedItem.tsx:379
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} signed up with your starter pack"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:407
+#: src/view/com/notifications/NotificationFeedItem.tsx:408
msgid "{firstAuthorName} and {additionalAuthorsCount, plural, one {{formattedAuthorsCount} other} other {{formattedAuthorsCount} others}} verified you"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:333
+#: src/view/com/notifications/NotificationFeedItem.tsx:334
msgid "{firstAuthorName} followed you"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:323
+#: src/view/com/notifications/NotificationFeedItem.tsx:324
msgid "{firstAuthorName} followed you back"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:359
+#: src/view/com/notifications/NotificationFeedItem.tsx:360
msgid "{firstAuthorName} liked your custom feed"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:252
+#: src/view/com/notifications/NotificationFeedItem.tsx:253
msgid "{firstAuthorName} liked your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:464
+#: src/view/com/notifications/NotificationFeedItem.tsx:465
msgid "{firstAuthorName} liked your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:437
+#: src/view/com/notifications/NotificationFeedItem.tsx:438
msgid "{firstAuthorName} removed their verification from your account"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:276
+#: src/view/com/notifications/NotificationFeedItem.tsx:277
msgid "{firstAuthorName} reposted your post"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:488
+#: src/view/com/notifications/NotificationFeedItem.tsx:489
msgid "{firstAuthorName} reposted your repost"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:383
+#: src/view/com/notifications/NotificationFeedItem.tsx:384
msgid "{firstAuthorName} signed up with your starter pack"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:412
+#: src/view/com/notifications/NotificationFeedItem.tsx:413
msgid "{firstAuthorName} verified you"
msgstr ""
@@ -366,7 +369,7 @@ msgstr ""
msgid "{following} following"
msgstr ""
-#: src/components/dialogs/SearchablePeopleList.tsx:412
+#: src/components/dialogs/SearchablePeopleList.tsx:413
msgid "{handle} can't be messaged"
msgstr ""
@@ -387,7 +390,7 @@ msgstr ""
msgid "{minutes, plural, one {# minute} other {# minutes}}"
msgstr ""
-#: src/view/shell/bottom-bar/BottomBarWeb.tsx:270
+#: src/view/shell/bottom-bar/BottomBarWeb.tsx:277
msgid "{notificationCount, plural, one {# unread item} other {# unread items}}"
msgstr ""
@@ -461,10 +464,6 @@ msgstr ""
msgid "<0>{date} at {time}"
msgstr ""
-#: src/screens/Settings/NotificationSettings.tsx:85
-msgid "<0>Experimental: When this preference is enabled, you'll only receive reply and quote notifications from users you follow. We'll continue to add more controls here over time."
-msgstr ""
-
#: src/screens/StarterPack/Wizard/index.tsx:440
msgid "<0>You and<1> <2>{0} are included in your starter pack"
msgstr ""
@@ -498,10 +497,10 @@ msgstr ""
msgid "A new form of verification"
msgstr ""
-#: src/Navigation.tsx:403
+#: src/Navigation.tsx:490
#: src/screens/Settings/AboutSettings.tsx:75
-#: src/screens/Settings/Settings.tsx:225
-#: src/screens/Settings/Settings.tsx:228
+#: src/screens/Settings/Settings.tsx:234
+#: src/screens/Settings/Settings.tsx:237
msgid "About"
msgstr ""
@@ -520,20 +519,20 @@ msgid "Accept Request"
msgstr ""
#: src/screens/Settings/AccessibilitySettings.tsx:46
-#: src/screens/Settings/Settings.tsx:201
-#: src/screens/Settings/Settings.tsx:204
+#: src/screens/Settings/Settings.tsx:210
+#: src/screens/Settings/Settings.tsx:213
msgid "Accessibility"
msgstr ""
-#: src/Navigation.tsx:355
+#: src/Navigation.tsx:365
msgid "Accessibility Settings"
msgstr ""
-#: src/Navigation.tsx:371
+#: src/Navigation.tsx:381
#: src/screens/Login/LoginForm.tsx:194
#: src/screens/Settings/AccountSettings.tsx:48
-#: src/screens/Settings/Settings.tsx:163
-#: src/screens/Settings/Settings.tsx:166
+#: src/screens/Settings/Settings.tsx:164
+#: src/screens/Settings/Settings.tsx:167
msgid "Account"
msgstr ""
@@ -564,11 +563,11 @@ msgstr ""
msgid "Account Muted by List"
msgstr ""
-#: src/screens/Settings/Settings.tsx:505
+#: src/screens/Settings/Settings.tsx:514
msgid "Account options"
msgstr ""
-#: src/screens/Settings/Settings.tsx:541
+#: src/screens/Settings/Settings.tsx:550
msgid "Account removed from quick access"
msgstr ""
@@ -640,14 +639,14 @@ msgstr ""
msgid "Add alt text (optional)"
msgstr ""
-#: src/screens/Settings/Settings.tsx:445
-#: src/screens/Settings/Settings.tsx:448
+#: src/screens/Settings/Settings.tsx:454
+#: src/screens/Settings/Settings.tsx:457
#: src/view/shell/desktop/LeftNav.tsx:260
#: src/view/shell/desktop/LeftNav.tsx:264
msgid "Add another account"
msgstr ""
-#: src/view/com/composer/Composer.tsx:731
+#: src/view/com/composer/Composer.tsx:773
msgid "Add another post"
msgstr ""
@@ -678,7 +677,7 @@ msgstr ""
msgid "Add muted words and tags"
msgstr ""
-#: src/view/com/composer/Composer.tsx:1287
+#: src/view/com/composer/Composer.tsx:1335
msgid "Add new post"
msgstr ""
@@ -769,7 +768,6 @@ msgstr ""
msgid "Advanced"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:143
#: src/components/dialogs/EmailDialog/screens/Update.tsx:223
msgid "alice@example.com"
msgstr ""
@@ -823,9 +821,9 @@ msgstr ""
msgid "Already signed in as @{0}"
msgstr ""
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:186
#: src/view/com/composer/GifAltText.tsx:100
#: src/view/com/composer/photos/Gallery.tsx:187
-#: src/view/com/util/post-embeds/GifEmbed.tsx:186
msgid "ALT"
msgstr ""
@@ -839,7 +837,7 @@ msgstr ""
msgid "Alt text"
msgstr ""
-#: src/view/com/util/post-embeds/GifEmbed.tsx:191
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:191
msgid "Alt Text"
msgstr ""
@@ -856,19 +854,11 @@ msgstr ""
msgid "An email has been sent to {0}. It includes a confirmation code which you can enter below."
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:59
-msgid "An email has been sent to your previous address, {currentEmail}. It includes a confirmation code which you can enter below."
-msgstr ""
-
-#: src/components/dialogs/VerifyEmailDialog.tsx:120
-msgid "An email has been sent! Please enter the confirmation code included in the email below."
-msgstr ""
-
#: src/components/dialogs/GifSelect.tsx:265
msgid "An error has occurred"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:420
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:420
msgid "An error occurred"
msgstr ""
@@ -884,11 +874,11 @@ msgstr ""
msgid "An error occurred while generating your starter pack. Want to try again?"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbed.tsx:160
+#: src/components/Post/Embed/VideoEmbed/index.tsx:160
msgid "An error occurred while loading the video. Please try again later."
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:198
+#: src/components/Post/Embed/VideoEmbed/index.web.tsx:199
msgid "An error occurred while loading the video. Please try again."
msgstr ""
@@ -958,7 +948,7 @@ msgstr ""
msgid "Animals"
msgstr ""
-#: src/view/com/util/post-embeds/GifEmbed.tsx:149
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:149
msgid "Animated GIF"
msgstr ""
@@ -975,7 +965,7 @@ msgstr ""
msgid "Anybody can interact"
msgstr ""
-#: src/Navigation.tsx:411
+#: src/Navigation.tsx:498
#: src/screens/Settings/AppIconSettings/index.tsx:67
#: src/screens/Settings/AppIconSettings/SettingsListItem.tsx:18
#: src/screens/Settings/AppIconSettings/SettingsListItem.tsx:23
@@ -1012,7 +1002,7 @@ msgstr ""
msgid "App passwords"
msgstr ""
-#: src/Navigation.tsx:323
+#: src/Navigation.tsx:333
#: src/screens/Settings/AppPasswords.tsx:51
msgid "App Passwords"
msgstr ""
@@ -1048,10 +1038,10 @@ msgstr ""
msgid "Appeal this decision"
msgstr ""
-#: src/Navigation.tsx:363
+#: src/Navigation.tsx:373
#: src/screens/Settings/AppearanceSettings.tsx:85
-#: src/screens/Settings/Settings.tsx:193
-#: src/screens/Settings/Settings.tsx:196
+#: src/screens/Settings/Settings.tsx:202
+#: src/screens/Settings/Settings.tsx:205
msgid "Appearance"
msgstr ""
@@ -1060,12 +1050,15 @@ msgstr ""
msgid "Apply default recommended feeds"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:945
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:640
+#: src/view/com/post-thread/PostThreadItem.tsx:955
msgid "Archived from {0}"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:914
-#: src/view/com/post-thread/PostThreadItem.tsx:953
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:609
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:648
+#: src/view/com/post-thread/PostThreadItem.tsx:924
+#: src/view/com/post-thread/PostThreadItem.tsx:963
msgid "Archived post"
msgstr ""
@@ -1101,11 +1094,11 @@ msgstr ""
msgid "Are you sure you want to remove this from your feeds?"
msgstr ""
-#: src/view/com/composer/Composer.tsx:682
+#: src/view/com/composer/Composer.tsx:724
msgid "Are you sure you'd like to discard this draft?"
msgstr ""
-#: src/view/com/composer/Composer.tsx:861
+#: src/view/com/composer/Composer.tsx:905
msgid "Are you sure you'd like to discard this post?"
msgstr ""
@@ -1257,7 +1250,7 @@ msgstr ""
msgid "Block User"
msgstr ""
-#: src/view/com/util/post-embeds/QuoteEmbed.tsx:84
+#: src/components/Post/Embed/index.tsx:180
msgid "Blocked"
msgstr ""
@@ -1265,7 +1258,7 @@ msgstr ""
msgid "Blocked accounts"
msgstr ""
-#: src/Navigation.tsx:164
+#: src/Navigation.tsx:174
#: src/view/screens/ModerationBlockedAccounts.tsx:104
msgid "Blocked Accounts"
msgstr ""
@@ -1279,7 +1272,7 @@ msgstr ""
msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:468
+#: src/view/com/post-thread/PostThread.tsx:488
msgid "Blocked post."
msgstr ""
@@ -1304,7 +1297,8 @@ msgstr ""
msgid "Bluesky"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:970
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:665
+#: src/view/com/post-thread/PostThreadItem.tsx:980
msgid "Bluesky cannot confirm the authenticity of the claimed date."
msgstr ""
@@ -1363,23 +1357,23 @@ msgstr ""
msgid "Books"
msgstr ""
-#: src/components/FeedInterstitials.tsx:373
+#: src/components/FeedInterstitials.tsx:379
msgid "Browse more accounts on the Explore page"
msgstr ""
-#: src/components/FeedInterstitials.tsx:511
+#: src/components/FeedInterstitials.tsx:517
msgid "Browse more feeds on the Explore page"
msgstr ""
-#: src/components/FeedInterstitials.tsx:353
-#: src/components/FeedInterstitials.tsx:356
-#: src/components/FeedInterstitials.tsx:492
-#: src/components/FeedInterstitials.tsx:495
+#: src/components/FeedInterstitials.tsx:359
+#: src/components/FeedInterstitials.tsx:362
+#: src/components/FeedInterstitials.tsx:498
+#: src/components/FeedInterstitials.tsx:501
msgid "Browse more suggestions"
msgstr ""
-#: src/components/FeedInterstitials.tsx:381
-#: src/components/FeedInterstitials.tsx:520
+#: src/components/FeedInterstitials.tsx:387
+#: src/components/FeedInterstitials.tsx:526
msgid "Browse more suggestions on the Explore page"
msgstr ""
@@ -1450,7 +1444,7 @@ msgstr ""
#: src/components/live/GoLiveDialog.tsx:247
#: src/components/live/GoLiveDialog.tsx:253
#: src/components/Menu/index.tsx:350
-#: src/components/PostControls/RepostButton.tsx:198
+#: src/components/PostControls/RepostButton.tsx:209
#: src/components/Prompt.tsx:143
#: src/components/Prompt.tsx:145
#: src/screens/Deactivated.tsx:158
@@ -1461,18 +1455,17 @@ msgstr ""
#: src/screens/Settings/AppIconSettings/index.tsx:225
#: src/screens/Settings/components/ChangeHandleDialog.tsx:78
#: src/screens/Settings/components/ChangeHandleDialog.tsx:85
-#: src/screens/Settings/Settings.tsx:270
+#: src/screens/Settings/Settings.tsx:279
#: src/screens/Takendown.tsx:99
#: src/screens/Takendown.tsx:102
-#: src/view/com/composer/Composer.tsx:916
-#: src/view/com/composer/Composer.tsx:927
+#: src/view/com/composer/Composer.tsx:960
+#: src/view/com/composer/Composer.tsx:971
#: src/view/com/composer/photos/EditImageDialog.web.tsx:43
#: src/view/com/composer/photos/EditImageDialog.web.tsx:52
#: src/view/com/modals/ChangePassword.tsx:279
#: src/view/com/modals/ChangePassword.tsx:282
#: src/view/com/modals/CreateOrEditList.tsx:333
#: src/view/com/modals/CropImage.web.tsx:97
-#: src/view/com/modals/EditProfile.tsx:269
#: src/view/com/modals/LinkWarning.tsx:105
#: src/view/com/modals/LinkWarning.tsx:107
#: src/view/shell/desktop/LeftNav.tsx:213
@@ -1495,11 +1488,7 @@ msgstr ""
msgid "Cancel image crop"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:264
-msgid "Cancel profile editing"
-msgstr ""
-
-#: src/components/PostControls/RepostButton.tsx:192
+#: src/components/PostControls/RepostButton.tsx:203
msgid "Cancel quote post"
msgstr ""
@@ -1518,7 +1507,7 @@ msgstr ""
#: src/components/PostControls/index.tsx:101
#: src/components/PostControls/index.tsx:132
#: src/components/PostControls/index.tsx:160
-#: src/state/shell/composer/index.tsx:82
+#: src/state/shell/composer/index.tsx:91
msgid "Cannot interact with a blocked user"
msgstr ""
@@ -1548,11 +1537,6 @@ msgstr ""
msgid "Change app language"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:200
-#: src/components/dialogs/VerifyEmailDialog.tsx:225
-msgid "Change email address"
-msgstr ""
-
#: src/screens/Settings/components/ChangeHandleDialog.tsx:94
#: src/screens/Settings/components/ChangeHandleDialog.tsx:98
msgid "Change Handle"
@@ -1574,14 +1558,6 @@ msgstr ""
msgid "Change report reason"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:53
-msgid "Change Your Email"
-msgstr ""
-
-#: src/components/dialogs/VerifyEmailDialog.tsx:209
-msgid "Change your email address"
-msgstr ""
-
#: src/screens/Settings/AppIconSettings/index.tsx:216
msgid "Changes app icon"
msgstr ""
@@ -1591,8 +1567,8 @@ msgstr ""
msgid "Changes hosting provider"
msgstr ""
-#: src/Navigation.tsx:428
-#: src/view/shell/bottom-bar/BottomBar.tsx:219
+#: src/Navigation.tsx:515
+#: src/view/shell/bottom-bar/BottomBar.tsx:221
#: src/view/shell/desktop/LeftNav.tsx:553
#: src/view/shell/Drawer.tsx:455
msgid "Chat"
@@ -1609,7 +1585,7 @@ msgctxt "toast"
msgid "Chat muted"
msgstr ""
-#: src/Navigation.tsx:438
+#: src/Navigation.tsx:525
#: src/screens/Messages/components/InboxPreview.tsx:24
msgid "Chat request inbox"
msgstr ""
@@ -1620,7 +1596,7 @@ msgid "Chat requests"
msgstr ""
#: src/components/dms/ConvoMenu.tsx:75
-#: src/Navigation.tsx:433
+#: src/Navigation.tsx:520
#: src/screens/Messages/ChatList.tsx:341
msgid "Chat settings"
msgstr ""
@@ -1692,11 +1668,11 @@ msgstr ""
msgid "Choose your username"
msgstr ""
-#: src/screens/Settings/Settings.tsx:423
+#: src/screens/Settings/Settings.tsx:432
msgid "Clear all storage data"
msgstr ""
-#: src/screens/Settings/Settings.tsx:425
+#: src/screens/Settings/Settings.tsx:434
msgid "Clear all storage data (restart after this)"
msgstr ""
@@ -1745,14 +1721,10 @@ msgstr ""
msgid "Clip 🐴 clop 🐴"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:244
-#: src/components/dialogs/ChangeEmailDialog.tsx:250
#: src/components/dialogs/GifSelect.tsx:281
#: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:178
#: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:187
#: src/components/dialogs/SearchablePeopleList.tsx:295
-#: src/components/dialogs/VerifyEmailDialog.tsx:346
-#: src/components/dialogs/VerifyEmailDialog.tsx:352
#: src/components/dms/EmojiPopup.android.tsx:58
#: src/components/dms/ReportDialog.tsx:381
#: src/components/dms/ReportDialog.tsx:390
@@ -1760,6 +1732,7 @@ msgstr ""
#: src/components/live/EditLiveDialog.tsx:235
#: src/components/NewskieDialog.tsx:146
#: src/components/NewskieDialog.tsx:153
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:197
#: src/components/ProgressGuide/FollowDialog.tsx:386
#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:117
#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:123
@@ -1767,7 +1740,6 @@ msgstr ""
#: src/components/verification/VerifierDialog.tsx:144
#: src/view/com/modals/ChangePassword.tsx:279
#: src/view/com/modals/ChangePassword.tsx:282
-#: src/view/com/util/post-embeds/GifEmbed.tsx:197
msgid "Close"
msgstr ""
@@ -1825,7 +1797,7 @@ msgstr ""
msgid "Closes password update alert"
msgstr ""
-#: src/view/com/composer/Composer.tsx:924
+#: src/view/com/composer/Composer.tsx:968
msgid "Closes post composer and discards post draft"
msgstr ""
@@ -1838,11 +1810,11 @@ msgstr ""
msgid "Closes viewer for header image"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:537
+#: src/view/com/notifications/NotificationFeedItem.tsx:538
msgid "Collapse list of users"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:748
+#: src/view/com/notifications/NotificationFeedItem.tsx:749
msgid "Collapses list of users for a given notification"
msgstr ""
@@ -1865,7 +1837,7 @@ msgstr ""
msgid "Comics"
msgstr ""
-#: src/Navigation.tsx:313
+#: src/Navigation.tsx:323
#: src/view/screens/CommunityGuidelines.tsx:34
msgid "Community Guidelines"
msgstr ""
@@ -1882,15 +1854,15 @@ msgstr ""
msgid "Compose new post"
msgstr ""
-#: src/view/com/composer/Composer.tsx:825
+#: src/view/com/composer/Composer.tsx:869
msgid "Compose posts up to {0, plural, other {# characters}} in length"
msgstr ""
-#: src/view/com/post-thread/PostThreadComposePrompt.tsx:34
+#: src/view/com/post-thread/PostThreadComposePrompt.tsx:62
msgid "Compose reply"
msgstr ""
-#: src/view/com/composer/Composer.tsx:1669
+#: src/view/com/composer/Composer.tsx:1729
msgid "Compressing video..."
msgstr ""
@@ -1902,10 +1874,6 @@ msgstr ""
msgid "Configured in <0>moderation settings."
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:203
-#: src/components/dialogs/ChangeEmailDialog.tsx:210
-#: src/components/dialogs/VerifyEmailDialog.tsx:316
-#: src/components/dialogs/VerifyEmailDialog.tsx:323
#: src/components/Prompt.tsx:186
#: src/components/Prompt.tsx:189
#: src/screens/Settings/components/DisableEmail2FADialog.tsx:185
@@ -1929,10 +1897,7 @@ msgstr ""
msgid "Confirm your birthdate"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:160
-#: src/components/dialogs/ChangeEmailDialog.tsx:164
#: src/components/dialogs/EmailDialog/components/TokenField.tsx:36
-#: src/components/dialogs/VerifyEmailDialog.tsx:252
#: src/screens/Login/LoginForm.tsx:274
#: src/screens/Settings/components/DisableEmail2FADialog.tsx:144
#: src/screens/Settings/components/DisableEmail2FADialog.tsx:150
@@ -1941,10 +1906,6 @@ msgstr ""
msgid "Confirmation code"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:248
-msgid "Confirmation Code"
-msgstr ""
-
#: src/screens/Login/LoginForm.tsx:337
msgid "Connecting..."
msgstr ""
@@ -1959,12 +1920,12 @@ msgid "Content & Media"
msgstr ""
#: src/screens/Settings/AccessibilitySettings.tsx:109
-#: src/screens/Settings/Settings.tsx:185
-#: src/screens/Settings/Settings.tsx:188
+#: src/screens/Settings/Settings.tsx:194
+#: src/screens/Settings/Settings.tsx:197
msgid "Content and media"
msgstr ""
-#: src/Navigation.tsx:387
+#: src/Navigation.tsx:474
msgid "Content and Media"
msgstr ""
@@ -2014,6 +1975,11 @@ msgstr ""
msgid "Continue as {0} (currently signed in)"
msgstr ""
+#: src/screens/PostThread/components/ThreadItemReadMoreUp.tsx:27
+msgid "Continue thread"
+msgstr ""
+
+#: src/screens/PostThread/components/ThreadItemReadMoreUp.tsx:63
#: src/view/com/post-thread/PostThreadLoadMore.tsx:60
msgid "Continue thread..."
msgstr ""
@@ -2150,7 +2116,7 @@ msgstr ""
msgid "Copy TXT record value"
msgstr ""
-#: src/Navigation.tsx:318
+#: src/Navigation.tsx:328
#: src/view/screens/CopyrightPolicy.tsx:31
msgid "Copyright Policy"
msgstr ""
@@ -2176,6 +2142,10 @@ msgstr ""
msgid "Could not process your video"
msgstr ""
+#: src/state/queries/notifications/settings.ts:47
+msgid "Could not update notification settings"
+msgstr ""
+
#: src/components/StarterPack/ProfileStarterPacks.tsx:300
msgid "Create"
msgstr ""
@@ -2186,7 +2156,7 @@ msgstr ""
#: src/components/StarterPack/ProfileStarterPacks.tsx:178
#: src/components/StarterPack/ProfileStarterPacks.tsx:287
-#: src/Navigation.tsx:463
+#: src/Navigation.tsx:550
msgid "Create a starter pack"
msgstr ""
@@ -2196,10 +2166,10 @@ msgstr ""
#: src/view/com/auth/SplashScreen.tsx:55
#: src/view/com/auth/SplashScreen.web.tsx:117
-#: src/view/shell/bottom-bar/BottomBar.tsx:343
-#: src/view/shell/bottom-bar/BottomBar.tsx:348
-#: src/view/shell/bottom-bar/BottomBarWeb.tsx:199
-#: src/view/shell/bottom-bar/BottomBarWeb.tsx:204
+#: src/view/shell/bottom-bar/BottomBar.tsx:345
+#: src/view/shell/bottom-bar/BottomBar.tsx:350
+#: src/view/shell/bottom-bar/BottomBarWeb.tsx:206
+#: src/view/shell/bottom-bar/BottomBarWeb.tsx:211
#: src/view/shell/NavSignupCard.tsx:47
#: src/view/shell/NavSignupCard.tsx:52
msgid "Create account"
@@ -2297,7 +2267,7 @@ msgstr ""
msgid "Deactivate account"
msgstr ""
-#: src/screens/Settings/Settings.tsx:397
+#: src/screens/Settings/Settings.tsx:406
msgid "Debug Moderation"
msgstr ""
@@ -2346,7 +2316,7 @@ msgstr ""
msgid "Delete chat"
msgstr ""
-#: src/screens/Settings/Settings.tsx:404
+#: src/screens/Settings/Settings.tsx:413
msgid "Delete chat declaration record"
msgstr ""
@@ -2383,7 +2353,7 @@ msgstr ""
#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682
#: src/components/PostControls/PostMenu/PostMenuItems.tsx:684
-#: src/view/com/composer/Composer.tsx:835
+#: src/view/com/composer/Composer.tsx:879
msgid "Delete post"
msgstr ""
@@ -2404,7 +2374,7 @@ msgstr ""
msgid "Delete this post?"
msgstr ""
-#: src/view/com/util/post-embeds/QuoteEmbed.tsx:94
+#: src/components/Post/Embed/index.tsx:173
msgid "Deleted"
msgstr ""
@@ -2413,15 +2383,13 @@ msgstr ""
msgid "Deleted Account"
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:454
+#: src/view/com/post-thread/PostThread.tsx:474
msgid "Deleted post."
msgstr ""
#: src/screens/Profile/Header/EditProfileDialog.tsx:369
#: src/view/com/modals/CreateOrEditList.tsx:278
#: src/view/com/modals/CreateOrEditList.tsx:299
-#: src/view/com/modals/EditProfile.tsx:218
-#: src/view/com/modals/EditProfile.tsx:230
msgid "Description"
msgstr ""
@@ -2457,8 +2425,8 @@ msgctxt "toast"
msgid "Developer mode enabled"
msgstr ""
-#: src/screens/Settings/Settings.tsx:252
-#: src/screens/Settings/Settings.tsx:255
+#: src/screens/Settings/Settings.tsx:261
+#: src/screens/Settings/Settings.tsx:264
msgid "Developer options"
msgstr ""
@@ -2488,7 +2456,7 @@ msgstr ""
msgid "Disable haptic feedback"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:386
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:386
msgid "Disable subtitles"
msgstr ""
@@ -2502,8 +2470,8 @@ msgid "Disabled"
msgstr ""
#: src/screens/Profile/Header/EditProfileDialog.tsx:88
-#: src/view/com/composer/Composer.tsx:684
-#: src/view/com/composer/Composer.tsx:868
+#: src/view/com/composer/Composer.tsx:726
+#: src/view/com/composer/Composer.tsx:912
msgid "Discard"
msgstr ""
@@ -2511,11 +2479,11 @@ msgstr ""
msgid "Discard changes?"
msgstr ""
-#: src/view/com/composer/Composer.tsx:681
+#: src/view/com/composer/Composer.tsx:723
msgid "Discard draft?"
msgstr ""
-#: src/view/com/composer/Composer.tsx:860
+#: src/view/com/composer/Composer.tsx:904
msgid "Discard post?"
msgstr ""
@@ -2541,7 +2509,7 @@ msgstr ""
msgid "Dismiss"
msgstr ""
-#: src/view/com/composer/Composer.tsx:1593
+#: src/view/com/composer/Composer.tsx:1653
msgid "Dismiss error"
msgstr ""
@@ -2565,14 +2533,9 @@ msgstr ""
#: src/screens/Profile/Header/EditProfileDialog.tsx:320
#: src/screens/Profile/Header/EditProfileDialog.tsx:326
#: src/screens/Profile/Header/EditProfileDialog.tsx:376
-#: src/view/com/modals/EditProfile.tsx:194
msgid "Display name"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:182
-msgid "Display Name"
-msgstr ""
-
#: src/screens/Profile/Header/EditProfileDialog.tsx:339
msgid "Display name is too long"
msgstr ""
@@ -2651,7 +2614,7 @@ msgstr ""
msgid "Double tap to close the dialog"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:1077
+#: src/screens/VideoFeed/index.tsx:1080
msgid "Double tap to like"
msgstr ""
@@ -2680,18 +2643,10 @@ msgstr ""
msgid "e.g. Alice Lastname"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:187
-msgid "e.g. Alice Roberts"
-msgstr ""
-
#: src/screens/Settings/components/ChangeHandleDialog.tsx:376
msgid "e.g. alice.com"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:223
-msgid "e.g. Artist, dog-lover, and avid reader."
-msgstr ""
-
#: src/lib/moderation/useGlobalLabelStrings.ts:43
msgid "E.g. artistic nudes."
msgstr ""
@@ -2767,15 +2722,11 @@ msgstr ""
msgid "Edit Moderation List"
msgstr ""
-#: src/Navigation.tsx:328
+#: src/Navigation.tsx:338
#: src/view/screens/Feeds.tsx:518
msgid "Edit My Feeds"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:154
-msgid "Edit my profile"
-msgstr ""
-
#: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:109
msgid "Edit People"
msgstr ""
@@ -2809,15 +2760,7 @@ msgstr ""
msgid "Edit who can reply"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:195
-msgid "Edit your display name"
-msgstr ""
-
-#: src/view/com/modals/EditProfile.tsx:231
-msgid "Edit your profile description"
-msgstr ""
-
-#: src/Navigation.tsx:468
+#: src/Navigation.tsx:555
msgid "Edit your starter pack"
msgstr ""
@@ -2856,10 +2799,6 @@ msgstr ""
msgid "Email sent!"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:63
-msgid "Email Updated!"
-msgstr ""
-
#: src/components/dialogs/EmailDialog/screens/Verify.tsx:182
msgid "Email verification complete!"
msgstr ""
@@ -2883,7 +2822,7 @@ msgstr ""
msgid "Embed this post in your website. Simply copy the following snippet and paste it into the HTML code of your website."
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerWeb.tsx:58
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.tsx:58
msgid "Embedded video player"
msgstr ""
@@ -2914,12 +2853,12 @@ msgstr ""
msgid "Enable media players for"
msgstr ""
-#: src/screens/Settings/NotificationSettings.tsx:74
-#: src/screens/Settings/NotificationSettings.tsx:77
-msgid "Enable priority notifications"
+#: src/screens/Settings/NotificationSettings/index.tsx:102
+#: src/screens/Settings/NotificationSettings/index.tsx:106
+msgid "Enable push notifications"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:387
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:387
msgid "Enable subtitles"
msgstr ""
@@ -2968,11 +2907,7 @@ msgstr ""
msgid "Enter code"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:118
-msgid "Enter Code"
-msgstr ""
-
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:405
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:405
msgid "Enter fullscreen"
msgstr ""
@@ -3001,10 +2936,6 @@ msgstr ""
msgid "Enter your email address"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:138
-msgid "Enter your new email address below."
-msgstr ""
-
#: src/screens/Login/LoginForm.tsx:243
msgid "Enter your password"
msgstr ""
@@ -3013,7 +2944,7 @@ msgstr ""
msgid "Enter your username and password"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:135
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:135
msgid "Enters full screen"
msgstr ""
@@ -3021,11 +2952,15 @@ msgstr ""
msgid "Entertainment"
msgstr ""
-#: src/view/com/composer/Composer.tsx:1678
+#: src/view/com/composer/Composer.tsx:1738
#: src/view/com/util/error/ErrorScreen.tsx:42
msgid "Error"
msgstr ""
+#: src/screens/PostThread/components/ThreadError.tsx:26
+msgid "Error loading post"
+msgstr ""
+
#: src/screens/Settings/components/ExportCarDialog.tsx:47
msgid "Error occurred while saving file"
msgstr ""
@@ -3056,9 +2991,16 @@ msgstr ""
#: src/screens/Messages/Settings.tsx:83
#: src/screens/Messages/Settings.tsx:86
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:153
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:167
msgid "Everyone"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:236
+#: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41
+msgid "Everything else"
+msgstr ""
+
#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:73
#: src/lib/moderation/useReportOptions.ts:73
msgid "Excessive mentions or replies"
@@ -3077,7 +3019,7 @@ msgstr ""
msgid "Excludes users you follow"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:404
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:404
msgid "Exit fullscreen"
msgstr ""
@@ -3097,15 +3039,19 @@ msgstr ""
msgid "Expand alt text"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:538
+#: src/view/com/notifications/NotificationFeedItem.tsx:539
msgid "Expand list of users"
msgstr ""
-#: src/view/com/composer/ComposerReplyTo.tsx:84
+#: src/view/com/composer/ComposerReplyTo.tsx:91
msgid "Expand or collapse the full post you are replying to"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:962
+#: src/components/Post/ShowMoreTextButton.tsx:32
+msgid "Expand post text"
+msgstr ""
+
+#: src/screens/VideoFeed/index.tsx:965
msgid "Expands or collapses post text"
msgstr ""
@@ -3114,7 +3060,7 @@ msgid "Expected uri to resolve to a record"
msgstr ""
#: src/screens/Settings/FollowingFeedPreferences.tsx:123
-#: src/screens/Settings/ThreadPreferences.tsx:137
+#: src/screens/Settings/ThreadPreferences.tsx:271
msgid "Experimental"
msgstr ""
@@ -3144,7 +3090,7 @@ msgstr ""
msgid "Explicit sexual images."
msgstr ""
-#: src/Navigation.tsx:625
+#: src/Navigation.tsx:712
#: src/screens/Search/Shell.tsx:307
#: src/view/shell/desktop/LeftNav.tsx:635
#: src/view/shell/Drawer.tsx:403
@@ -3175,7 +3121,7 @@ msgstr ""
msgid "External media may allow websites to collect information about you and your device. No information is sent or requested until you press the \"play\" button."
msgstr ""
-#: src/Navigation.tsx:347
+#: src/Navigation.tsx:357
#: src/screens/Settings/ExternalMediaPreferences.tsx:31
msgid "External Media Preferences"
msgstr ""
@@ -3245,6 +3191,19 @@ msgstr ""
msgid "Failed to load GIFs"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:115
+#: src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx:50
+#: src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx:52
+#: src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx:50
+#: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:53
+#: src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx:50
+#: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:50
+#: src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx:52
+#: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:50
+#: src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx:53
+msgid "Failed to load notification settings."
+msgstr ""
+
#: src/screens/Messages/components/MessageListError.tsx:23
msgid "Failed to load past messages"
msgstr ""
@@ -3282,15 +3241,11 @@ msgstr ""
msgid "Failed to save image: {0}"
msgstr ""
-#: src/state/queries/notifications/settings.ts:39
-msgid "Failed to save notification preferences, please try again"
-msgstr ""
-
#: src/screens/ModerationInteractionSettings/index.tsx:108
msgid "Failed to save settings. Please try again."
msgstr ""
-#: src/screens/Settings/SettingsInterests.tsx:133
+#: src/screens/Settings/InterestsSettings.tsx:136
msgctxt "toast"
msgid "Failed to save your interests."
msgstr ""
@@ -3345,7 +3300,7 @@ msgstr ""
msgid "Failed to verify handle. Please try again."
msgstr ""
-#: src/Navigation.tsx:263
+#: src/Navigation.tsx:273
msgid "Feed"
msgstr ""
@@ -3374,7 +3329,7 @@ msgctxt "toast"
msgid "Feedback sent!"
msgstr ""
-#: src/Navigation.tsx:448
+#: src/Navigation.tsx:535
#: src/screens/Search/SearchResults.tsx:68
#: src/screens/StarterPack/StarterPackScreen.tsx:190
#: src/view/screens/Feeds.tsx:511
@@ -3535,7 +3490,7 @@ msgstr ""
msgid "Followed by <0>{0}, <1>{1}, and {2, plural, one {# other} other {# others}}"
msgstr ""
-#: src/Navigation.tsx:217
+#: src/Navigation.tsx:227
msgid "Followers of @{0} that you know"
msgstr ""
@@ -3570,7 +3525,7 @@ msgstr ""
msgid "Following feed preferences"
msgstr ""
-#: src/Navigation.tsx:334
+#: src/Navigation.tsx:344
#: src/screens/Settings/FollowingFeedPreferences.tsx:53
msgid "Following Feed Preferences"
msgstr ""
@@ -3638,7 +3593,7 @@ msgstr ""
msgid "From @{sanitizedAuthor}"
msgstr ""
-#: src/view/com/posts/PostFeedItem.tsx:326
+#: src/view/com/posts/PostFeedItem.tsx:330
msgctxt "from-feed"
msgid "From <0/>"
msgstr ""
@@ -3655,10 +3610,40 @@ msgstr ""
msgid "Get help"
msgstr ""
+#: src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx:43
+msgid "Get notifications when people follow you."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx:43
+msgid "Get notifications when people like posts that you've reposted."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx:43
+msgid "Get notifications when people like your posts."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx:43
+msgid "Get notifications when people mention you."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:43
+msgid "Get notifications when people quote your posts."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx:43
+msgid "Get notifications when people reply to your posts."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx:43
+msgid "Get notifications when people repost posts that you've reposted."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:43
+msgid "Get notifications when people repost your posts."
+msgstr ""
+
#: src/components/dialogs/EmailDialog/screens/VerificationReminder.tsx:76
#: src/components/dialogs/EmailDialog/screens/VerificationReminder.tsx:86
-#: src/components/dialogs/VerifyEmailDialog.tsx:263
-#: src/components/dialogs/VerifyEmailDialog.tsx:269
msgid "Get started"
msgstr ""
@@ -3685,8 +3670,8 @@ msgstr ""
#: src/screens/Messages/Inbox.tsx:228
#: src/screens/Profile/ProfileFeed/index.tsx:92
#: src/screens/VideoFeed/components/Header.tsx:163
-#: src/screens/VideoFeed/index.tsx:1138
-#: src/screens/VideoFeed/index.tsx:1142
+#: src/screens/VideoFeed/index.tsx:1141
+#: src/screens/VideoFeed/index.tsx:1145
#: src/view/com/auth/LoggedOut.tsx:72
#: src/view/screens/NotFound.tsx:57
#: src/view/screens/ProfileList.tsx:1038
@@ -3737,7 +3722,7 @@ msgstr ""
msgid "Go live for"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:204
+#: src/view/com/notifications/NotificationFeedItem.tsx:205
msgid "Go to {firstAuthorName}'s profile"
msgstr ""
@@ -3797,7 +3782,7 @@ msgstr ""
msgid "Harassment, trolling, or intolerance"
msgstr ""
-#: src/Navigation.tsx:418
+#: src/Navigation.tsx:505
msgid "Hashtag"
msgstr ""
@@ -3814,8 +3799,8 @@ msgstr ""
msgid "Having trouble?"
msgstr ""
-#: src/screens/Settings/Settings.tsx:217
-#: src/screens/Settings/Settings.tsx:221
+#: src/screens/Settings/Settings.tsx:226
+#: src/screens/Settings/Settings.tsx:230
#: src/view/shell/desktop/RightNav.tsx:120
#: src/view/shell/desktop/RightNav.tsx:121
#: src/view/shell/Drawer.tsx:370
@@ -3847,7 +3832,7 @@ msgstr ""
#: src/components/interstitials/TrendingVideos.tsx:140
#: src/components/moderation/ContentHider.tsx:200
#: src/components/moderation/LabelPreference.tsx:135
-#: src/components/moderation/PostHider.tsx:124
+#: src/components/moderation/PostHider.tsx:134
#: src/components/PostControls/PostMenu/PostMenuItems.tsx:712
#: src/lib/moderation/useLabelBehaviorDescription.ts:15
#: src/lib/moderation/useLabelBehaviorDescription.ts:20
@@ -3857,7 +3842,7 @@ msgstr ""
msgid "Hide"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:755
+#: src/view/com/notifications/NotificationFeedItem.tsx:756
msgctxt "action"
msgid "Hide"
msgstr ""
@@ -3908,7 +3893,7 @@ msgstr ""
msgid "Hide trending videos?"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:746
+#: src/view/com/notifications/NotificationFeedItem.tsx:747
msgid "Hide user list"
msgstr ""
@@ -3918,7 +3903,7 @@ msgid "Hide verification badges"
msgstr ""
#: src/components/moderation/ContentHider.tsx:151
-#: src/components/moderation/PostHider.tsx:79
+#: src/components/moderation/PostHider.tsx:89
msgid "Hides the content"
msgstr ""
@@ -3954,9 +3939,9 @@ msgstr ""
msgid "Hold up! We’re gradually giving access to video, and you’re still waiting in line. Check back soon!"
msgstr ""
-#: src/Navigation.tsx:620
-#: src/Navigation.tsx:640
-#: src/view/shell/bottom-bar/BottomBar.tsx:176
+#: src/Navigation.tsx:707
+#: src/Navigation.tsx:727
+#: src/view/shell/bottom-bar/BottomBar.tsx:178
#: src/view/shell/desktop/LeftNav.tsx:617
#: src/view/shell/Drawer.tsx:429
msgid "Home"
@@ -3975,10 +3960,10 @@ msgstr ""
msgid "Hot"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:67
-#: src/screens/Settings/ThreadPreferences.tsx:70
-#: src/view/com/post-thread/PostThread.tsx:655
-#: src/view/com/post-thread/PostThread.tsx:660
+#: src/screens/Settings/ThreadPreferences.tsx:201
+#: src/screens/Settings/ThreadPreferences.tsx:204
+#: src/view/com/post-thread/PostThread.tsx:679
+#: src/view/com/post-thread/PostThread.tsx:684
msgid "Hot replies first"
msgstr ""
@@ -3987,10 +3972,6 @@ msgstr ""
msgid "How should we open this link?"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:189
-#: src/components/dialogs/ChangeEmailDialog.tsx:196
-#: src/components/dialogs/VerifyEmailDialog.tsx:302
-#: src/components/dialogs/VerifyEmailDialog.tsx:309
#: src/screens/Settings/components/DisableEmail2FADialog.tsx:133
#: src/screens/Settings/components/DisableEmail2FADialog.tsx:136
msgid "I have a code"
@@ -4082,6 +4063,34 @@ msgstr ""
msgid "Impersonation, misinformation, or false claims"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:285
+msgid "In-app"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:134
+msgid "In-app notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:268
+msgid "In-app, Everyone"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:276
+msgid "In-app, People you follow"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:283
+msgid "In-app, Push"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:266
+msgid "In-app, Push, Everyone"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:274
+msgid "In-app, Push, People you follow"
+msgstr ""
+
#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:91
#: src/lib/moderation/useReportOptions.ts:91
msgid "Inappropriate messages or explicit links"
@@ -4133,7 +4142,7 @@ msgstr ""
msgid "Invalid handle. Please try a different one."
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:339
+#: src/view/com/post-thread/PostThreadItem.tsx:351
msgid "Invalid or unsupported post record"
msgstr ""
@@ -4185,7 +4194,7 @@ msgstr ""
msgid "It's just you right now! Add more people to your starter pack by searching above."
msgstr ""
-#: src/view/com/composer/Composer.tsx:1612
+#: src/view/com/composer/Composer.tsx:1672
msgid "Job ID: {0}"
msgstr ""
@@ -4244,13 +4253,13 @@ msgstr ""
msgid "Language selection"
msgstr ""
-#: src/Navigation.tsx:190
+#: src/Navigation.tsx:200
msgid "Language Settings"
msgstr ""
#: src/screens/Settings/LanguageSettings.tsx:78
-#: src/screens/Settings/Settings.tsx:209
-#: src/screens/Settings/Settings.tsx:212
+#: src/screens/Settings/Settings.tsx:218
+#: src/screens/Settings/Settings.tsx:221
msgid "Languages"
msgstr ""
@@ -4273,7 +4282,6 @@ msgstr ""
#: src/screens/Moderation/VerificationSettings.tsx:47
#: src/screens/Profile/Header/EditProfileDialog.tsx:359
#: src/screens/Settings/components/ChangeHandleDialog.tsx:212
-#: src/view/com/modals/EditProfile.tsx:207
msgid "Learn more"
msgstr ""
@@ -4297,7 +4305,7 @@ msgstr ""
msgid "Learn more about the moderation applied to this content."
msgstr ""
-#: src/components/moderation/PostHider.tsx:100
+#: src/components/moderation/PostHider.tsx:110
#: src/components/moderation/ScreenHider.tsx:127
msgid "Learn more about this warning"
msgstr ""
@@ -4388,6 +4396,10 @@ msgstr ""
msgid "Like 10 posts to train the Discover feed"
msgstr ""
+#: src/Navigation.tsx:426
+msgid "Like notifications"
+msgstr ""
+
#: src/screens/Profile/components/ProfileFeedHeader.tsx:505
msgid "Like this feed"
msgstr ""
@@ -4396,8 +4408,8 @@ msgstr ""
msgid "Like this labeler"
msgstr ""
-#: src/Navigation.tsx:268
-#: src/Navigation.tsx:273
+#: src/Navigation.tsx:278
+#: src/Navigation.tsx:283
msgid "Liked by"
msgstr ""
@@ -4419,20 +4431,34 @@ msgstr ""
msgid "Liked by {likeCount, plural, one {# user} other {# users}}"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:159
+#: src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx:41
#: src/view/screens/Profile.tsx:229
msgid "Likes"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:232
+#: src/screens/Settings/NotificationSettings/index.tsx:208
+#: src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx:41
+msgid "Likes of your reposts"
+msgstr ""
+
+#: src/Navigation.tsx:450
+msgid "Likes of your reposts notifications"
+msgstr ""
+
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:467
+#: src/view/com/post-thread/PostThreadItem.tsx:243
msgid "Likes on this post"
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:629
-#: src/view/com/post-thread/PostThread.tsx:634
+#: src/screens/PostThread/components/HeaderDropdown.tsx:47
+#: src/screens/PostThread/components/HeaderDropdown.tsx:52
+#: src/view/com/post-thread/PostThread.tsx:653
+#: src/view/com/post-thread/PostThread.tsx:658
msgid "Linear"
msgstr ""
-#: src/Navigation.tsx:223
+#: src/Navigation.tsx:233
msgid "List"
msgstr ""
@@ -4450,11 +4476,11 @@ msgstr ""
msgid "List by {0}"
msgstr ""
-#: src/view/com/profile/ProfileSubpageHeader.tsx:156
+#: src/view/com/profile/ProfileSubpageHeader.tsx:160
msgid "List by <0/>"
msgstr ""
-#: src/view/com/profile/ProfileSubpageHeader.tsx:154
+#: src/view/com/profile/ProfileSubpageHeader.tsx:158
msgid "List by you"
msgstr ""
@@ -4490,7 +4516,7 @@ msgctxt "toast"
msgid "List unmuted"
msgstr ""
-#: src/Navigation.tsx:144
+#: src/Navigation.tsx:154
#: src/view/screens/Lists.tsx:65
#: src/view/screens/Profile.tsx:224
#: src/view/screens/Profile.tsx:232
@@ -4543,7 +4569,7 @@ msgstr ""
msgid "Loading..."
msgstr ""
-#: src/Navigation.tsx:293
+#: src/Navigation.tsx:303
msgid "Log"
msgstr ""
@@ -4623,8 +4649,6 @@ msgstr ""
#: src/components/dialogs/EmailDialog/screens/VerificationReminder.tsx:90
#: src/components/dialogs/EmailDialog/screens/VerificationReminder.tsx:97
-#: src/components/dialogs/VerifyEmailDialog.tsx:273
-#: src/components/dialogs/VerifyEmailDialog.tsx:281
msgid "Maybe later"
msgstr ""
@@ -4636,6 +4660,10 @@ msgstr ""
msgid "Media that may be disturbing or inappropriate for some audiences."
msgstr ""
+#: src/Navigation.tsx:410
+msgid "Mention notifications"
+msgstr ""
+
#: src/components/WhoCanReply.tsx:263
msgid "mentioned users"
msgstr ""
@@ -4644,6 +4672,8 @@ msgstr ""
msgid "Mentioned users"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:137
+#: src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx:41
#: src/view/screens/Notifications.tsx:99
msgid "Mentions"
msgstr ""
@@ -4686,7 +4716,7 @@ msgstr ""
msgid "Message options"
msgstr ""
-#: src/Navigation.tsx:635
+#: src/Navigation.tsx:722
msgid "Messages"
msgstr ""
@@ -4695,6 +4725,10 @@ msgctxt "Name of app icon variant"
msgid "Midnight"
msgstr ""
+#: src/Navigation.tsx:466
+msgid "Miscellaneous notifications"
+msgstr ""
+
#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47
#: src/lib/moderation/useReportOptions.ts:47
msgid "Misleading Account"
@@ -4705,10 +4739,10 @@ msgstr ""
msgid "Misleading Post"
msgstr ""
-#: src/Navigation.tsx:149
+#: src/Navigation.tsx:159
#: src/screens/Moderation/index.tsx:93
-#: src/screens/Settings/Settings.tsx:177
-#: src/screens/Settings/Settings.tsx:180
+#: src/screens/Settings/Settings.tsx:178
+#: src/screens/Settings/Settings.tsx:181
msgid "Moderation"
msgstr ""
@@ -4721,12 +4755,12 @@ msgstr ""
msgid "Moderation list by {0}"
msgstr ""
-#: src/view/com/profile/ProfileSubpageHeader.tsx:169
+#: src/view/com/profile/ProfileSubpageHeader.tsx:173
msgid "Moderation list by <0/>"
msgstr ""
#: src/view/com/modals/UserAddRemoveLists.tsx:220
-#: src/view/com/profile/ProfileSubpageHeader.tsx:167
+#: src/view/com/profile/ProfileSubpageHeader.tsx:171
msgid "Moderation list by you"
msgstr ""
@@ -4744,7 +4778,7 @@ msgstr ""
msgid "Moderation lists"
msgstr ""
-#: src/Navigation.tsx:154
+#: src/Navigation.tsx:164
#: src/view/screens/ModerationModlists.tsx:65
msgid "Moderation Lists"
msgstr ""
@@ -4753,7 +4787,7 @@ msgstr ""
msgid "moderation settings"
msgstr ""
-#: src/Navigation.tsx:283
+#: src/Navigation.tsx:293
msgid "Moderation states"
msgstr ""
@@ -4766,7 +4800,7 @@ msgstr ""
msgid "Moderator has chosen to set a general warning on the content."
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:721
+#: src/view/com/post-thread/PostThreadItem.tsx:731
msgid "More"
msgstr ""
@@ -4781,13 +4815,13 @@ msgstr ""
msgid "More options"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:94
+#: src/screens/Settings/ThreadPreferences.tsx:228
msgid "Most-liked first"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:91
-#: src/view/com/post-thread/PostThread.tsx:685
-#: src/view/com/post-thread/PostThread.tsx:690
+#: src/screens/Settings/ThreadPreferences.tsx:225
+#: src/view/com/post-thread/PostThread.tsx:709
+#: src/view/com/post-thread/PostThread.tsx:714
msgid "Most-liked replies first"
msgstr ""
@@ -4799,8 +4833,8 @@ msgstr ""
msgid "Music"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:156
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VolumeControl.tsx:95
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:156
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx:96
msgctxt "video"
msgid "Mute"
msgstr ""
@@ -4876,7 +4910,7 @@ msgstr ""
msgid "Muted accounts"
msgstr ""
-#: src/Navigation.tsx:159
+#: src/Navigation.tsx:169
#: src/view/screens/ModerationMutedAccounts.tsx:118
msgid "Muted Accounts"
msgstr ""
@@ -4949,10 +4983,6 @@ msgstr ""
msgid "Navigates to your profile"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:234
-msgid "Need to change it?"
-msgstr ""
-
#: src/components/moderation/ReportDialog/index.tsx:288
#: src/components/ReportDialog/SelectReportOptionView.tsx:128
msgid "Need to report a copyright violation?"
@@ -4982,7 +5012,6 @@ msgstr ""
msgid "New chat"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:142
#: src/components/dialogs/EmailDialog/screens/Update.tsx:222
msgid "New email address"
msgstr ""
@@ -4991,6 +5020,15 @@ msgstr ""
msgid "New Feature"
msgstr ""
+#: src/Navigation.tsx:442
+msgid "New follower notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:181
+#: src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx:41
+msgid "New followers"
+msgstr ""
+
#: src/screens/Settings/components/ChangeHandleDialog.tsx:221
#: src/screens/Settings/components/ChangeHandleDialog.tsx:229
#: src/screens/Settings/components/ChangeHandleDialog.tsx:375
@@ -5046,10 +5084,14 @@ msgstr ""
msgid "New User List"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:83
-#: src/screens/Settings/ThreadPreferences.tsx:86
-#: src/view/com/post-thread/PostThread.tsx:675
-#: src/view/com/post-thread/PostThread.tsx:680
+#: src/screens/PostThread/components/HeaderDropdown.tsx:93
+#: src/screens/PostThread/components/HeaderDropdown.tsx:98
+#: src/screens/Settings/ThreadPreferences.tsx:96
+#: src/screens/Settings/ThreadPreferences.tsx:99
+#: src/screens/Settings/ThreadPreferences.tsx:217
+#: src/screens/Settings/ThreadPreferences.tsx:220
+#: src/view/com/post-thread/PostThread.tsx:699
+#: src/view/com/post-thread/PostThread.tsx:704
msgid "Newest replies first"
msgstr ""
@@ -5219,7 +5261,7 @@ msgstr ""
msgid "Not followed by anyone you're following"
msgstr ""
-#: src/Navigation.tsx:139
+#: src/Navigation.tsx:149
#: src/view/screens/Profile.tsx:125
msgid "Not Found"
msgstr ""
@@ -5240,19 +5282,12 @@ msgstr ""
msgid "Nothing here"
msgstr ""
-#: src/screens/Settings/NotificationSettings.tsx:64
-msgid "Notification filters"
-msgstr ""
-
-#: src/Navigation.tsx:443
+#: src/Navigation.tsx:396
+#: src/Navigation.tsx:530
#: src/view/screens/Notifications.tsx:134
msgid "Notification settings"
msgstr ""
-#: src/screens/Settings/NotificationSettings.tsx:46
-msgid "Notification Settings"
-msgstr ""
-
#: src/screens/Messages/Settings.tsx:123
msgid "Notification sounds"
msgstr ""
@@ -5261,14 +5296,30 @@ msgstr ""
msgid "Notification Sounds"
msgstr ""
-#: src/Navigation.tsx:630
+#: src/Navigation.tsx:717
+#: src/screens/Settings/NotificationSettings/index.tsx:92
+#: src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:30
+#: src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx:30
+#: src/screens/Settings/Settings.tsx:186
+#: src/screens/Settings/Settings.tsx:189
#: src/view/screens/Notifications.tsx:128
-#: src/view/shell/bottom-bar/BottomBar.tsx:250
+#: src/view/shell/bottom-bar/BottomBar.tsx:252
#: src/view/shell/desktop/LeftNav.tsx:654
#: src/view/shell/Drawer.tsx:482
msgid "Notifications"
msgstr ""
+#: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:43
+msgid "Notifications for everything else, such as when someone joins via one of your starter packs."
+msgstr ""
+
#: src/lib/hooks/useTimeAgo.ts:135
msgid "now"
msgstr ""
@@ -5288,6 +5339,7 @@ msgid "Nudity or adult content not labeled as such"
msgstr ""
#: src/lib/moderation/useLabelBehaviorDescription.ts:11
+#: src/screens/Settings/NotificationSettings/index.tsx:292
msgid "Off"
msgstr ""
@@ -5309,14 +5361,19 @@ msgid "OK"
msgstr ""
#: src/screens/Login/PasswordUpdatedForm.tsx:37
-#: src/view/com/post-thread/PostThreadItem.tsx:975
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:670
+#: src/view/com/post-thread/PostThreadItem.tsx:985
msgid "Okay"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:75
-#: src/screens/Settings/ThreadPreferences.tsx:78
-#: src/view/com/post-thread/PostThread.tsx:665
-#: src/view/com/post-thread/PostThread.tsx:670
+#: src/screens/PostThread/components/HeaderDropdown.tsx:83
+#: src/screens/PostThread/components/HeaderDropdown.tsx:88
+#: src/screens/Settings/ThreadPreferences.tsx:88
+#: src/screens/Settings/ThreadPreferences.tsx:91
+#: src/screens/Settings/ThreadPreferences.tsx:209
+#: src/screens/Settings/ThreadPreferences.tsx:212
+#: src/view/com/post-thread/PostThread.tsx:689
+#: src/view/com/post-thread/PostThread.tsx:694
msgid "Oldest replies first"
msgstr ""
@@ -5324,19 +5381,19 @@ msgstr ""
msgid "on<0><1/><2><3/>"
msgstr ""
-#: src/screens/Settings/Settings.tsx:358
+#: src/screens/Settings/Settings.tsx:367
msgid "Onboarding reset"
msgstr ""
-#: src/view/com/composer/Composer.tsx:342
+#: src/view/com/composer/Composer.tsx:347
msgid "One or more GIFs is missing alt text."
msgstr ""
-#: src/view/com/composer/Composer.tsx:339
+#: src/view/com/composer/Composer.tsx:344
msgid "One or more images is missing alt text."
msgstr ""
-#: src/view/com/composer/Composer.tsx:349
+#: src/view/com/composer/Composer.tsx:354
msgid "One or more videos is missing alt text."
msgstr ""
@@ -5369,7 +5426,6 @@ msgstr ""
#: src/components/StarterPack/ProfileStarterPacks.tsx:341
#: src/screens/Settings/AppPasswords.tsx:59
#: src/screens/Settings/components/ChangeHandleDialog.tsx:106
-#: src/screens/Settings/NotificationSettings.tsx:54
#: src/view/screens/Profile.tsx:125
msgid "Oops!"
msgstr ""
@@ -5392,7 +5448,7 @@ msgid "Open drawer menu"
msgstr ""
#: src/screens/Messages/components/MessageInput.web.tsx:181
-#: src/view/com/composer/Composer.tsx:1272
+#: src/view/com/composer/Composer.tsx:1320
msgid "Open emoji picker"
msgstr ""
@@ -5409,7 +5465,7 @@ msgstr ""
msgid "Open full emoji list"
msgstr ""
-#: src/view/com/util/post-embeds/ExternalLinkEmbed.tsx:79
+#: src/components/Post/Embed/ExternalEmbed/index.tsx:79
msgid "Open link to {niceUrl}"
msgstr ""
@@ -5417,7 +5473,7 @@ msgstr ""
msgid "Open message options"
msgstr ""
-#: src/screens/Settings/Settings.tsx:395
+#: src/screens/Settings/Settings.tsx:404
msgid "Open moderation debug page"
msgstr ""
@@ -5446,12 +5502,12 @@ msgstr ""
msgid "Open starter pack menu"
msgstr ""
-#: src/screens/Settings/Settings.tsx:388
-#: src/screens/Settings/Settings.tsx:402
+#: src/screens/Settings/Settings.tsx:397
+#: src/screens/Settings/Settings.tsx:411
msgid "Open storybook page"
msgstr ""
-#: src/screens/Settings/Settings.tsx:381
+#: src/screens/Settings/Settings.tsx:390
msgid "Open system log"
msgstr ""
@@ -5487,7 +5543,7 @@ msgstr ""
msgid "Opens change handle dialog"
msgstr ""
-#: src/view/com/post-thread/PostThreadComposePrompt.tsx:35
+#: src/view/com/post-thread/PostThreadComposePrompt.tsx:63
msgid "Opens composer"
msgstr ""
@@ -5495,7 +5551,7 @@ msgstr ""
msgid "Opens device photo gallery"
msgstr ""
-#: src/view/com/composer/Composer.tsx:1273
+#: src/view/com/composer/Composer.tsx:1321
msgid "Opens emoji picker"
msgstr ""
@@ -5513,7 +5569,7 @@ msgstr ""
msgid "Opens GIF select dialog"
msgstr ""
-#: src/screens/Settings/Settings.tsx:218
+#: src/screens/Settings/Settings.tsx:227
msgid "Opens helpdesk in browser"
msgstr ""
@@ -5533,7 +5589,7 @@ msgstr ""
msgid "Opens the linked website"
msgstr ""
-#: src/view/com/notifications/NotificationFeedItem.tsx:849
+#: src/view/com/notifications/NotificationFeedItem.tsx:850
#: src/view/com/util/UserAvatar.tsx:581
msgid "Opens this profile"
msgstr ""
@@ -5635,13 +5691,13 @@ msgstr ""
msgid "Password updated!"
msgstr ""
-#: src/view/com/util/post-embeds/GifEmbed.tsx:43
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:140
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:369
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:43
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:140
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:369
msgid "Pause"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:320
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:320
msgid "Pause video"
msgstr ""
@@ -5651,14 +5707,19 @@ msgstr ""
msgid "People"
msgstr ""
-#: src/Navigation.tsx:210
+#: src/Navigation.tsx:220
msgid "People followed by @{0}"
msgstr ""
-#: src/Navigation.tsx:203
+#: src/Navigation.tsx:213
msgid "People following @{0}"
msgstr ""
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:171
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:185
+msgid "People I follow"
+msgstr ""
+
#: src/lib/media/save-image.ts:51
msgid "Permission to access your photo library was denied. Please enable it in your system settings."
msgstr ""
@@ -5702,7 +5763,7 @@ msgstr ""
msgid "Pin to your profile"
msgstr ""
-#: src/view/com/posts/PostFeedItem.tsx:407
+#: src/view/com/posts/PostFeedItem.tsx:411
msgid "Pinned"
msgstr ""
@@ -5719,38 +5780,38 @@ msgstr ""
msgid "Pinned to your feeds"
msgstr ""
-#: src/view/com/util/post-embeds/GifEmbed.tsx:43
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:140
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:370
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:43
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:140
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:370
msgid "Play"
msgstr ""
-#: src/view/com/util/post-embeds/ExternalGifEmbed.tsx:107
+#: src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx:111
msgid "Play {0}"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbed.tsx:134
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:321
+#: src/components/Post/Embed/VideoEmbed/index.tsx:134
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:321
msgid "Play video"
msgstr ""
-#: src/view/com/util/post-embeds/ExternalPlayerEmbed.tsx:58
+#: src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx:61
msgid "Play Video"
msgstr ""
-#: src/view/com/util/post-embeds/GifEmbed.tsx:42
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:42
msgid "Plays or pauses the GIF"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:141
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:141
msgid "Plays or pauses the video"
msgstr ""
-#: src/view/com/util/post-embeds/ExternalGifEmbed.tsx:106
+#: src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx:110
msgid "Plays the GIF"
msgstr ""
-#: src/view/com/util/post-embeds/ExternalPlayerEmbed.tsx:59
+#: src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx:62
msgid "Plays the video"
msgstr ""
@@ -5863,10 +5924,6 @@ msgstr ""
msgid "Please verify your email"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:108
-msgid "Please Verify Your Email"
-msgstr ""
-
#: src/screens/Onboarding/index.tsx:34
#: src/screens/Onboarding/state.ts:111
#: src/screens/Search/modules/ExploreTrendingTopics.tsx:235
@@ -5877,29 +5934,34 @@ msgstr ""
msgid "Porn"
msgstr ""
-#: src/view/com/composer/Composer.tsx:987
-msgctxt "action"
-msgid "Post"
-msgstr ""
-
-#: src/view/com/post-thread/PostThread.tsx:540
+#: src/screens/PostThread/index.tsx:490
+#: src/view/com/post-thread/PostThread.tsx:561
msgctxt "description"
msgid "Post"
msgstr ""
-#: src/view/com/composer/Composer.tsx:985
+#: src/view/com/composer/Composer.tsx:1031
+msgctxt "action"
+msgid "Post"
+msgstr ""
+
+#: src/view/com/composer/Composer.tsx:1029
msgctxt "action"
msgid "Post All"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:224
+#: src/screens/PostThread/components/ThreadItemPostTombstone.tsx:22
+msgid "Post blocked"
+msgstr ""
+
+#: src/view/com/post-thread/PostThreadItem.tsx:235
msgid "Post by {0}"
msgstr ""
-#: src/Navigation.tsx:236
-#: src/Navigation.tsx:243
-#: src/Navigation.tsx:250
-#: src/Navigation.tsx:257
+#: src/Navigation.tsx:246
+#: src/Navigation.tsx:253
+#: src/Navigation.tsx:260
+#: src/Navigation.tsx:267
msgid "Post by @{0}"
msgstr ""
@@ -5912,11 +5974,14 @@ msgstr ""
msgid "Post failed to upload. Please check your Internet connection and try again."
msgstr ""
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:132
+#: src/screens/PostThread/components/ThreadItemPost.tsx:110
+#: src/screens/PostThread/components/ThreadItemTreePost.tsx:107
#: src/screens/VideoFeed/index.tsx:529
msgid "Post has been deleted"
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:269
+#: src/view/com/post-thread/PostThread.tsx:271
msgid "Post hidden"
msgstr ""
@@ -5934,7 +5999,7 @@ msgstr ""
msgid "Post interaction settings"
msgstr ""
-#: src/Navigation.tsx:170
+#: src/Navigation.tsx:180
#: src/screens/ModerationInteractionSettings/index.tsx:34
msgid "Post Interaction Settings"
msgstr ""
@@ -5947,8 +6012,10 @@ msgstr ""
msgid "Post Languages"
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:264
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/screens/PostThread/components/ThreadError.tsx:32
+#: src/screens/PostThread/components/ThreadItemPostTombstone.tsx:25
+#: src/view/com/post-thread/PostThread.tsx:266
+#: src/view/com/post-thread/PostThread.tsx:278
msgid "Post not found"
msgstr ""
@@ -5980,11 +6047,6 @@ msgstr ""
msgid "Potentially Misleading Link"
msgstr ""
-#: src/state/queries/notifications/settings.ts:44
-msgctxt "toast"
-msgid "Preference saved"
-msgstr ""
-
#: src/screens/Messages/components/MessageListError.tsx:19
msgid "Press to attempt reconnection"
msgstr ""
@@ -6008,31 +6070,29 @@ msgstr ""
msgid "Primary Language"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:112
-#: src/screens/Settings/ThreadPreferences.tsx:117
+#: src/screens/Settings/ThreadPreferences.tsx:110
+#: src/screens/Settings/ThreadPreferences.tsx:115
+#: src/screens/Settings/ThreadPreferences.tsx:246
+#: src/screens/Settings/ThreadPreferences.tsx:251
msgid "Prioritize your Follows"
msgstr ""
-#: src/screens/Settings/NotificationSettings.tsx:67
-msgid "Priority notifications"
-msgstr ""
-
#: src/view/shell/desktop/RightNav.tsx:110
#: src/view/shell/desktop/RightNav.tsx:111
msgid "Privacy"
msgstr ""
-#: src/screens/Settings/Settings.tsx:171
-#: src/screens/Settings/Settings.tsx:174
+#: src/screens/Settings/Settings.tsx:172
+#: src/screens/Settings/Settings.tsx:175
msgid "Privacy and security"
msgstr ""
-#: src/Navigation.tsx:379
+#: src/Navigation.tsx:389
#: src/screens/Settings/PrivacyAndSecuritySettings.tsx:36
msgid "Privacy and Security"
msgstr ""
-#: src/Navigation.tsx:303
+#: src/Navigation.tsx:313
#: src/screens/Settings/AboutSettings.tsx:92
#: src/screens/Settings/AboutSettings.tsx:95
#: src/view/screens/PrivacyPolicy.tsx:31
@@ -6041,7 +6101,7 @@ msgstr ""
msgid "Privacy Policy"
msgstr ""
-#: src/view/com/composer/Composer.tsx:1675
+#: src/view/com/composer/Composer.tsx:1735
msgid "Processing video..."
msgstr ""
@@ -6055,7 +6115,7 @@ msgstr ""
msgid "profile"
msgstr ""
-#: src/view/shell/bottom-bar/BottomBar.tsx:314
+#: src/view/shell/bottom-bar/BottomBar.tsx:316
#: src/view/shell/desktop/LeftNav.tsx:709
#: src/view/shell/Drawer.tsx:76
#: src/view/shell/Drawer.tsx:559
@@ -6063,7 +6123,6 @@ msgid "Profile"
msgstr ""
#: src/screens/Profile/Header/EditProfileDialog.tsx:196
-#: src/view/com/modals/EditProfile.tsx:128
msgctxt "toast"
msgid "Profile updated"
msgstr ""
@@ -6081,25 +6140,41 @@ msgid "Public, sharable lists which can be used to drive feeds."
msgstr ""
#. Accessibility label for button to publish a single post
-#: src/view/com/composer/Composer.tsx:967
+#: src/view/com/composer/Composer.tsx:1011
msgid "Publish post"
msgstr ""
#. Accessibility label for button to publish multiple posts in a thread
-#: src/view/com/composer/Composer.tsx:960
+#: src/view/com/composer/Composer.tsx:1004
msgid "Publish posts"
msgstr ""
#. Accessibility label for button to publish multiple replies in a thread
-#: src/view/com/composer/Composer.tsx:945
+#: src/view/com/composer/Composer.tsx:989
msgid "Publish replies"
msgstr ""
#. Accessibility label for button to publish a single reply
-#: src/view/com/composer/Composer.tsx:952
+#: src/view/com/composer/Composer.tsx:996
msgid "Publish reply"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:287
+msgid "Push"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:117
+msgid "Push notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:270
+msgid "Push, Everyone"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:278
+msgid "Push, People you follow"
+msgstr ""
+
#: src/components/StarterPack/QrCodeDialog.tsx:134
msgid "QR code copied to your clipboard!"
msgstr ""
@@ -6112,8 +6187,12 @@ msgstr ""
msgid "QR code saved to your camera roll!"
msgstr ""
-#: src/components/PostControls/RepostButton.tsx:163
-#: src/components/PostControls/RepostButton.tsx:186
+#: src/Navigation.tsx:418
+msgid "Quote notifications"
+msgstr ""
+
+#: src/components/PostControls/RepostButton.tsx:174
+#: src/components/PostControls/RepostButton.tsx:197
#: src/components/PostControls/RepostButton.web.tsx:78
#: src/components/PostControls/RepostButton.web.tsx:85
msgid "Quote post"
@@ -6127,8 +6206,8 @@ msgstr ""
msgid "Quote post was successfully detached"
msgstr ""
-#: src/components/PostControls/RepostButton.tsx:162
-#: src/components/PostControls/RepostButton.tsx:184
+#: src/components/PostControls/RepostButton.tsx:173
+#: src/components/PostControls/RepostButton.tsx:195
#: src/components/PostControls/RepostButton.web.tsx:77
#: src/components/PostControls/RepostButton.web.tsx:84
msgid "Quote posts disabled"
@@ -6139,17 +6218,20 @@ msgid "Quote settings"
msgstr ""
#: src/screens/Post/PostQuotes.tsx:38
+#: src/screens/Settings/NotificationSettings/index.tsx:148
+#: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41
msgid "Quotes"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:258
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:451
+#: src/view/com/post-thread/PostThreadItem.tsx:269
msgid "Quotes of this post"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:99
-#: src/screens/Settings/ThreadPreferences.tsx:102
-#: src/view/com/post-thread/PostThread.tsx:695
-#: src/view/com/post-thread/PostThread.tsx:700
+#: src/screens/Settings/ThreadPreferences.tsx:233
+#: src/screens/Settings/ThreadPreferences.tsx:236
+#: src/view/com/post-thread/PostThread.tsx:719
+#: src/view/com/post-thread/PostThread.tsx:724
msgid "Random (aka \"Poster's Roulette\")"
msgstr ""
@@ -6170,19 +6252,27 @@ msgstr ""
msgid "Reactivate your account"
msgstr ""
+#: src/screens/PostThread/components/ThreadItemReadMore.tsx:92
+msgid "Read {0} more {1, plural, one {reply} other {replies}}"
+msgstr ""
+
#: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:158
#: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:173
msgid "Read blog post"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:963
+#: src/screens/VideoFeed/index.tsx:966
msgid "Read less"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:963
+#: src/screens/VideoFeed/index.tsx:966
msgid "Read more"
msgstr ""
+#: src/screens/PostThread/components/ThreadItemReadMore.tsx:71
+msgid "Read more replies"
+msgstr ""
+
#: src/view/com/auth/SplashScreen.web.tsx:173
msgid "Read the Bluesky blog"
msgstr ""
@@ -6206,6 +6296,14 @@ msgstr ""
msgid "Reason:"
msgstr ""
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:123
+msgid "Receive in-app notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:106
+msgid "Receive push notifications"
+msgstr ""
+
#: src/screens/Search/components/SearchHistory.tsx:49
msgid "Recent Searches"
msgstr ""
@@ -6237,7 +6335,7 @@ msgstr ""
#: src/components/FeedCard.tsx:343
#: src/components/StarterPack/Wizard/WizardListCard.tsx:102
#: src/components/StarterPack/Wizard/WizardListCard.tsx:109
-#: src/screens/Settings/Settings.tsx:543
+#: src/screens/Settings/Settings.tsx:552
#: src/view/com/feeds/FeedSourceCard.tsx:322
#: src/view/com/modals/UserAddRemoveLists.tsx:235
#: src/view/com/posts/PostFeedErrorMessage.tsx:213
@@ -6252,12 +6350,12 @@ msgstr ""
msgid "Remove {historyItem}"
msgstr ""
-#: src/screens/Settings/Settings.tsx:522
-#: src/screens/Settings/Settings.tsx:525
+#: src/screens/Settings/Settings.tsx:531
+#: src/screens/Settings/Settings.tsx:534
msgid "Remove account"
msgstr ""
-#: src/view/com/composer/ExternalEmbedRemoveBtn.tsx:15
+#: src/view/com/composer/ExternalEmbedRemoveBtn.tsx:19
msgid "Remove attachment"
msgstr ""
@@ -6294,7 +6392,7 @@ msgstr ""
msgid "Remove from my feeds"
msgstr ""
-#: src/screens/Settings/Settings.tsx:535
+#: src/screens/Settings/Settings.tsx:544
msgid "Remove from quick access?"
msgstr ""
@@ -6325,12 +6423,8 @@ msgstr ""
msgid "Remove profile"
msgstr ""
-#: src/view/com/util/post-embeds/QuoteEmbed.tsx:290
-msgid "Remove quote"
-msgstr ""
-
-#: src/components/PostControls/RepostButton.tsx:140
-#: src/components/PostControls/RepostButton.tsx:150
+#: src/components/PostControls/RepostButton.tsx:151
+#: src/components/PostControls/RepostButton.tsx:161
msgid "Remove repost"
msgstr ""
@@ -6357,11 +6451,11 @@ msgstr ""
msgid "Remove your verification for this account?"
msgstr ""
-#: src/view/com/util/post-embeds/QuoteEmbed.tsx:110
+#: src/components/Post/Embed/index.tsx:208
msgid "Removed by author"
msgstr ""
-#: src/view/com/util/post-embeds/QuoteEmbed.tsx:108
+#: src/components/Post/Embed/index.tsx:206
msgid "Removed by you"
msgstr ""
@@ -6388,15 +6482,13 @@ msgstr ""
msgid "Removed verification"
msgstr ""
-#: src/view/com/util/post-embeds/QuoteEmbed.tsx:291
-msgid "Removes quoted post"
-msgstr ""
-
#: src/view/com/posts/FeedShutdownMsg.tsx:129
#: src/view/com/posts/FeedShutdownMsg.tsx:133
msgid "Replace with Discover"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:126
+#: src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx:41
#: src/view/screens/Profile.tsx:226
msgid "Replies"
msgstr ""
@@ -6409,7 +6501,7 @@ msgstr ""
msgid "Replies to this post are disabled."
msgstr ""
-#: src/view/com/composer/Composer.tsx:983
+#: src/view/com/composer/Composer.tsx:1027
msgctxt "action"
msgid "Reply"
msgstr ""
@@ -6429,6 +6521,10 @@ msgstr ""
msgid "Reply Hidden by You"
msgstr ""
+#: src/Navigation.tsx:402
+msgid "Reply notifications"
+msgstr ""
+
#: src/components/dialogs/PostInteractionSettingsDialog.tsx:385
msgid "Reply settings"
msgstr ""
@@ -6437,28 +6533,29 @@ msgstr ""
msgid "Reply settings are chosen by the author of the thread"
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:651
+#: src/screens/PostThread/components/HeaderDropdown.tsx:69
+#: src/view/com/post-thread/PostThread.tsx:675
msgid "Reply sorting"
msgstr ""
-#: src/view/com/post/Post.tsx:205
-#: src/view/com/posts/PostFeedItem.tsx:605
+#: src/view/com/post/Post.tsx:204
+#: src/view/com/posts/PostFeedItem.tsx:602
msgctxt "description"
msgid "Reply to <0><1/>"
msgstr ""
-#: src/view/com/posts/PostFeedItem.tsx:596
+#: src/view/com/posts/PostFeedItem.tsx:593
msgctxt "description"
msgid "Reply to a blocked post"
msgstr ""
-#: src/view/com/posts/PostFeedItem.tsx:598
+#: src/view/com/posts/PostFeedItem.tsx:595
msgctxt "description"
msgid "Reply to a post"
msgstr ""
-#: src/view/com/post/Post.tsx:203
-#: src/view/com/posts/PostFeedItem.tsx:602
+#: src/view/com/post/Post.tsx:202
+#: src/view/com/posts/PostFeedItem.tsx:599
msgctxt "description"
msgid "Reply to you"
msgstr ""
@@ -6560,8 +6657,8 @@ msgstr ""
msgid "Report this user"
msgstr ""
-#: src/components/PostControls/RepostButton.tsx:141
#: src/components/PostControls/RepostButton.tsx:152
+#: src/components/PostControls/RepostButton.tsx:163
msgctxt "action"
msgid "Repost"
msgstr ""
@@ -6572,11 +6669,15 @@ msgid "Repost"
msgstr ""
#. Accessibility label for the repost button when the post has not been reposted, verb form followed by number of reposts and noun form
-#: src/components/PostControls/RepostButton.tsx:65
+#: src/components/PostControls/RepostButton.tsx:76
msgid "Repost ({0, plural, one {# repost} other {# reposts}})"
msgstr ""
-#: src/components/PostControls/RepostButton.tsx:133
+#: src/Navigation.tsx:434
+msgid "Repost notifications"
+msgstr ""
+
+#: src/components/PostControls/RepostButton.tsx:144
#: src/components/PostControls/RepostButton.web.tsx:43
#: src/components/PostControls/RepostButton.web.tsx:97
#: src/screens/StarterPack/StarterPackScreen.tsx:561
@@ -6587,26 +6688,36 @@ msgstr ""
msgid "Reposted By"
msgstr ""
-#: src/view/com/posts/PostFeedItem.tsx:347
+#: src/view/com/posts/PostFeedItem.tsx:351
msgid "Reposted by {0}"
msgstr ""
-#: src/view/com/posts/PostFeedItem.tsx:366
+#: src/view/com/posts/PostFeedItem.tsx:370
msgid "Reposted by <0><1/>"
msgstr ""
-#: src/view/com/posts/PostFeedItem.tsx:345
-#: src/view/com/posts/PostFeedItem.tsx:364
+#: src/view/com/posts/PostFeedItem.tsx:349
+#: src/view/com/posts/PostFeedItem.tsx:368
msgid "Reposted by you"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:237
+#: src/screens/Settings/NotificationSettings/index.tsx:170
+#: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41
+msgid "Reposts"
+msgstr ""
+
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:433
+#: src/view/com/post-thread/PostThreadItem.tsx:248
msgid "Reposts of this post"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:175
-#: src/components/dialogs/ChangeEmailDialog.tsx:182
-msgid "Request change"
+#: src/screens/Settings/NotificationSettings/index.tsx:223
+#: src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx:41
+msgid "Reposts of your reposts"
+msgstr ""
+
+#: src/Navigation.tsx:458
+msgid "Reposts of your reposts notifications"
msgstr ""
#: src/view/com/modals/ChangePassword.tsx:253
@@ -6635,10 +6746,6 @@ msgstr ""
msgid "Resend"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:217
-#: src/components/dialogs/ChangeEmailDialog.tsx:227
-#: src/components/dialogs/VerifyEmailDialog.tsx:330
-#: src/components/dialogs/VerifyEmailDialog.tsx:340
#: src/screens/Settings/components/DisableEmail2FADialog.tsx:173
#: src/screens/Settings/components/DisableEmail2FADialog.tsx:176
msgid "Resend email"
@@ -6661,8 +6768,8 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#: src/screens/Settings/Settings.tsx:409
-#: src/screens/Settings/Settings.tsx:411
+#: src/screens/Settings/Settings.tsx:418
+#: src/screens/Settings/Settings.tsx:420
msgid "Reset onboarding state"
msgstr ""
@@ -6683,6 +6790,8 @@ msgstr ""
#: src/components/Error.tsx:65
#: src/components/Lists.tsx:110
#: src/components/moderation/ReportDialog/index.tsx:229
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx:55
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx:57
#: src/components/StarterPack/ProfileStarterPacks.tsx:346
#: src/screens/Login/LoginForm.tsx:323
#: src/screens/Login/LoginForm.tsx:330
@@ -6691,11 +6800,11 @@ msgstr ""
#: src/screens/Messages/Inbox.tsx:197
#: src/screens/Onboarding/StepInterests/index.tsx:217
#: src/screens/Onboarding/StepInterests/index.tsx:220
+#: src/screens/PostThread/components/ThreadError.tsx:75
+#: src/screens/PostThread/components/ThreadError.tsx:81
#: src/screens/Signup/BackNextButtons.tsx:53
#: src/view/com/util/error/ErrorMessage.tsx:60
#: src/view/com/util/error/ErrorScreen.tsx:97
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoFallback.tsx:55
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoFallback.tsx:57
msgid "Retry"
msgstr ""
@@ -6715,7 +6824,7 @@ msgstr ""
#: src/screens/Profile/ProfileFeed/index.tsx:93
#: src/screens/Settings/components/ChangeHandleDialog.tsx:559
-#: src/screens/VideoFeed/index.tsx:1139
+#: src/screens/VideoFeed/index.tsx:1142
#: src/view/screens/NotFound.tsx:60
#: src/view/screens/ProfileList.tsx:1039
msgid "Returns to previous page"
@@ -6741,7 +6850,6 @@ msgstr ""
#: src/view/com/composer/photos/ImageAltTextDialog.tsx:153
#: src/view/com/composer/photos/ImageAltTextDialog.tsx:163
#: src/view/com/modals/CreateOrEditList.tsx:315
-#: src/view/com/modals/EditProfile.tsx:244
#: src/view/screens/SavedFeeds.tsx:109
msgid "Save"
msgstr ""
@@ -6761,10 +6869,6 @@ msgstr ""
msgid "Save changes"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:252
-msgid "Save Changes"
-msgstr ""
-
#: src/components/StarterPack/ShareDialog.tsx:131
#: src/components/StarterPack/ShareDialog.tsx:138
msgid "Save image"
@@ -6796,18 +6900,14 @@ msgstr ""
msgid "Saved to your feeds"
msgstr ""
-#: src/view/com/modals/EditProfile.tsx:245
-msgid "Saves any changes to your profile"
-msgstr ""
-
#: src/view/com/modals/CropImage.web.tsx:105
msgid "Saves image crop settings"
msgstr ""
#: src/components/dms/ChatEmptyPill.tsx:33
#: src/components/NewskieDialog.tsx:105
-#: src/view/com/notifications/NotificationFeedItem.tsx:694
-#: src/view/com/notifications/NotificationFeedItem.tsx:719
+#: src/view/com/notifications/NotificationFeedItem.tsx:695
+#: src/view/com/notifications/NotificationFeedItem.tsx:720
msgid "Say hello!"
msgstr ""
@@ -6820,16 +6920,16 @@ msgstr ""
msgid "Scroll to top"
msgstr ""
-#: src/components/dialogs/SearchablePeopleList.tsx:513
+#: src/components/dialogs/SearchablePeopleList.tsx:514
#: src/components/forms/SearchInput.tsx:34
#: src/components/forms/SearchInput.tsx:36
#: src/screens/Search/Shell.tsx:307
#: src/screens/Search/Shell.tsx:464
-#: src/view/shell/bottom-bar/BottomBar.tsx:196
+#: src/view/shell/bottom-bar/BottomBar.tsx:198
msgid "Search"
msgstr ""
-#: src/Navigation.tsx:229
+#: src/Navigation.tsx:239
#: src/screens/Profile/ProfileSearch.tsx:37
msgid "Search @{0}'s posts"
msgstr ""
@@ -6884,7 +6984,7 @@ msgstr ""
msgid "Search posts"
msgstr ""
-#: src/components/dialogs/SearchablePeopleList.tsx:533
+#: src/components/dialogs/SearchablePeopleList.tsx:534
#: src/components/ProgressGuide/FollowDialog.tsx:702
msgid "Search profiles"
msgstr ""
@@ -6897,7 +6997,7 @@ msgstr ""
msgid "Search..."
msgstr ""
-#: src/components/dialogs/SearchablePeopleList.tsx:534
+#: src/components/dialogs/SearchablePeopleList.tsx:535
#: src/components/ProgressGuide/FollowDialog.tsx:703
msgid "Searches for profiles"
msgstr ""
@@ -6906,10 +7006,6 @@ msgstr ""
msgid "Security step required"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:57
-msgid "Security Step Required"
-msgstr ""
-
#: src/components/RichTextTag.tsx:111
msgid "See {tag} posts"
msgstr ""
@@ -6934,7 +7030,7 @@ msgstr ""
msgid "See this guide"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/Scrubber.tsx:194
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/Scrubber.tsx:195
msgid "Seek slider. Use the arrow keys to seek forwards and backwards, and space to play/pause"
msgstr ""
@@ -7044,7 +7140,7 @@ msgid "Select your date of birth"
msgstr ""
#: src/screens/Onboarding/StepInterests/index.tsx:192
-#: src/screens/Settings/SettingsInterests.tsx:162
+#: src/screens/Settings/InterestsSettings.tsx:165
msgid "Select your interests from the options below"
msgstr ""
@@ -7060,14 +7156,6 @@ msgstr ""
msgid "Send a neat website!"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:295
-msgid "Send confirmation"
-msgstr ""
-
-#: src/components/dialogs/VerifyEmailDialog.tsx:288
-msgid "Send confirmation email"
-msgstr ""
-
#: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:174
#: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:181
#: src/components/dialogs/EmailDialog/screens/Verify.tsx:300
@@ -7153,13 +7241,49 @@ msgstr ""
msgid "Sets email for password reset"
msgstr ""
-#: src/Navigation.tsx:185
-#: src/screens/Settings/Settings.tsx:90
+#: src/Navigation.tsx:195
+#: src/screens/Settings/Settings.tsx:91
#: src/view/shell/desktop/LeftNav.tsx:727
#: src/view/shell/Drawer.tsx:572
msgid "Settings"
msgstr ""
+#: src/screens/Settings/NotificationSettings/index.tsx:154
+msgid "Settings for like notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:132
+msgid "Settings for mention notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:176
+msgid "Settings for new follower notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:231
+msgid "Settings for notifications for everything else"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:202
+msgid "Settings for notifications for likes of your reposts"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:217
+msgid "Settings for notifications for reposts of your reposts"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:143
+msgid "Settings for quote notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:121
+msgid "Settings for reply notifications"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/index.tsx:165
+msgid "Settings for repost notifications"
+msgstr ""
+
#: src/screens/ModerationInteractionSettings/index.tsx:102
msgctxt "toast"
msgid "Settings saved"
@@ -7252,7 +7376,7 @@ msgstr ""
msgid "Share your favorite feed!"
msgstr ""
-#: src/Navigation.tsx:288
+#: src/Navigation.tsx:298
msgid "Shared Preferences Tester"
msgstr ""
@@ -7262,11 +7386,11 @@ msgstr ""
#: src/components/moderation/ContentHider.tsx:200
#: src/components/moderation/LabelPreference.tsx:137
-#: src/components/moderation/PostHider.tsx:124
+#: src/components/moderation/PostHider.tsx:134
msgid "Show"
msgstr ""
-#: src/view/com/util/post-embeds/GifEmbed.tsx:178
+#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:178
msgid "Show alt text"
msgstr ""
@@ -7304,9 +7428,7 @@ msgstr ""
msgid "Show list anyway"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:681
-#: src/view/com/post/Post.tsx:244
-#: src/view/com/posts/PostFeedItem.tsx:561
+#: src/components/Post/ShowMoreTextButton.tsx:51
msgid "Show More"
msgstr ""
@@ -7315,10 +7437,18 @@ msgstr ""
msgid "Show more like this"
msgstr ""
+#: src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx:14
+msgid "Show more replies"
+msgstr ""
+
#: src/view/com/post-thread/PostThreadShowHiddenReplies.tsx:22
msgid "Show muted replies"
msgstr ""
+#: src/screens/Settings/ThreadPreferences.tsx:143
+msgid "Show post replies in a threaded tree view"
+msgstr ""
+
#: src/screens/Settings/FollowingFeedPreferences.tsx:104
#: src/screens/Settings/FollowingFeedPreferences.tsx:114
msgid "Show quote posts"
@@ -7329,15 +7459,17 @@ msgstr ""
msgid "Show replies"
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:625
+#: src/screens/PostThread/components/HeaderDropdown.tsx:43
+#: src/view/com/post-thread/PostThread.tsx:649
msgid "Show replies as"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:151
+#: src/screens/Settings/ThreadPreferences.tsx:285
msgid "Show replies as threaded"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:126
+#: src/screens/Settings/ThreadPreferences.tsx:120
+#: src/screens/Settings/ThreadPreferences.tsx:260
msgid "Show replies by people you follow before all other replies"
msgstr ""
@@ -7364,16 +7496,17 @@ msgstr ""
msgid "Show warning and filter from feeds"
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:916
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:611
+#: src/view/com/post-thread/PostThreadItem.tsx:926
msgid "Shows information about when this post was created"
msgstr ""
-#: src/screens/Settings/Settings.tsx:114
+#: src/screens/Settings/Settings.tsx:115
msgid "Shows other accounts you can switch to"
msgstr ""
#: src/components/moderation/ContentHider.tsx:152
-#: src/components/moderation/PostHider.tsx:79
+#: src/components/moderation/PostHider.tsx:89
msgid "Shows the content"
msgstr ""
@@ -7386,10 +7519,10 @@ msgstr ""
#: src/view/com/auth/SplashScreen.tsx:69
#: src/view/com/auth/SplashScreen.web.tsx:123
#: src/view/com/auth/SplashScreen.web.tsx:131
-#: src/view/shell/bottom-bar/BottomBar.tsx:353
-#: src/view/shell/bottom-bar/BottomBar.tsx:358
-#: src/view/shell/bottom-bar/BottomBarWeb.tsx:209
-#: src/view/shell/bottom-bar/BottomBarWeb.tsx:214
+#: src/view/shell/bottom-bar/BottomBar.tsx:355
+#: src/view/shell/bottom-bar/BottomBar.tsx:360
+#: src/view/shell/bottom-bar/BottomBarWeb.tsx:216
+#: src/view/shell/bottom-bar/BottomBarWeb.tsx:221
#: src/view/shell/NavSignupCard.tsx:57
#: src/view/shell/NavSignupCard.tsx:62
msgid "Sign in"
@@ -7425,9 +7558,9 @@ msgstr ""
msgid "Sign in to view post"
msgstr ""
-#: src/screens/Settings/Settings.tsx:235
-#: src/screens/Settings/Settings.tsx:237
-#: src/screens/Settings/Settings.tsx:269
+#: src/screens/Settings/Settings.tsx:244
+#: src/screens/Settings/Settings.tsx:246
+#: src/screens/Settings/Settings.tsx:278
#: src/screens/SignupQueued.tsx:93
#: src/screens/SignupQueued.tsx:96
#: src/screens/Takendown.tsx:85
@@ -7441,7 +7574,7 @@ msgstr ""
msgid "Sign Out"
msgstr ""
-#: src/screens/Settings/Settings.tsx:266
+#: src/screens/Settings/Settings.tsx:275
#: src/view/shell/desktop/LeftNav.tsx:209
msgid "Sign out?"
msgstr ""
@@ -7456,7 +7589,7 @@ msgstr ""
msgid "Signed in as @{0}"
msgstr ""
-#: src/components/FeedInterstitials.tsx:337
+#: src/components/FeedInterstitials.tsx:343
msgid "Similar accounts"
msgstr ""
@@ -7474,7 +7607,6 @@ msgid "Smaller"
msgstr ""
#: src/components/dialogs/EmailDialog/screens/VerificationReminder.tsx:91
-#: src/components/dialogs/VerifyEmailDialog.tsx:274
msgid "Snoozes the reminder"
msgstr ""
@@ -7487,7 +7619,7 @@ msgstr ""
msgid "Some of your verifications are invalid."
msgstr ""
-#: src/components/FeedInterstitials.tsx:474
+#: src/components/FeedInterstitials.tsx:480
msgid "Some other feeds you might like"
msgstr ""
@@ -7524,10 +7656,13 @@ msgid "Something went wrong, please try again."
msgstr ""
#: src/components/Lists.tsx:174
-#: src/screens/Settings/NotificationSettings.tsx:55
msgid "Something went wrong!"
msgstr ""
+#: src/screens/PostThread/components/ThreadError.tsx:27
+msgid "Something went wrong. Please try again in a moment."
+msgstr ""
+
#: src/components/moderation/ReportDialog/index.tsx:178
msgid "Something went wrong. Please try again."
msgstr ""
@@ -7541,15 +7676,18 @@ msgstr ""
msgid "Sorry! Your session expired. Please sign in again."
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:55
+#: src/screens/Settings/ThreadPreferences.tsx:68
+#: src/screens/Settings/ThreadPreferences.tsx:189
msgid "Sort replies"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:62
+#: src/screens/Settings/ThreadPreferences.tsx:75
+#: src/screens/Settings/ThreadPreferences.tsx:196
msgid "Sort replies by"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:59
+#: src/screens/Settings/ThreadPreferences.tsx:72
+#: src/screens/Settings/ThreadPreferences.tsx:193
msgid "Sort replies to the same post by:"
msgstr ""
@@ -7598,8 +7736,8 @@ msgstr ""
msgid "Start chat with {displayName}"
msgstr ""
-#: src/Navigation.tsx:453
-#: src/Navigation.tsx:458
+#: src/Navigation.tsx:540
+#: src/Navigation.tsx:545
#: src/screens/StarterPack/Wizard/index.tsx:186
msgid "Starter Pack"
msgstr ""
@@ -7608,12 +7746,12 @@ msgstr ""
msgid "Starter pack by {0}"
msgstr ""
-#: src/view/com/profile/ProfileSubpageHeader.tsx:182
+#: src/view/com/profile/ProfileSubpageHeader.tsx:186
msgid "Starter pack by <0/>"
msgstr ""
#: src/components/StarterPack/StarterPackCard.tsx:89
-#: src/view/com/profile/ProfileSubpageHeader.tsx:180
+#: src/view/com/profile/ProfileSubpageHeader.tsx:184
msgid "Starter pack by you"
msgstr ""
@@ -7639,12 +7777,12 @@ msgstr ""
msgid "Step {0} of {1}"
msgstr ""
-#: src/screens/Settings/Settings.tsx:363
+#: src/screens/Settings/Settings.tsx:372
msgid "Storage cleared, you need to restart the app now."
msgstr ""
-#: src/Navigation.tsx:278
-#: src/screens/Settings/Settings.tsx:390
+#: src/Navigation.tsx:288
+#: src/screens/Settings/Settings.tsx:399
msgid "Storybook"
msgstr ""
@@ -7690,7 +7828,6 @@ msgid "Subscribe to this list"
msgstr ""
#: src/components/dialogs/EmailDialog/screens/Update.tsx:286
-#: src/components/dialogs/VerifyEmailDialog.tsx:124
msgid "Success!"
msgstr ""
@@ -7702,7 +7839,7 @@ msgstr ""
msgid "Suggested Accounts"
msgstr ""
-#: src/components/FeedInterstitials.tsx:339
+#: src/components/FeedInterstitials.tsx:345
msgid "Suggested for you"
msgstr ""
@@ -7721,15 +7858,15 @@ msgctxt "Name of app icon variant"
msgid "Sunset"
msgstr ""
-#: src/Navigation.tsx:298
+#: src/Navigation.tsx:308
#: src/view/screens/Support.tsx:31
#: src/view/screens/Support.tsx:34
msgid "Support"
msgstr ""
-#: src/screens/Settings/Settings.tsx:112
-#: src/screens/Settings/Settings.tsx:126
-#: src/screens/Settings/Settings.tsx:485
+#: src/screens/Settings/Settings.tsx:113
+#: src/screens/Settings/Settings.tsx:127
+#: src/screens/Settings/Settings.tsx:494
#: src/view/shell/desktop/LeftNav.tsx:246
msgid "Switch account"
msgstr ""
@@ -7756,7 +7893,7 @@ msgstr ""
#: src/screens/Settings/AboutSettings.tsx:107
#: src/screens/Settings/AboutSettings.tsx:110
-#: src/screens/Settings/Settings.tsx:383
+#: src/screens/Settings/Settings.tsx:392
msgid "System log"
msgstr ""
@@ -7808,7 +7945,7 @@ msgstr ""
msgid "Terms"
msgstr ""
-#: src/Navigation.tsx:308
+#: src/Navigation.tsx:318
#: src/screens/Settings/AboutSettings.tsx:84
#: src/screens/Settings/AboutSettings.tsx:87
#: src/view/screens/TermsOfService.tsx:31
@@ -7845,10 +7982,6 @@ msgstr ""
msgid "Thank you for your feedback! It has been sent to the feed operator."
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:125
-msgid "Thank you! Your email has been successfully verified."
-msgstr ""
-
#: src/components/ReportDialog/SubmitView.tsx:83
msgid "Thank you. Your report has been sent."
msgstr ""
@@ -7878,7 +8011,7 @@ msgstr ""
msgid "That's all, folks!"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:1111
+#: src/screens/VideoFeed/index.tsx:1114
msgid "That's everything!"
msgstr ""
@@ -7917,10 +8050,6 @@ msgstr ""
msgid "The Discover feed now knows what you like"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:74
-msgid "The email address you entered is the same as your current email address."
-msgstr ""
-
#: src/screens/StarterPack/StarterPackLandingScreen.tsx:324
msgid "The experience is better in the app. Download Bluesky now and we'll pick back up where you left off."
msgstr ""
@@ -7941,8 +8070,8 @@ msgstr ""
msgid "The following settings will be used as your defaults when creating new posts. You can edit these for a specific post from the composer."
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:265
-#: src/view/com/post-thread/PostThread.tsx:277
+#: src/view/com/post-thread/PostThread.tsx:267
+#: src/view/com/post-thread/PostThread.tsx:279
msgid "The post may have been deleted."
msgstr ""
@@ -8230,7 +8359,8 @@ msgstr ""
msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us."
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:956
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:651
+#: src/view/com/post-thread/PostThreadItem.tsx:966
msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}."
msgstr ""
@@ -8238,7 +8368,7 @@ msgstr ""
msgid "This post has an unknown type of threadgate on it. Your app may be out of date."
msgstr ""
-#: src/view/com/post-thread/PostThreadItem.tsx:163
+#: src/view/com/post-thread/PostThreadItem.tsx:171
msgid "This post has been deleted."
msgstr ""
@@ -8250,7 +8380,7 @@ msgstr ""
msgid "This post will be hidden from feeds and threads. This cannot be undone."
msgstr ""
-#: src/view/com/composer/Composer.tsx:424
+#: src/view/com/composer/Composer.tsx:463
msgid "This post's author has disabled quote posts."
msgstr ""
@@ -8311,7 +8441,7 @@ msgstr ""
msgid "This will delete \"{0}\" from your muted words. You can always add it back later."
msgstr ""
-#: src/screens/Settings/Settings.tsx:537
+#: src/screens/Settings/Settings.tsx:546
msgid "This will remove @{0} from the quick access list."
msgstr ""
@@ -8319,8 +8449,10 @@ msgstr ""
msgid "This will remove your post from this quote post for all users, and replace it with a placeholder."
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:609
-#: src/view/com/post-thread/PostThread.tsx:612
+#: src/screens/PostThread/components/HeaderDropdown.tsx:23
+#: src/screens/PostThread/components/HeaderDropdown.tsx:26
+#: src/view/com/post-thread/PostThread.tsx:633
+#: src/view/com/post-thread/PostThread.tsx:636
msgid "Thread options"
msgstr ""
@@ -8329,24 +8461,27 @@ msgstr ""
msgid "Thread preferences"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:45
+#: src/screens/Settings/ThreadPreferences.tsx:58
+#: src/screens/Settings/ThreadPreferences.tsx:179
msgid "Thread Preferences"
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:639
-#: src/view/com/post-thread/PostThread.tsx:644
+#: src/screens/PostThread/components/HeaderDropdown.tsx:57
+#: src/screens/PostThread/components/HeaderDropdown.tsx:62
+#: src/view/com/post-thread/PostThread.tsx:663
+#: src/view/com/post-thread/PostThread.tsx:668
msgid "Threaded"
msgstr ""
-#: src/screens/Settings/ThreadPreferences.tsx:142
+#: src/screens/Settings/ThreadPreferences.tsx:276
msgid "Threaded mode"
msgstr ""
-#: src/Navigation.tsx:341
+#: src/Navigation.tsx:351
msgid "Threads Preferences"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/TimeIndicator.tsx:34
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34
msgid "Time remaining: {0, plural, one {# second} other {# seconds}}"
msgstr ""
@@ -8379,7 +8514,7 @@ msgstr ""
msgid "Toggle to enable or disable adult content"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:158
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:158
msgid "Toggles the sound"
msgstr ""
@@ -8389,7 +8524,14 @@ msgstr ""
msgid "Top"
msgstr ""
-#: src/Navigation.tsx:423
+#: src/screens/PostThread/components/HeaderDropdown.tsx:73
+#: src/screens/PostThread/components/HeaderDropdown.tsx:78
+#: src/screens/Settings/ThreadPreferences.tsx:80
+#: src/screens/Settings/ThreadPreferences.tsx:83
+msgid "Top replies first"
+msgstr ""
+
+#: src/Navigation.tsx:510
msgid "Topic"
msgstr ""
@@ -8397,11 +8539,18 @@ msgstr ""
#: src/components/dms/MessageContextMenu.tsx:145
#: src/components/PostControls/PostMenu/PostMenuItems.tsx:444
#: src/components/PostControls/PostMenu/PostMenuItems.tsx:446
-#: src/view/com/post-thread/PostThreadItem.tsx:878
-#: src/view/com/post-thread/PostThreadItem.tsx:881
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:573
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:576
+#: src/view/com/post-thread/PostThreadItem.tsx:888
+#: src/view/com/post-thread/PostThreadItem.tsx:891
msgid "Translate"
msgstr ""
+#: src/screens/Settings/ThreadPreferences.tsx:131
+#: src/screens/Settings/ThreadPreferences.tsx:136
+msgid "Tree view"
+msgstr ""
+
#: src/view/shell/desktop/SidebarTrendingTopics.tsx:59
msgid "Trending"
msgstr ""
@@ -8496,7 +8645,7 @@ msgid "Undo repost"
msgstr ""
#. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun
-#: src/components/PostControls/RepostButton.tsx:55
+#: src/components/PostControls/RepostButton.tsx:66
msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})"
msgstr ""
@@ -8535,8 +8684,8 @@ msgstr ""
msgid "Unlike ({0, plural, one {# like} other {# likes}})"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:155
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VolumeControl.tsx:94
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:155
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx:95
msgctxt "video"
msgid "Unmute"
msgstr ""
@@ -8570,7 +8719,7 @@ msgstr ""
msgid "Unmute thread"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VideoControls.tsx:318
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:318
msgid "Unmute video"
msgstr ""
@@ -8609,8 +8758,8 @@ msgstr ""
msgid "Unpinned from your feeds"
msgstr ""
-#: src/screens/Settings/Settings.tsx:416
-#: src/screens/Settings/Settings.tsx:418
+#: src/screens/Settings/Settings.tsx:425
+#: src/screens/Settings/Settings.tsx:427
msgid "Unsnooze email reminder"
msgstr ""
@@ -8631,7 +8780,7 @@ msgstr ""
msgid "Unsubscribed from list"
msgstr ""
-#: src/view/com/composer/Composer.tsx:769
+#: src/view/com/composer/Composer.tsx:811
msgid "Unsupported video type"
msgstr ""
@@ -8721,7 +8870,7 @@ msgstr ""
msgid "Uploading link thumbnail..."
msgstr ""
-#: src/view/com/composer/Composer.tsx:1672
+#: src/view/com/composer/Composer.tsx:1732
msgid "Uploading video..."
msgstr ""
@@ -8845,7 +8994,7 @@ msgstr ""
msgid "Verification settings"
msgstr ""
-#: src/Navigation.tsx:178
+#: src/Navigation.tsx:188
#: src/screens/Moderation/VerificationSettings.tsx:32
msgid "Verification Settings"
msgstr ""
@@ -8875,17 +9024,10 @@ msgstr ""
msgid "Verify DNS Record"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:234
-#: src/components/dialogs/ChangeEmailDialog.tsx:240
-msgid "Verify email"
-msgstr ""
-
#: src/components/dialogs/EmailDialog/screens/Verify.tsx:214
msgid "Verify email code"
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:122
-#: src/components/dialogs/VerifyEmailDialog.tsx:163
#: src/components/intents/VerifyEmailIntentDialog.tsx:67
msgid "Verify email dialog"
msgstr ""
@@ -8905,17 +9047,13 @@ msgstr ""
msgid "Verify your email"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:114
-msgid "Verify Your Email"
-msgstr ""
-
#: src/screens/Settings/AboutSettings.tsx:126
#: src/screens/Settings/AboutSettings.tsx:155
msgid "Version {appVersion}"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:83
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:134
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:83
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:134
msgid "Video"
msgstr ""
@@ -8923,7 +9061,7 @@ msgstr ""
msgid "Video failed to process"
msgstr ""
-#: src/Navigation.tsx:474
+#: src/Navigation.tsx:561
msgid "Video Feed"
msgstr ""
@@ -8937,15 +9075,15 @@ msgstr ""
msgid "Video Games"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:1069
+#: src/screens/VideoFeed/index.tsx:1072
msgid "Video is paused"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:1069
+#: src/screens/VideoFeed/index.tsx:1072
msgid "Video is playing"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:191
+#: src/components/Post/Embed/VideoEmbed/index.web.tsx:192
msgid "Video not found."
msgstr ""
@@ -8953,11 +9091,11 @@ msgstr ""
msgid "Video settings"
msgstr ""
-#: src/view/com/composer/Composer.tsx:1682
+#: src/view/com/composer/Composer.tsx:1742
msgid "Video uploaded"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative.tsx:83
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:83
msgid "Video: {0}"
msgstr ""
@@ -8978,7 +9116,7 @@ msgstr ""
#: src/screens/Profile/components/ProfileFeedHeader.tsx:454
#: src/screens/Search/components/SearchProfileCard.tsx:36
#: src/screens/VideoFeed/index.tsx:790
-#: src/view/com/notifications/NotificationFeedItem.tsx:545
+#: src/view/com/notifications/NotificationFeedItem.tsx:546
msgid "View {0}'s profile"
msgstr ""
@@ -9033,7 +9171,7 @@ msgstr ""
msgid "View profile"
msgstr ""
-#: src/view/com/profile/ProfileSubpageHeader.tsx:119
+#: src/view/com/profile/ProfileSubpageHeader.tsx:123
msgid "View the avatar"
msgstr ""
@@ -9062,7 +9200,7 @@ msgid "View your default post interaction settings"
msgstr ""
#: src/view/com/home/HomeHeaderLayout.web.tsx:56
-#: src/view/com/home/HomeHeaderLayoutMobile.tsx:77
+#: src/view/com/home/HomeHeaderLayoutMobile.tsx:71
msgid "View your feeds and explore more"
msgstr ""
@@ -9078,8 +9216,8 @@ msgstr ""
msgid "View your verifications"
msgstr ""
-#: src/view/com/util/images/AutoSizedImage.tsx:199
-#: src/view/com/util/images/AutoSizedImage.tsx:221
+#: src/view/com/util/images/AutoSizedImage.tsx:205
+#: src/view/com/util/images/AutoSizedImage.tsx:227
msgid "Views full image"
msgstr ""
@@ -9092,7 +9230,7 @@ msgstr ""
msgid "Visit Site"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbedInner/web-controls/VolumeControl.tsx:80
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx:81
msgid "Volume"
msgstr ""
@@ -9143,7 +9281,7 @@ msgstr ""
msgid "We ran out of posts from your follows. Here's the latest from <0/>."
msgstr ""
-#: src/screens/Settings/SettingsInterests.tsx:155
+#: src/screens/Settings/InterestsSettings.tsx:158
msgid "We recommend selecting at least two interests."
msgstr ""
@@ -9204,7 +9342,7 @@ msgstr ""
msgid "We're sorry, but your search could not be completed. Please try again in a few minutes."
msgstr ""
-#: src/view/com/composer/Composer.tsx:421
+#: src/view/com/composer/Composer.tsx:460
msgid "We're sorry! The post you are replying to has been deleted."
msgstr ""
@@ -9235,7 +9373,7 @@ msgstr ""
#: src/view/com/auth/SplashScreen.tsx:38
#: src/view/com/auth/SplashScreen.web.tsx:99
-#: src/view/com/composer/Composer.tsx:732
+#: src/view/com/composer/Composer.tsx:774
msgid "What's up?"
msgstr ""
@@ -9317,12 +9455,12 @@ msgstr ""
msgid "Write a message"
msgstr ""
-#: src/view/com/composer/Composer.tsx:823
+#: src/view/com/composer/Composer.tsx:867
msgid "Write post"
msgstr ""
-#: src/view/com/composer/Composer.tsx:730
-#: src/view/com/post-thread/PostThreadComposePrompt.tsx:69
+#: src/view/com/composer/Composer.tsx:772
+#: src/view/com/post-thread/PostThreadComposePrompt.tsx:90
msgid "Write your reply"
msgstr ""
@@ -9415,7 +9553,6 @@ msgid "You are verified"
msgstr ""
#: src/screens/Profile/Header/EditProfileDialog.tsx:355
-#: src/view/com/modals/EditProfile.tsx:203
msgid "You are verified. You will lose your verification status if you change your display name. <0>Learn more."
msgstr ""
@@ -9483,7 +9620,7 @@ msgstr ""
msgid "You don't have any saved feeds."
msgstr ""
-#: src/view/com/post-thread/PostThread.tsx:271
+#: src/view/com/post-thread/PostThread.tsx:273
msgid "You have blocked the author or you have been blocked by the author."
msgstr ""
@@ -9603,6 +9740,11 @@ msgstr ""
msgid "You must select at least one labeler for a report"
msgstr ""
+#: src/screens/PostThread/components/ThreadItemAnchorNoUnauthenticated.tsx:27
+#: src/screens/PostThread/components/ThreadItemPostNoUnauthenticated.tsx:47
+msgid "You must sign in to view this post."
+msgstr ""
+
#: src/components/dialogs/EmailDialog/screens/Manage2FA/index.tsx:23
msgid "You need to verify your email address before you can enable email 2FA."
msgstr ""
@@ -9611,7 +9753,7 @@ msgstr ""
msgid "You previously deactivated @{0}."
msgstr ""
-#: src/screens/Settings/Settings.tsx:374
+#: src/screens/Settings/Settings.tsx:383
msgid "You probably want to restart the app now."
msgstr ""
@@ -9623,7 +9765,7 @@ msgstr ""
msgid "You reacted {0} to {1}"
msgstr ""
-#: src/screens/Settings/Settings.tsx:267
+#: src/screens/Settings/Settings.tsx:276
#: src/view/shell/desktop/LeftNav.tsx:210
msgid "You will be signed out of all your accounts."
msgstr ""
@@ -9668,10 +9810,6 @@ msgstr ""
msgid "You'll follow these people right away"
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:216
-msgid "You'll receive an email at <0>{0} to verify it's you."
-msgstr ""
-
#: src/screens/StarterPack/StarterPackLandingScreen.tsx:274
msgid "You'll stay updated with these feeds"
msgstr ""
@@ -9714,7 +9852,7 @@ msgstr ""
msgid "You've reached your daily limit for video uploads (too many videos)"
msgstr ""
-#: src/screens/VideoFeed/index.tsx:1120
+#: src/screens/VideoFeed/index.tsx:1123
msgid "You've run out of videos to watch. Maybe it's a good time to take a break?"
msgstr ""
@@ -9750,7 +9888,7 @@ msgstr ""
msgid "Your birth date"
msgstr ""
-#: src/view/com/util/post-embeds/VideoEmbed.web.tsx:195
+#: src/components/Post/Embed/VideoEmbed/index.web.tsx:196
msgid "Your browser does not support the video format. Please try a different browser."
msgstr ""
@@ -9766,10 +9904,6 @@ msgstr ""
msgid "Your current handle <0>{0} will automatically remain reserved for you. You can switch back to it at any time from this account."
msgstr ""
-#: src/components/dialogs/ChangeEmailDialog.tsx:65
-msgid "Your email address has been updated but it is not yet verified. As a next step, please verify your new email."
-msgstr ""
-
#: src/screens/Login/ForgotPasswordForm.tsx:51
#: src/screens/Signup/state.ts:270
#: src/screens/Signup/StepInfo/index.tsx:98
@@ -9781,10 +9915,6 @@ msgstr ""
msgid "Your email has not yet been verified. Please verify your email in order to enjoy all the features of Bluesky."
msgstr ""
-#: src/components/dialogs/VerifyEmailDialog.tsx:110
-msgid "Your email has not yet been verified. This is an important security step which we recommend."
-msgstr ""
-
#: src/state/shell/progress-guide.tsx:213
msgid "Your first like!"
msgstr ""
@@ -9805,15 +9935,15 @@ msgstr ""
msgid "Your full username will be <0>@{0}"
msgstr ""
-#: src/Navigation.tsx:395
+#: src/Navigation.tsx:482
#: src/screens/Search/modules/ExploreInterestsCard.tsx:67
#: src/screens/Settings/ContentAndMediaSettings.tsx:92
#: src/screens/Settings/ContentAndMediaSettings.tsx:95
-#: src/screens/Settings/SettingsInterests.tsx:39
+#: src/screens/Settings/InterestsSettings.tsx:42
msgid "Your interests"
msgstr ""
-#: src/screens/Settings/SettingsInterests.tsx:124
+#: src/screens/Settings/InterestsSettings.tsx:127
msgctxt "toast"
msgid "Your interests have been updated!"
msgstr ""
@@ -9834,11 +9964,11 @@ msgstr ""
msgid "Your password must be at least 8 characters long."
msgstr ""
-#: src/view/com/composer/Composer.tsx:481
+#: src/view/com/composer/Composer.tsx:522
msgid "Your post has been published"
msgstr ""
-#: src/view/com/composer/Composer.tsx:478
+#: src/view/com/composer/Composer.tsx:519
msgid "Your posts have been published"
msgstr ""
@@ -9850,7 +9980,7 @@ msgstr ""
msgid "Your profile, posts, feeds, and lists will no longer be visible to other Bluesky users. You can reactivate your account at any time by logging in."
msgstr ""
-#: src/view/com/composer/Composer.tsx:480
+#: src/view/com/composer/Composer.tsx:521
msgid "Your reply has been published"
msgstr ""
@@ -9862,7 +9992,7 @@ msgstr ""
msgid "Your report will be sent to the Bluesky Moderation Service"
msgstr ""
-#: src/screens/Settings/SettingsInterests.tsx:53
+#: src/screens/Settings/InterestsSettings.tsx:56
msgid "Your selected interests help us serve you content you care about."
msgstr ""
diff --git a/src/logger/metrics.ts b/src/logger/metrics.ts
index d01a92825b..31af1be2b0 100644
--- a/src/logger/metrics.ts
+++ b/src/logger/metrics.ts
@@ -434,4 +434,13 @@ export type MetricEvents = {
'share:press:dmSelected': {}
'share:press:recentDm': {}
'share:press:embed': {}
+
+ 'thread:click:showOtherReplies': {}
+ 'thread:preferences:load': {
+ [key: string]: any
+ }
+ 'thread:preferences:update': {
+ [key: string]: any
+ }
+ 'thread:click:headerMenuOpen': {}
}
diff --git a/src/logger/sentry/setup/index.ts b/src/logger/sentry/setup/index.ts
index 3819211f3c..f05a7fc833 100644
--- a/src/logger/sentry/setup/index.ts
+++ b/src/logger/sentry/setup/index.ts
@@ -38,4 +38,12 @@ init({
*/
`Network request failed`,
],
+ /**
+ * Does not affect traces of error events or other logs, just disables
+ * automatically attaching stack traces to events. This helps us group events
+ * and prevents explosions of separate issues.
+ *
+ * @see https://docs.sentry.io/platforms/react-native/configuration/options/#attach-stacktrace
+ */
+ attachStacktrace: false,
})
diff --git a/src/logger/types.ts b/src/logger/types.ts
index d14e21a9d4..88d8d9d93d 100644
--- a/src/logger/types.ts
+++ b/src/logger/types.ts
@@ -10,6 +10,8 @@ export enum LogContext {
ConversationAgent = 'conversation-agent',
DMsAgent = 'dms-agent',
ReportDialog = 'report-dialog',
+ FeedFeedback = 'feed-feedback',
+ PostSource = 'post-source',
/**
* METRIC IS FOR INTERNAL USE ONLY, don't create any other loggers using this
diff --git a/src/routes.ts b/src/routes.ts
index 60bb65dd5a..b66a0ae53f 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -1,11 +1,17 @@
import {Router} from '#/lib/routes/router'
+import {type FlatNavigatorParams} from './lib/routes/types'
-export const router = new Router({
+type AllNavigatableRoutes = Omit<
+ FlatNavigatorParams,
+ 'NotFound' | 'SharedPreferencesTester'
+>
+
+export const router = new Router({
Home: '/',
Search: '/search',
Feeds: '/feeds',
Notifications: '/notifications',
- NotificationSettings: '/notifications/settings',
+ LegacyNotificationSettings: '/notifications/settings',
Settings: '/settings',
Lists: '/lists',
// moderation
@@ -42,13 +48,25 @@ export const router = new Router({
AccessibilitySettings: '/settings/accessibility',
AppearanceSettings: '/settings/appearance',
SavedFeeds: '/settings/saved-feeds',
- // new settings
AccountSettings: '/settings/account',
PrivacyAndSecuritySettings: '/settings/privacy-and-security',
ContentAndMediaSettings: '/settings/content-and-media',
- SettingsInterests: '/settings/interests',
+ InterestsSettings: '/settings/interests',
AboutSettings: '/settings/about',
AppIconSettings: '/settings/app-icon',
+ NotificationSettings: '/settings/notifications',
+ ReplyNotificationSettings: '/settings/notifications/replies',
+ MentionNotificationSettings: '/settings/notifications/mentions',
+ QuoteNotificationSettings: '/settings/notifications/quotes',
+ LikeNotificationSettings: '/settings/notifications/likes',
+ RepostNotificationSettings: '/settings/notifications/reposts',
+ NewFollowerNotificationSettings: '/settings/notifications/new-followers',
+ LikesOnRepostsNotificationSettings:
+ '/settings/notifications/likes-on-reposts',
+ RepostsOnRepostsNotificationSettings:
+ '/settings/notifications/reposts-on-reposts',
+ ActivityNotificationSettings: '/settings/notifications/activity',
+ MiscellaneousNotificationSettings: '/settings/notifications/miscellaneous',
// support
Support: '/support',
PrivacyPolicy: '/support/privacy',
diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx
index 6c3d7633ad..b6a528e42b 100644
--- a/src/screens/Login/LoginForm.tsx
+++ b/src/screens/Login/LoginForm.tsx
@@ -3,12 +3,12 @@ import {
ActivityIndicator,
Keyboard,
LayoutAnimation,
- TextInput,
+ type TextInput,
View,
} from 'react-native'
import {
ComAtprotoServerCreateSession,
- ComAtprotoServerDescribeServer,
+ type ComAtprotoServerDescribeServer,
} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
diff --git a/src/screens/Messages/Settings.tsx b/src/screens/Messages/Settings.tsx
index f37e7a9ba1..0b8c88b9dd 100644
--- a/src/screens/Messages/Settings.tsx
+++ b/src/screens/Messages/Settings.tsx
@@ -2,9 +2,9 @@ import {useCallback} from 'react'
import {View} from 'react-native'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
-import {NativeStackScreenProps} from '@react-navigation/native-stack'
+import {type NativeStackScreenProps} from '@react-navigation/native-stack'
-import {CommonNavigatorParams} from '#/lib/routes/types'
+import {type CommonNavigatorParams} from '#/lib/routes/types'
import {isNative} from '#/platform/detection'
import {useUpdateActorDeclaration} from '#/state/queries/messages/actor-declaration'
import {useProfileQuery} from '#/state/queries/profile'
diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx
index ce33ca3aa9..c84371f2c0 100644
--- a/src/screens/Messages/components/MessagesList.tsx
+++ b/src/screens/Messages/components/MessagesList.tsx
@@ -16,6 +16,7 @@ import {
RichText,
} from '@atproto/api'
+import {useHideBottomBarBorderForScreen} from '#/lib/hooks/useHideBottomBarBorder'
import {ScrollProvider} from '#/lib/ScrollContext'
import {shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip'
import {
@@ -106,6 +107,8 @@ export function MessagesList({
const getPost = useGetPost()
const {embedUri, setEmbed} = useMessageEmbed()
+ useHideBottomBarBorderForScreen()
+
const flatListRef = useAnimatedRef()
const [newMessagesPill, setNewMessagesPill] = useState({
diff --git a/src/screens/Onboarding/StepProfile/index.tsx b/src/screens/Onboarding/StepProfile/index.tsx
index 0e738f1456..3d2c551e94 100644
--- a/src/screens/Onboarding/StepProfile/index.tsx
+++ b/src/screens/Onboarding/StepProfile/index.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import {View} from 'react-native'
import {Image as ExpoImage} from 'expo-image'
import {
- ImagePickerOptions,
+ type ImagePickerOptions,
launchImageLibraryAsync,
MediaTypeOptions,
} from 'expo-image-picker'
@@ -27,7 +27,7 @@ import {AvatarCreatorCircle} from '#/screens/Onboarding/StepProfile/AvatarCreato
import {AvatarCreatorItems} from '#/screens/Onboarding/StepProfile/AvatarCreatorItems'
import {
PlaceholderCanvas,
- PlaceholderCanvasRef,
+ type PlaceholderCanvasRef,
} from '#/screens/Onboarding/StepProfile/PlaceholderCanvas'
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -38,7 +38,7 @@ import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components
import {CircleInfo_Stroke2_Corner0_Rounded} from '#/components/icons/CircleInfo'
import {StreamingLive_Stroke2_Corner0_Rounded as StreamingLive} from '#/components/icons/StreamingLive'
import {Text} from '#/components/Typography'
-import {AvatarColor, avatarColors, Emoji, emojiItems} from './types'
+import {type AvatarColor, avatarColors, type Emoji, emojiItems} from './types'
export interface Avatar {
image?: {
diff --git a/src/screens/PostThread/components/HeaderDropdown.tsx b/src/screens/PostThread/components/HeaderDropdown.tsx
new file mode 100644
index 0000000000..def3979b78
--- /dev/null
+++ b/src/screens/PostThread/components/HeaderDropdown.tsx
@@ -0,0 +1,106 @@
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {HITSLOP_10} from '#/lib/constants'
+import {logger} from '#/logger'
+import {type ThreadPreferences} from '#/state/queries/preferences/useThreadPreferences'
+import {Button, ButtonIcon} from '#/components/Button'
+import {SettingsSliderVertical_Stroke2_Corner0_Rounded as SettingsSlider} from '#/components/icons/SettingsSlider'
+import * as Menu from '#/components/Menu'
+
+export function HeaderDropdown({
+ sort,
+ view,
+ setSort,
+ setView,
+}: Pick<
+ ThreadPreferences,
+ 'sort' | 'setSort' | 'view' | 'setView'
+>): React.ReactNode {
+ const {_} = useLingui()
+ return (
+
+
+ {({props: {onPress, ...props}}) => (
+
+ )}
+
+
+
+ Show replies as
+
+
+ {
+ setView('linear')
+ }}>
+
+ Linear
+
+
+
+ {
+ setView('tree')
+ }}>
+
+ Threaded
+
+
+
+
+
+
+ Reply sorting
+
+
+ {
+ setSort('top')
+ }}>
+
+ Top replies first
+
+
+
+ {
+ setSort('oldest')
+ }}>
+
+ Oldest replies first
+
+
+
+ {
+ setSort('newest')
+ }}>
+
+ Newest replies first
+
+
+
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadError.tsx b/src/screens/PostThread/components/ThreadError.tsx
new file mode 100644
index 0000000000..e1ca23cf97
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadError.tsx
@@ -0,0 +1,89 @@
+import {useMemo} from 'react'
+import {View} from 'react-native'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {useCleanError} from '#/lib/hooks/useCleanError'
+import {OUTER_SPACE} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {Button, ButtonIcon, ButtonText} from '#/components/Button'
+import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as RetryIcon} from '#/components/icons/ArrowRotateCounterClockwise'
+import * as Layout from '#/components/Layout'
+import {Text} from '#/components/Typography'
+
+export function ThreadError({
+ error,
+ onRetry,
+}: {
+ error: Error
+ onRetry: () => void
+}) {
+ const t = useTheme()
+ const {_} = useLingui()
+ const cleanError = useCleanError()
+
+ const {title, message} = useMemo(() => {
+ let title = _(msg`Error loading post`)
+ let message = _(msg`Something went wrong. Please try again in a moment.`)
+
+ const {raw, clean} = cleanError(error)
+
+ if (error.message.startsWith('Post not found')) {
+ title = _(msg`Post not found`)
+ message = clean || raw || message
+ }
+
+ return {title, message}
+ }, [_, error, cleanError])
+
+ return (
+
+
+
+
+
+ {title}
+
+
+ {message}
+
+
+
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemAnchor.tsx b/src/screens/PostThread/components/ThreadItemAnchor.tsx
new file mode 100644
index 0000000000..23a92bc286
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemAnchor.tsx
@@ -0,0 +1,713 @@
+import {memo, useCallback, useMemo} from 'react'
+import {type GestureResponderEvent, Text as RNText, View} from 'react-native'
+import {
+ AppBskyFeedDefs,
+ AppBskyFeedPost,
+ type AppBskyFeedThreadgate,
+ AtUri,
+ RichText as RichTextAPI,
+} from '@atproto/api'
+import {msg, Plural, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {useActorStatus} from '#/lib/actor-status'
+import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
+import {useOpenLink} from '#/lib/hooks/useOpenLink'
+import {makeProfileLink} from '#/lib/routes/links'
+import {sanitizeDisplayName} from '#/lib/strings/display-names'
+import {sanitizeHandle} from '#/lib/strings/handles'
+import {niceDate} from '#/lib/strings/time'
+import {getTranslatorLink, isPostInLanguage} from '#/locale/helpers'
+import {logger} from '#/logger'
+import {
+ POST_TOMBSTONE,
+ type Shadow,
+ usePostShadow,
+} from '#/state/cache/post-shadow'
+import {useProfileShadow} from '#/state/cache/profile-shadow'
+import {FeedFeedbackProvider, useFeedFeedback} from '#/state/feed-feedback'
+import {useLanguagePrefs} from '#/state/preferences'
+import {type ThreadItem} from '#/state/queries/usePostThread/types'
+import {useSession} from '#/state/session'
+import {type OnPostSuccessData} from '#/state/shell/composer'
+import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
+import {type PostSource} from '#/state/unstable-post-source'
+import {PostThreadFollowBtn} from '#/view/com/post-thread/PostThreadFollowBtn'
+import {formatCount} from '#/view/com/util/numeric/format'
+import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
+import {
+ LINEAR_AVI_WIDTH,
+ OUTER_SPACE,
+ REPLY_LINE_WIDTH,
+} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {colors} from '#/components/Admonition'
+import {Button} from '#/components/Button'
+import {CalendarClock_Stroke2_Corner0_Rounded as CalendarClockIcon} from '#/components/icons/CalendarClock'
+import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
+import {InlineLinkText, Link} from '#/components/Link'
+import {ContentHider} from '#/components/moderation/ContentHider'
+import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
+import {PostAlerts} from '#/components/moderation/PostAlerts'
+import {type AppModerationCause} from '#/components/Pills'
+import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'
+import {PostControls} from '#/components/PostControls'
+import {ProfileHoverCard} from '#/components/ProfileHoverCard'
+import * as Prompt from '#/components/Prompt'
+import {RichText} from '#/components/RichText'
+import * as Skele from '#/components/Skeleton'
+import {Text} from '#/components/Typography'
+import {VerificationCheckButton} from '#/components/verification/VerificationCheckButton'
+import {WhoCanReply} from '#/components/WhoCanReply'
+import * as bsky from '#/types/bsky'
+
+export function ThreadItemAnchor({
+ item,
+ onPostSuccess,
+ threadgateRecord,
+ postSource,
+}: {
+ item: Extract
+ onPostSuccess?: (data: OnPostSuccessData) => void
+ threadgateRecord?: AppBskyFeedThreadgate.Record
+ postSource?: PostSource
+}) {
+ const postShadow = usePostShadow(item.value.post)
+ const threadRootUri = item.value.post.record.reply?.root?.uri || item.uri
+ const isRoot = threadRootUri === item.uri
+
+ if (postShadow === POST_TOMBSTONE) {
+ return
+ }
+
+ return (
+
+ )
+}
+
+function ThreadItemAnchorDeleted({isRoot}: {isRoot: boolean}) {
+ const t = useTheme()
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+ Post has been deleted
+
+
+
+
+ )
+}
+
+function ThreadItemAnchorParentReplyLine({isRoot}: {isRoot: boolean}) {
+ const t = useTheme()
+
+ return !isRoot ? (
+
+
+
+
+
+ ) : null
+}
+
+const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
+ item,
+ isRoot,
+ postShadow,
+ onPostSuccess,
+ threadgateRecord,
+ postSource,
+}: {
+ item: Extract
+ isRoot: boolean
+ postShadow: Shadow
+ onPostSuccess?: (data: OnPostSuccessData) => void
+ threadgateRecord?: AppBskyFeedThreadgate.Record
+ postSource?: PostSource
+}) {
+ const t = useTheme()
+ const {_, i18n} = useLingui()
+ const {openComposer} = useOpenComposer()
+ const {currentAccount, hasSession} = useSession()
+ const feedFeedback = useFeedFeedback(postSource?.feed, hasSession)
+
+ const post = postShadow
+ const record = item.value.post.record
+ const moderation = item.moderation
+ const authorShadow = useProfileShadow(post.author)
+ const {isActive: live} = useActorStatus(post.author)
+ const richText = useMemo(
+ () =>
+ new RichTextAPI({
+ text: record.text,
+ facets: record.facets,
+ }),
+ [record],
+ )
+
+ const threadRootUri = record.reply?.root?.uri || post.uri
+ const authorHref = makeProfileLink(post.author)
+ const isThreadAuthor = getThreadAuthor(post, record) === currentAccount?.did
+
+ const likesHref = useMemo(() => {
+ const urip = new AtUri(post.uri)
+ return makeProfileLink(post.author, 'post', urip.rkey, 'liked-by')
+ }, [post.uri, post.author])
+ const repostsHref = useMemo(() => {
+ const urip = new AtUri(post.uri)
+ return makeProfileLink(post.author, 'post', urip.rkey, 'reposted-by')
+ }, [post.uri, post.author])
+ const quotesHref = useMemo(() => {
+ const urip = new AtUri(post.uri)
+ return makeProfileLink(post.author, 'post', urip.rkey, 'quotes')
+ }, [post.uri, post.author])
+
+ const threadgateHiddenReplies = useMergedThreadgateHiddenReplies({
+ threadgateRecord,
+ })
+ const additionalPostAlerts: AppModerationCause[] = useMemo(() => {
+ const isPostHiddenByThreadgate = threadgateHiddenReplies.has(post.uri)
+ const isControlledByViewer =
+ new AtUri(threadRootUri).host === currentAccount?.did
+ return isControlledByViewer && isPostHiddenByThreadgate
+ ? [
+ {
+ type: 'reply-hidden',
+ source: {type: 'user', did: currentAccount?.did},
+ priority: 6,
+ },
+ ]
+ : []
+ }, [post, currentAccount?.did, threadgateHiddenReplies, threadRootUri])
+ const onlyFollowersCanReply = !!threadgateRecord?.allow?.find(
+ rule => rule.$type === 'app.bsky.feed.threadgate#followerRule',
+ )
+ const showFollowButton =
+ currentAccount?.did !== post.author.did && !onlyFollowersCanReply
+
+ const viaRepost = useMemo(() => {
+ const reason = postSource?.post.reason
+
+ if (AppBskyFeedDefs.isReasonRepost(reason) && reason.uri && reason.cid) {
+ return {
+ uri: reason.uri,
+ cid: reason.cid,
+ }
+ }
+ }, [postSource])
+
+ const onPressReply = useCallback(() => {
+ openComposer({
+ replyTo: {
+ uri: post.uri,
+ cid: post.cid,
+ text: record.text,
+ author: post.author,
+ embed: post.embed,
+ moderation,
+ },
+ onPostSuccess: onPostSuccess,
+ })
+
+ if (postSource) {
+ feedFeedback.sendInteraction({
+ item: post.uri,
+ event: 'app.bsky.feed.defs#interactionReply',
+ feedContext: postSource.post.feedContext,
+ reqId: postSource.post.reqId,
+ })
+ }
+ }, [
+ openComposer,
+ post,
+ record,
+ onPostSuccess,
+ moderation,
+ postSource,
+ feedFeedback,
+ ])
+
+ const onOpenAuthor = () => {
+ if (postSource) {
+ feedFeedback.sendInteraction({
+ item: post.uri,
+ event: 'app.bsky.feed.defs#clickthroughAuthor',
+ feedContext: postSource.post.feedContext,
+ reqId: postSource.post.reqId,
+ })
+ }
+ }
+
+ const onOpenEmbed = () => {
+ if (postSource) {
+ feedFeedback.sendInteraction({
+ item: post.uri,
+ event: 'app.bsky.feed.defs#clickthroughEmbed',
+ feedContext: postSource.post.feedContext,
+ reqId: postSource.post.reqId,
+ })
+ }
+ }
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+ {sanitizeDisplayName(
+ post.author.displayName ||
+ sanitizeHandle(post.author.handle),
+ moderation.ui('displayName'),
+ )}
+
+
+
+
+
+
+
+ {sanitizeHandle(post.author.handle, '@')}
+
+
+
+
+ {showFollowButton && (
+
+
+
+ )}
+
+
+
+
+
+ {richText?.text ? (
+
+ ) : undefined}
+ {post.embed && (
+
+
+
+ )}
+
+
+ {post.repostCount !== 0 ||
+ post.likeCount !== 0 ||
+ post.quoteCount !== 0 ? (
+ // Show this section unless we're *sure* it has no engagement.
+
+ {post.repostCount != null && post.repostCount !== 0 ? (
+
+
+
+ {formatCount(i18n, post.repostCount)}
+ {' '}
+
+
+
+ ) : null}
+ {post.quoteCount != null &&
+ post.quoteCount !== 0 &&
+ !post.viewer?.embeddingDisabled ? (
+
+
+
+ {formatCount(i18n, post.quoteCount)}
+ {' '}
+
+
+
+ ) : null}
+ {post.likeCount != null && post.likeCount !== 0 ? (
+
+
+
+ {formatCount(i18n, post.likeCount)}
+ {' '}
+
+
+
+ ) : null}
+
+ ) : null}
+
+
+
+
+
+
+
+
+ )
+})
+
+function ExpandedPostDetails({
+ post,
+ isThreadAuthor,
+}: {
+ post: Extract['value']['post']
+ isThreadAuthor: boolean
+}) {
+ const t = useTheme()
+ const {_, i18n} = useLingui()
+ const openLink = useOpenLink()
+ const langPrefs = useLanguagePrefs()
+
+ const translatorUrl = getTranslatorLink(
+ post.record?.text || '',
+ langPrefs.primaryLanguage,
+ )
+ const needsTranslation = useMemo(
+ () =>
+ Boolean(
+ langPrefs.primaryLanguage &&
+ !isPostInLanguage(post, [langPrefs.primaryLanguage]),
+ ),
+ [post, langPrefs.primaryLanguage],
+ )
+
+ const onTranslatePress = useCallback(
+ (e: GestureResponderEvent) => {
+ e.preventDefault()
+ openLink(translatorUrl, true)
+
+ if (
+ bsky.dangerousIsType(
+ post.record,
+ AppBskyFeedPost.isRecord,
+ )
+ ) {
+ logger.metric('translate', {
+ sourceLanguages: post.record.langs ?? [],
+ targetLanguage: langPrefs.primaryLanguage,
+ textLength: post.record.text.length,
+ })
+ }
+
+ return false
+ },
+ [openLink, translatorUrl, langPrefs, post],
+ )
+
+ return (
+
+
+
+
+ {niceDate(i18n, post.indexedAt)}
+
+
+ {needsTranslation && (
+ <>
+
+ ·
+
+
+
+ Translate
+
+
+ )}
+
+
+ )
+}
+
+function BackdatedPostIndicator({post}: {post: AppBskyFeedDefs.PostView}) {
+ const t = useTheme()
+ const {_, i18n} = useLingui()
+ const control = Prompt.usePromptControl()
+
+ const indexedAt = new Date(post.indexedAt)
+ const createdAt = bsky.dangerousIsType(
+ post.record,
+ AppBskyFeedPost.isRecord,
+ )
+ ? new Date(post.record.createdAt)
+ : new Date(post.indexedAt)
+
+ // backdated if createdAt is 24 hours or more before indexedAt
+ const isBackdated =
+ indexedAt.getTime() - createdAt.getTime() > 24 * 60 * 60 * 1000
+
+ if (!isBackdated) return null
+
+ const orange = t.name === 'light' ? colors.warning.dark : colors.warning.light
+
+ return (
+ <>
+
+
+
+
+ Archived post
+
+
+
+ This post claims to have been created on{' '}
+ {niceDate(i18n, createdAt)},
+ but was first seen by Bluesky on{' '}
+ {niceDate(i18n, indexedAt)}.
+
+
+
+
+ Bluesky cannot confirm the authenticity of the claimed date.
+
+
+
+ {}} />
+
+
+
+ )
+}
+
+function getThreadAuthor(
+ post: AppBskyFeedDefs.PostView,
+ record: AppBskyFeedPost.Record,
+): string {
+ if (!record.reply) {
+ return post.author.did
+ }
+ try {
+ return new AtUri(record.reply.root.uri).host
+ } catch {
+ return ''
+ }
+}
+
+export function ThreadItemAnchorSkeleton() {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemAnchorNoUnauthenticated.tsx b/src/screens/PostThread/components/ThreadItemAnchorNoUnauthenticated.tsx
new file mode 100644
index 0000000000..c8477e211f
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemAnchorNoUnauthenticated.tsx
@@ -0,0 +1,32 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {atoms as a, useTheme} from '#/alf'
+import {Lock_Stroke2_Corner0_Rounded as LockIcon} from '#/components/icons/Lock'
+import * as Skele from '#/components/Skeleton'
+import {Text} from '#/components/Typography'
+
+export function ThreadItemAnchorNoUnauthenticated() {
+ const t = useTheme()
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ You must sign in to view this post.
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemPost.tsx b/src/screens/PostThread/components/ThreadItemPost.tsx
new file mode 100644
index 0000000000..4337397f84
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemPost.tsx
@@ -0,0 +1,401 @@
+import {memo, type ReactNode, useCallback, useMemo, useState} from 'react'
+import {View} from 'react-native'
+import {
+ type AppBskyFeedDefs,
+ type AppBskyFeedThreadgate,
+ AtUri,
+ RichText as RichTextAPI,
+} from '@atproto/api'
+import {Trans} from '@lingui/macro'
+
+import {useActorStatus} from '#/lib/actor-status'
+import {MAX_POST_LINES} from '#/lib/constants'
+import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
+import {makeProfileLink} from '#/lib/routes/links'
+import {countLines} from '#/lib/strings/helpers'
+import {
+ POST_TOMBSTONE,
+ type Shadow,
+ usePostShadow,
+} from '#/state/cache/post-shadow'
+import {type ThreadItem} from '#/state/queries/usePostThread/types'
+import {useSession} from '#/state/session'
+import {type OnPostSuccessData} from '#/state/shell/composer'
+import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
+import {PostMeta} from '#/view/com/util/PostMeta'
+import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
+import {
+ LINEAR_AVI_WIDTH,
+ OUTER_SPACE,
+ REPLY_LINE_WIDTH,
+} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {useInteractionState} from '#/components/hooks/useInteractionState'
+import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
+import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
+import {PostAlerts} from '#/components/moderation/PostAlerts'
+import {PostHider} from '#/components/moderation/PostHider'
+import {type AppModerationCause} from '#/components/Pills'
+import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'
+import {ShowMoreTextButton} from '#/components/Post/ShowMoreTextButton'
+import {PostControls} from '#/components/PostControls'
+import {RichText} from '#/components/RichText'
+import * as Skele from '#/components/Skeleton'
+import {SubtleWebHover} from '#/components/SubtleWebHover'
+import {Text} from '#/components/Typography'
+
+export type ThreadItemPostProps = {
+ item: Extract
+ overrides?: {
+ moderation?: boolean
+ topBorder?: boolean
+ }
+ onPostSuccess?: (data: OnPostSuccessData) => void
+ threadgateRecord?: AppBskyFeedThreadgate.Record
+}
+
+export function ThreadItemPost({
+ item,
+ overrides,
+ onPostSuccess,
+ threadgateRecord,
+}: ThreadItemPostProps) {
+ const postShadow = usePostShadow(item.value.post)
+
+ if (postShadow === POST_TOMBSTONE) {
+ return
+ }
+
+ return (
+
+ )
+}
+
+function ThreadItemPostDeleted({
+ item,
+ overrides,
+}: Pick) {
+ const t = useTheme()
+
+ return (
+
+
+
+
+
+
+
+
+ Post has been deleted
+
+
+
+
+
+ )
+}
+
+const ThreadItemPostOuterWrapper = memo(function ThreadItemPostOuterWrapper({
+ item,
+ overrides,
+ children,
+}: Pick & {
+ children: ReactNode
+}) {
+ const t = useTheme()
+ const showTopBorder =
+ !item.ui.showParentReplyLine && overrides?.topBorder !== true
+
+ return (
+
+ {children}
+
+ )
+})
+
+/**
+ * Provides some space between posts as well as contains the reply line
+ */
+const ThreadItemPostParentReplyLine = memo(
+ function ThreadItemPostParentReplyLine({
+ item,
+ }: Pick) {
+ const t = useTheme()
+ return (
+
+
+ {item.ui.showParentReplyLine && (
+
+ )}
+
+
+ )
+ },
+)
+
+const ThreadItemPostInner = memo(function ThreadItemPostInner({
+ item,
+ postShadow,
+ overrides,
+ onPostSuccess,
+ threadgateRecord,
+}: ThreadItemPostProps & {
+ postShadow: Shadow
+}) {
+ const t = useTheme()
+ const {openComposer} = useOpenComposer()
+ const {currentAccount} = useSession()
+
+ const post = item.value.post
+ const record = item.value.post.record
+ const moderation = item.moderation
+ const richText = useMemo(
+ () =>
+ new RichTextAPI({
+ text: record.text,
+ facets: record.facets,
+ }),
+ [record],
+ )
+ const [limitLines, setLimitLines] = useState(
+ () => countLines(richText?.text) >= MAX_POST_LINES,
+ )
+ const threadRootUri = record.reply?.root?.uri || post.uri
+ const postHref = useMemo(() => {
+ const urip = new AtUri(post.uri)
+ return makeProfileLink(post.author, 'post', urip.rkey)
+ }, [post.uri, post.author])
+ const threadgateHiddenReplies = useMergedThreadgateHiddenReplies({
+ threadgateRecord,
+ })
+ const additionalPostAlerts: AppModerationCause[] = useMemo(() => {
+ const isPostHiddenByThreadgate = threadgateHiddenReplies.has(post.uri)
+ const isControlledByViewer =
+ new AtUri(threadRootUri).host === currentAccount?.did
+ return isControlledByViewer && isPostHiddenByThreadgate
+ ? [
+ {
+ type: 'reply-hidden',
+ source: {type: 'user', did: currentAccount?.did},
+ priority: 6,
+ },
+ ]
+ : []
+ }, [post, currentAccount?.did, threadgateHiddenReplies, threadRootUri])
+
+ const onPressReply = useCallback(() => {
+ openComposer({
+ replyTo: {
+ uri: post.uri,
+ cid: post.cid,
+ text: record.text,
+ author: post.author,
+ embed: post.embed,
+ moderation,
+ },
+ onPostSuccess: onPostSuccess,
+ })
+ }, [openComposer, post, record, onPostSuccess, moderation])
+
+ const onPressShowMore = useCallback(() => {
+ setLimitLines(false)
+ }, [setLimitLines])
+
+ const {isActive: live} = useActorStatus(post.author)
+
+ return (
+
+
+
+
+
+
+
+
+
+ {(item.ui.showChildReplyLine ||
+ item.ui.precedesChildReadMore) && (
+
+ )}
+
+
+
+
+
+
+ {richText?.text ? (
+ <>
+
+ {limitLines && (
+
+ )}
+
+ ) : undefined}
+ {post.embed && (
+
+
+
+ )}
+
+
+
+
+
+
+ )
+})
+
+function SubtleHover({children}: {children: ReactNode}) {
+ const {
+ state: hover,
+ onIn: onHoverIn,
+ onOut: onHoverOut,
+ } = useInteractionState()
+ return (
+
+
+ {children}
+
+ )
+}
+
+export function ThreadItemPostSkeleton({index}: {index: number}) {
+ const even = index % 2 === 0
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ {even ? (
+ <>
+
+
+
+ ) : (
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemPostNoUnauthenticated.tsx b/src/screens/PostThread/components/ThreadItemPostNoUnauthenticated.tsx
new file mode 100644
index 0000000000..552d8f813e
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemPostNoUnauthenticated.tsx
@@ -0,0 +1,74 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {type ThreadItem} from '#/state/queries/usePostThread/types'
+import {
+ LINEAR_AVI_WIDTH,
+ OUTER_SPACE,
+ REPLY_LINE_WIDTH,
+} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {Lock_Stroke2_Corner0_Rounded as LockIcon} from '#/components/icons/Lock'
+import * as Skele from '#/components/Skeleton'
+import {Text} from '#/components/Typography'
+
+export function ThreadItemPostNoUnauthenticated({
+ item,
+}: {
+ item: Extract
+}) {
+ const t = useTheme()
+
+ return (
+
+
+
+ {item.ui.showParentReplyLine && (
+
+ )}
+
+
+
+
+
+
+
+
+ You must sign in to view this post.
+
+
+
+ {item.ui.showChildReplyLine && (
+
+ )}
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemPostTombstone.tsx b/src/screens/PostThread/components/ThreadItemPostTombstone.tsx
new file mode 100644
index 0000000000..4f1ab450bb
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemPostTombstone.tsx
@@ -0,0 +1,55 @@
+import {useMemo} from 'react'
+import {View} from 'react-native'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {LINEAR_AVI_WIDTH, OUTER_SPACE} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {PersonX_Stroke2_Corner0_Rounded as PersonXIcon} from '#/components/icons/Person'
+import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
+import {Text} from '#/components/Typography'
+
+export type ThreadItemPostTombstoneProps = {
+ type: 'not-found' | 'blocked'
+}
+
+export function ThreadItemPostTombstone({type}: ThreadItemPostTombstoneProps) {
+ const t = useTheme()
+ const {_} = useLingui()
+ const {copy, Icon} = useMemo(() => {
+ switch (type) {
+ case 'blocked':
+ return {copy: _(msg`Post blocked`), Icon: PersonXIcon}
+ case 'not-found':
+ default:
+ return {copy: _(msg`Post not found`), Icon: TrashIcon}
+ }
+ }, [_, type])
+
+ return (
+
+
+
+
+
+
+ {copy}
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemReadMore.tsx b/src/screens/PostThread/components/ThreadItemReadMore.tsx
new file mode 100644
index 0000000000..22ae633951
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemReadMore.tsx
@@ -0,0 +1,107 @@
+import {memo} from 'react'
+import {View} from 'react-native'
+import {msg, Plural, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {
+ type PostThreadParams,
+ type ThreadItem,
+} from '#/state/queries/usePostThread'
+import {
+ LINEAR_AVI_WIDTH,
+ REPLY_LINE_WIDTH,
+ TREE_AVI_WIDTH,
+ TREE_INDENT,
+} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {CirclePlus_Stroke2_Corner0_Rounded as CirclePlus} from '#/components/icons/CirclePlus'
+import {Link} from '#/components/Link'
+import {Text} from '#/components/Typography'
+
+export const ThreadItemReadMore = memo(function ThreadItemReadMore({
+ item,
+ view,
+}: {
+ item: Extract
+ view: PostThreadParams['view']
+}) {
+ const t = useTheme()
+ const {_} = useLingui()
+ const isTreeView = view === 'tree'
+ const indent = Math.max(0, item.depth - 1)
+
+ const spacers = isTreeView
+ ? Array.from(Array(indent)).map((_, n: number) => {
+ const isSkipped = item.skippedIndentIndices.has(n)
+ return (
+
+ )
+ })
+ : null
+
+ return (
+
+ {spacers}
+
+
+ {({hovered, pressed}) => {
+ const interacted = hovered || pressed
+ return (
+ <>
+
+
+
+ Read {item.moreReplies} more{' '}
+
+
+
+
+ )
+ }}
+
+
+ )
+})
diff --git a/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx b/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx
new file mode 100644
index 0000000000..da18a19e90
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx
@@ -0,0 +1,89 @@
+import {memo} from 'react'
+import {View} from 'react-native'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {type ThreadItem} from '#/state/queries/usePostThread'
+import {
+ LINEAR_AVI_WIDTH,
+ OUTER_SPACE,
+ REPLY_LINE_WIDTH,
+} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {ArrowTopCircle_Stroke2_Corner0_Rounded as UpIcon} from '#/components/icons/ArrowTopCircle'
+import {Link} from '#/components/Link'
+import {Text} from '#/components/Typography'
+
+export const ThreadItemReadMoreUp = memo(function ThreadItemReadMoreUp({
+ item,
+}: {
+ item: Extract
+}) {
+ const t = useTheme()
+ const {_} = useLingui()
+
+ return (
+
+ {({hovered, pressed}) => {
+ const interacted = hovered || pressed
+ return (
+
+
+
+
+
+
+ Continue thread...
+
+
+
+
+
+
+ )
+ }}
+
+ )
+})
diff --git a/src/screens/PostThread/components/ThreadItemReplyComposer.tsx b/src/screens/PostThread/components/ThreadItemReplyComposer.tsx
new file mode 100644
index 0000000000..d93612be8e
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemReplyComposer.tsx
@@ -0,0 +1,20 @@
+import {View} from 'react-native'
+
+import {atoms as a, useBreakpoints, useTheme} from '#/alf'
+import * as Skele from '#/components/Skeleton'
+
+export function ThreadItemReplyComposerSkeleton() {
+ const t = useTheme()
+ const {gtMobile} = useBreakpoints()
+
+ if (!gtMobile) return null
+
+ return (
+
+
+
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx b/src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx
new file mode 100644
index 0000000000..e418375b65
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx
@@ -0,0 +1,59 @@
+import {View} from 'react-native'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {logger} from '#/logger'
+import {atoms as a, useTheme} from '#/alf'
+import {Button} from '#/components/Button'
+import {EyeSlash_Stroke2_Corner0_Rounded as EyeSlash} from '#/components/icons/EyeSlash'
+import {Text} from '#/components/Typography'
+
+export function ThreadItemShowOtherReplies({onPress}: {onPress: () => void}) {
+ const {_} = useLingui()
+ const t = useTheme()
+ const label = _(msg`Show more replies`)
+
+ return (
+
+ )
+}
diff --git a/src/screens/PostThread/components/ThreadItemTreePost.tsx b/src/screens/PostThread/components/ThreadItemTreePost.tsx
new file mode 100644
index 0000000000..a8ffb76f46
--- /dev/null
+++ b/src/screens/PostThread/components/ThreadItemTreePost.tsx
@@ -0,0 +1,450 @@
+import {memo, useCallback, useMemo, useState} from 'react'
+import {View} from 'react-native'
+import {
+ type AppBskyFeedDefs,
+ type AppBskyFeedThreadgate,
+ AtUri,
+ RichText as RichTextAPI,
+} from '@atproto/api'
+import {Trans} from '@lingui/macro'
+
+import {MAX_POST_LINES} from '#/lib/constants'
+import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
+import {makeProfileLink} from '#/lib/routes/links'
+import {countLines} from '#/lib/strings/helpers'
+import {
+ POST_TOMBSTONE,
+ type Shadow,
+ usePostShadow,
+} from '#/state/cache/post-shadow'
+import {type ThreadItem} from '#/state/queries/usePostThread/types'
+import {useSession} from '#/state/session'
+import {type OnPostSuccessData} from '#/state/shell/composer'
+import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
+import {PostMeta} from '#/view/com/util/PostMeta'
+import {
+ OUTER_SPACE,
+ REPLY_LINE_WIDTH,
+ TREE_AVI_WIDTH,
+ TREE_INDENT,
+} from '#/screens/PostThread/const'
+import {atoms as a, useTheme} from '#/alf'
+import {useInteractionState} from '#/components/hooks/useInteractionState'
+import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
+import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
+import {PostAlerts} from '#/components/moderation/PostAlerts'
+import {PostHider} from '#/components/moderation/PostHider'
+import {type AppModerationCause} from '#/components/Pills'
+import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'
+import {ShowMoreTextButton} from '#/components/Post/ShowMoreTextButton'
+import {PostControls} from '#/components/PostControls'
+import {RichText} from '#/components/RichText'
+import * as Skele from '#/components/Skeleton'
+import {SubtleWebHover} from '#/components/SubtleWebHover'
+import {Text} from '#/components/Typography'
+
+/**
+ * Mimic the space in PostMeta
+ */
+const TREE_AVI_PLUS_SPACE = TREE_AVI_WIDTH + a.gap_xs.gap
+
+export function ThreadItemTreePost({
+ item,
+ overrides,
+ onPostSuccess,
+ threadgateRecord,
+}: {
+ item: Extract
+ overrides?: {
+ moderation?: boolean
+ topBorder?: boolean
+ }
+ onPostSuccess?: (data: OnPostSuccessData) => void
+ threadgateRecord?: AppBskyFeedThreadgate.Record
+}) {
+ const postShadow = usePostShadow(item.value.post)
+
+ if (postShadow === POST_TOMBSTONE) {
+ return
+ }
+
+ return (
+
+ )
+}
+
+function ThreadItemTreePostDeleted({
+ item,
+}: {
+ item: Extract
+}) {
+ const t = useTheme()
+ return (
+
+
+
+
+
+ Post has been deleted
+
+
+ {item.ui.isLastChild && !item.ui.precedesChildReadMore && (
+
+ )}
+
+
+ )
+}
+
+const ThreadItemTreePostOuterWrapper = memo(
+ function ThreadItemTreePostOuterWrapper({
+ item,
+ children,
+ }: {
+ item: Extract
+ children: React.ReactNode
+ }) {
+ const t = useTheme()
+ const indents = Math.max(0, item.ui.indent - 1)
+
+ return (
+
+ {Array.from(Array(indents)).map((_, n: number) => {
+ const isSkipped = item.ui.skippedIndentIndices.has(n)
+ return (
+
+ )
+ })}
+ {children}
+
+ )
+ },
+)
+
+const ThreadItemTreePostInnerWrapper = memo(
+ function ThreadItemTreePostInnerWrapper({
+ item,
+ children,
+ }: {
+ item: Extract
+ children: React.ReactNode
+ }) {
+ const t = useTheme()
+ return (
+
+ {item.ui.indent > 1 && (
+
+ )}
+ {children}
+
+ )
+ },
+)
+
+const ThreadItemTreeReplyChildReplyLine = memo(
+ function ThreadItemTreeReplyChildReplyLine({
+ item,
+ }: {
+ item: Extract
+ }) {
+ const t = useTheme()
+ return (
+
+ {item.ui.showChildReplyLine && (
+
+ )}
+
+ )
+ },
+)
+
+const ThreadItemTreePostInner = memo(function ThreadItemTreePostInner({
+ item,
+ postShadow,
+ overrides,
+ onPostSuccess,
+ threadgateRecord,
+}: {
+ item: Extract
+ postShadow: Shadow
+ overrides?: {
+ moderation?: boolean
+ topBorder?: boolean
+ }
+ onPostSuccess?: (data: OnPostSuccessData) => void
+ threadgateRecord?: AppBskyFeedThreadgate.Record
+}): React.ReactNode {
+ const {openComposer} = useOpenComposer()
+ const {currentAccount} = useSession()
+
+ const post = item.value.post
+ const record = item.value.post.record
+ const moderation = item.moderation
+ const richText = useMemo(
+ () =>
+ new RichTextAPI({
+ text: record.text,
+ facets: record.facets,
+ }),
+ [record],
+ )
+ const [limitLines, setLimitLines] = useState(
+ () => countLines(richText?.text) >= MAX_POST_LINES,
+ )
+ const threadRootUri = record.reply?.root?.uri || post.uri
+ const postHref = useMemo(() => {
+ const urip = new AtUri(post.uri)
+ return makeProfileLink(post.author, 'post', urip.rkey)
+ }, [post.uri, post.author])
+ const threadgateHiddenReplies = useMergedThreadgateHiddenReplies({
+ threadgateRecord,
+ })
+ const additionalPostAlerts: AppModerationCause[] = useMemo(() => {
+ const isPostHiddenByThreadgate = threadgateHiddenReplies.has(post.uri)
+ const isControlledByViewer =
+ new AtUri(threadRootUri).host === currentAccount?.did
+ return isControlledByViewer && isPostHiddenByThreadgate
+ ? [
+ {
+ type: 'reply-hidden',
+ source: {type: 'user', did: currentAccount?.did},
+ priority: 6,
+ },
+ ]
+ : []
+ }, [post, currentAccount?.did, threadgateHiddenReplies, threadRootUri])
+
+ const onPressReply = useCallback(() => {
+ openComposer({
+ replyTo: {
+ uri: post.uri,
+ cid: post.cid,
+ text: record.text,
+ author: post.author,
+ embed: post.embed,
+ moderation,
+ },
+ onPostSuccess: onPostSuccess,
+ })
+ }, [openComposer, post, record, onPostSuccess, moderation])
+
+ const onPressShowMore = useCallback(() => {
+ setLimitLines(false)
+ }, [setLimitLines])
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ {richText?.text ? (
+ <>
+
+ {limitLines && (
+
+ )}
+
+ ) : undefined}
+ {post.embed && (
+
+
+
+ )}
+
+
+
+
+
+
+
+
+ )
+})
+
+function SubtleHover({children}: {children: React.ReactNode}) {
+ const {
+ state: hover,
+ onIn: onHoverIn,
+ onOut: onHoverOut,
+ } = useInteractionState()
+ return (
+
+
+ {children}
+
+ )
+}
+
+export function ThreadItemTreePostSkeleton({index}: {index: number}) {
+ const t = useTheme()
+ const even = index % 2 === 0
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ {even ? (
+ <>
+
+
+
+ ) : (
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
diff --git a/src/screens/PostThread/const.ts b/src/screens/PostThread/const.ts
new file mode 100644
index 0000000000..cf559ac4e7
--- /dev/null
+++ b/src/screens/PostThread/const.ts
@@ -0,0 +1,7 @@
+import {tokens} from '#/alf'
+
+export const TREE_INDENT = tokens.space.lg
+export const TREE_AVI_WIDTH = 24
+export const LINEAR_AVI_WIDTH = 42
+export const REPLY_LINE_WIDTH = 2
+export const OUTER_SPACE = tokens.space.lg
diff --git a/src/screens/PostThread/index.tsx b/src/screens/PostThread/index.tsx
new file mode 100644
index 0000000000..a4f94851ad
--- /dev/null
+++ b/src/screens/PostThread/index.tsx
@@ -0,0 +1,577 @@
+import {useCallback, useMemo, useRef, useState} from 'react'
+import {useWindowDimensions, View} from 'react-native'
+import Animated, {useAnimatedStyle} from 'react-native-reanimated'
+import {Trans} from '@lingui/macro'
+
+import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
+import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
+import {useFeedFeedback} from '#/state/feed-feedback'
+import {type ThreadViewOption} from '#/state/queries/preferences/useThreadPreferences'
+import {type ThreadItem, usePostThread} from '#/state/queries/usePostThread'
+import {useSession} from '#/state/session'
+import {type OnPostSuccessData} from '#/state/shell/composer'
+import {useShellLayout} from '#/state/shell/shell-layout'
+import {useUnstablePostSource} from '#/state/unstable-post-source'
+import {PostThreadComposePrompt} from '#/view/com/post-thread/PostThreadComposePrompt'
+import {List, type ListMethods} from '#/view/com/util/List'
+import {HeaderDropdown} from '#/screens/PostThread/components/HeaderDropdown'
+import {ThreadError} from '#/screens/PostThread/components/ThreadError'
+import {
+ ThreadItemAnchor,
+ ThreadItemAnchorSkeleton,
+} from '#/screens/PostThread/components/ThreadItemAnchor'
+import {ThreadItemAnchorNoUnauthenticated} from '#/screens/PostThread/components/ThreadItemAnchorNoUnauthenticated'
+import {
+ ThreadItemPost,
+ ThreadItemPostSkeleton,
+} from '#/screens/PostThread/components/ThreadItemPost'
+import {ThreadItemPostNoUnauthenticated} from '#/screens/PostThread/components/ThreadItemPostNoUnauthenticated'
+import {ThreadItemPostTombstone} from '#/screens/PostThread/components/ThreadItemPostTombstone'
+import {ThreadItemReadMore} from '#/screens/PostThread/components/ThreadItemReadMore'
+import {ThreadItemReadMoreUp} from '#/screens/PostThread/components/ThreadItemReadMoreUp'
+import {ThreadItemReplyComposerSkeleton} from '#/screens/PostThread/components/ThreadItemReplyComposer'
+import {ThreadItemShowOtherReplies} from '#/screens/PostThread/components/ThreadItemShowOtherReplies'
+import {
+ ThreadItemTreePost,
+ ThreadItemTreePostSkeleton,
+} from '#/screens/PostThread/components/ThreadItemTreePost'
+import {atoms as a, native, platform, useBreakpoints, web} from '#/alf'
+import * as Layout from '#/components/Layout'
+import {ListFooter} from '#/components/Lists'
+
+const PARENT_CHUNK_SIZE = 5
+const CHILDREN_CHUNK_SIZE = 50
+
+export function PostThread({uri}: {uri: string}) {
+ const {gtMobile} = useBreakpoints()
+ const {hasSession} = useSession()
+ const initialNumToRender = useInitialNumToRender() // TODO
+ const {height: windowHeight} = useWindowDimensions()
+ const anchorPostSource = useUnstablePostSource(uri)
+ const feedFeedback = useFeedFeedback(anchorPostSource?.feed, hasSession)
+
+ /*
+ * One query to rule them all
+ */
+ const thread = usePostThread({anchor: uri})
+ const anchor = useMemo(() => {
+ for (const item of thread.data.items) {
+ if (item.type === 'threadPost' && item.depth === 0) {
+ return item
+ }
+ }
+ return
+ }, [thread.data.items])
+
+ const {openComposer} = useOpenComposer()
+ const optimisticOnPostReply = useCallback(
+ (payload: OnPostSuccessData) => {
+ if (payload) {
+ const {replyToUri, posts} = payload
+ if (replyToUri && posts.length) {
+ thread.actions.insertReplies(replyToUri, posts)
+ }
+ }
+ },
+ [thread],
+ )
+ const onReplyToAnchor = useCallback(() => {
+ if (anchor?.type !== 'threadPost') {
+ return
+ }
+ const post = anchor.value.post
+ openComposer({
+ replyTo: {
+ uri: anchor.uri,
+ cid: post.cid,
+ text: post.record.text,
+ author: post.author,
+ embed: post.embed,
+ moderation: anchor.moderation,
+ },
+ onPostSuccess: optimisticOnPostReply,
+ })
+
+ if (anchorPostSource) {
+ feedFeedback.sendInteraction({
+ item: post.uri,
+ event: 'app.bsky.feed.defs#interactionReply',
+ feedContext: anchorPostSource.post.feedContext,
+ reqId: anchorPostSource.post.reqId,
+ })
+ }
+ }, [
+ anchor,
+ openComposer,
+ optimisticOnPostReply,
+ anchorPostSource,
+ feedFeedback,
+ ])
+
+ const isRoot = !!anchor && anchor.value.post.record.reply === undefined
+ const canReply = !anchor?.value.post?.viewer?.replyDisabled
+ const [maxParentCount, setMaxParentCount] = useState(PARENT_CHUNK_SIZE)
+ const [maxChildrenCount, setMaxChildrenCount] = useState(CHILDREN_CHUNK_SIZE)
+ const totalParentCount = useRef(0) // recomputed below
+ const totalChildrenCount = useRef(thread.data.items.length) // recomputed below
+ const listRef = useRef(null)
+ const anchorRef = useRef(null)
+ const headerRef = useRef(null)
+
+ /*
+ * On a cold load, parents are not prepended until the anchor post has
+ * rendered as the first item in the list. This gives us a consistent
+ * reference point for which to pin the anchor post to the top of the screen.
+ *
+ * We simulate a cold load any time the user changes the view or sort params
+ * so that this handling is consistent.
+ *
+ * On native, `maintainVisibleContentPosition={{minIndexForVisible: 0}}` gives
+ * us this for free, since the anchor post is the first item in the list.
+ *
+ * On web, `onContentSizeChange` is used to get ahead of next paint and handle
+ * this scrolling.
+ */
+ const [deferParents, setDeferParents] = useState(true)
+ /**
+ * Used to flag whether we should scroll to the anchor post. On a cold load,
+ * this is always true. And when a user changes thread parameters, we also
+ * manually set this to true.
+ */
+ const shouldHandleScroll = useRef(true)
+ /**
+ * Called any time the content size of the list changes, _just_ before paint.
+ *
+ * We want this to fire every time we change params (which will reset
+ * `deferParents` via `onLayout` on the anchor post, due to the key change),
+ * or click into a new post (which will result in a fresh `deferParents`
+ * hook).
+ *
+ * The result being: any intentional change in view by the user will result
+ * in the anchor being pinned as the first item.
+ */
+ const onContentSizeChangeWebOnly = web(() => {
+ const list = listRef.current
+ const anchor = anchorRef.current as any as Element
+ const header = headerRef.current as any as Element
+
+ if (list && anchor && header && shouldHandleScroll.current) {
+ const anchorOffsetTop = anchor.getBoundingClientRect().top
+ const headerHeight = header.getBoundingClientRect().height
+
+ /*
+ * `deferParents` is `true` on a cold load, and always reset to
+ * `true` when params change via `prepareForParamsUpdate`.
+ *
+ * On a cold load or a push to a new post, on the first pass of this
+ * logic, the anchor post is the first item in the list. Therefore
+ * `anchorOffsetTop - headerHeight` will be 0.
+ *
+ * When a user changes thread params, on the first pass of this logic,
+ * the anchor post may not move (if there are no parents above it), or it
+ * may have gone off the screen above, because of the sudden lack of
+ * parents due to `deferParents === true`. This negative value (minus
+ * `headerHeight`) will result in a _negative_ `offset` value, which will
+ * scroll the anchor post _down_ to the top of the screen.
+ *
+ * However, `prepareForParamsUpdate` also resets scroll to `0`, so when a user
+ * changes params, the anchor post's offset will actually be equivalent
+ * to the `headerHeight` because of how the DOM is stacked on web.
+ * Therefore, `anchorOffsetTop - headerHeight` will once again be 0,
+ * which means the first pass in this case will result in no scroll.
+ *
+ * Then, once parents are prepended, this will fire again. Now, the
+ * `anchorOffsetTop` will be positive, which minus the header height,
+ * will give us a _positive_ offset, which will scroll the anchor post
+ * back _up_ to the top of the screen.
+ */
+ list.scrollToOffset({
+ offset: anchorOffsetTop - headerHeight,
+ })
+
+ /*
+ * After the second pass, `deferParents` will be `false`, and we need
+ * to ensure this doesn't run again until scroll handling is requested
+ * again via `shouldHandleScroll.current === true` and a params
+ * change via `prepareForParamsUpdate`.
+ *
+ * The `isRoot` here is needed because if we're looking at the anchor
+ * post, this handler will not fire after `deferParents` is set to
+ * `false`, since there are no parents to render above it. In this case,
+ * we want to make sure `shouldHandleScroll` is set to `false` so that
+ * subsequent size changes unrelated to a params change (like pagination)
+ * do not affect scroll.
+ */
+ if (!deferParents || isRoot) shouldHandleScroll.current = false
+ }
+ })
+
+ /**
+ * Ditto the above, but for native.
+ */
+ const onContentSizeChangeNativeOnly = native(() => {
+ const list = listRef.current
+ const anchor = anchorRef.current
+
+ if (list && anchor && shouldHandleScroll.current) {
+ /*
+ * `prepareForParamsUpdate` is called any time the user changes thread params like
+ * `view` or `sort`, which sets `deferParents(true)` and resets the
+ * scroll to the top of the list. However, there is a split second
+ * where the top of the list is wherever the parents _just were_. So if
+ * there were parents, the anchor is not at the top of the list just
+ * prior to this handler being called.
+ *
+ * Once this handler is called, the anchor post is the first item in
+ * the list (because of `deferParents` being `true`), and so we can
+ * synchronously scroll the list back to the top of the list (which is
+ * 0 on native, no need to handle `headerHeight`).
+ */
+ list.scrollToOffset({
+ animated: false,
+ offset: 0,
+ })
+
+ /*
+ * After this first pass, `deferParents` will be `false`, and those
+ * will render in. However, the anchor post will retain its position
+ * because of `maintainVisibleContentPosition` handling on native. So we
+ * don't need to let this handler run again, like we do on web.
+ */
+ shouldHandleScroll.current = false
+ }
+ })
+
+ /**
+ * Called any time the user changes thread params, such as `view` or `sort`.
+ * Prepares the UI for repositioning of the scroll so that the anchor post is
+ * always at the top after a params change.
+ *
+ * No need to handle max parents here, deferParents will handle that and we
+ * want it to re-render with the same items above the anchor.
+ */
+ const prepareForParamsUpdate = useCallback(() => {
+ /**
+ * Truncate list so that anchor post is the first item in the list. Manual
+ * scroll handling on web is predicated on this, and on native, this allows
+ * `maintainVisibleContentPosition` to do its thing.
+ */
+ setDeferParents(true)
+ // reset this to a lower value for faster re-render
+ setMaxChildrenCount(CHILDREN_CHUNK_SIZE)
+ // set flag
+ shouldHandleScroll.current = true
+ }, [setDeferParents, setMaxChildrenCount])
+
+ const setSortWrapped = useCallback(
+ (sort: string) => {
+ prepareForParamsUpdate()
+ thread.actions.setSort(sort)
+ },
+ [thread, prepareForParamsUpdate],
+ )
+
+ const setViewWrapped = useCallback(
+ (view: ThreadViewOption) => {
+ prepareForParamsUpdate()
+ thread.actions.setView(view)
+ },
+ [thread, prepareForParamsUpdate],
+ )
+
+ const onStartReached = () => {
+ if (thread.state.isFetching) return
+ // can be true after `prepareForParamsUpdate` is called
+ if (deferParents) return
+ // prevent any state mutations if we know we're done
+ if (maxParentCount >= totalParentCount.current) return
+ setMaxParentCount(n => n + PARENT_CHUNK_SIZE)
+ }
+
+ const onEndReached = () => {
+ if (thread.state.isFetching) return
+ // can be true after `prepareForParamsUpdate` is called
+ if (deferParents) return
+ // prevent any state mutations if we know we're done
+ if (maxChildrenCount >= totalChildrenCount.current) return
+ setMaxChildrenCount(prev => prev + CHILDREN_CHUNK_SIZE)
+ }
+
+ const slices = useMemo(() => {
+ const results: ThreadItem[] = []
+
+ if (!thread.data.items.length) return results
+
+ /*
+ * Pagination hack, tracks the # of items below the anchor post.
+ */
+ let childrenCount = 0
+
+ for (let i = 0; i < thread.data.items.length; i++) {
+ const item = thread.data.items[i]
+ /*
+ * Need to check `depth`, since not found or blocked posts are not
+ * `threadPost`s, but still have `depth`.
+ */
+ const hasDepth = 'depth' in item
+
+ /*
+ * Handle anchor post.
+ */
+ if (hasDepth && item.depth === 0) {
+ results.push(item)
+
+ // Recalculate total parents current index.
+ totalParentCount.current = i
+ // Recalculate total children using (length - 1) - current index.
+ totalChildrenCount.current = thread.data.items.length - 1 - i
+
+ /*
+ * Walk up the parents, limiting by `maxParentCount`
+ */
+ if (!deferParents) {
+ const start = i - 1
+ if (start >= 0) {
+ const limit = Math.max(0, start - maxParentCount)
+ for (let pi = start; pi >= limit; pi--) {
+ results.unshift(thread.data.items[pi])
+ }
+ }
+ }
+ } else {
+ // ignore any parent items
+ if (item.type === 'readMoreUp' || (hasDepth && item.depth < 0)) continue
+ // can exit early if we've reached the max children count
+ if (childrenCount > maxChildrenCount) break
+
+ results.push(item)
+ childrenCount++
+ }
+ }
+
+ return results
+ }, [thread, deferParents, maxParentCount, maxChildrenCount])
+
+ const isTombstoneView = useMemo(() => {
+ if (slices.length > 1) return false
+ return slices.every(
+ s => s.type === 'threadPostBlocked' || s.type === 'threadPostNotFound',
+ )
+ }, [slices])
+
+ const renderItem = useCallback(
+ ({item, index}: {item: ThreadItem; index: number}) => {
+ if (item.type === 'threadPost') {
+ if (item.depth < 0) {
+ return (
+
+ )
+ } else if (item.depth === 0) {
+ return (
+ /*
+ * Keep this view wrapped so that the anchor post is always index 0
+ * in the list and `maintainVisibleContentPosition` can do its
+ * thing.
+ */
+
+ setDeferParents(false)}
+ />
+
+
+ )
+ } else {
+ if (thread.state.view === 'tree') {
+ return (
+ 0,
+ }}
+ onPostSuccess={optimisticOnPostReply}
+ />
+ )
+ } else {
+ return (
+ 0,
+ }}
+ onPostSuccess={optimisticOnPostReply}
+ />
+ )
+ }
+ }
+ } else if (item.type === 'threadPostNoUnauthenticated') {
+ if (item.depth < 0) {
+ return
+ } else if (item.depth === 0) {
+ return
+ }
+ } else if (item.type === 'readMore') {
+ return (
+
+ )
+ } else if (item.type === 'readMoreUp') {
+ return
+ } else if (item.type === 'threadPostBlocked') {
+ return
+ } else if (item.type === 'threadPostNotFound') {
+ return
+ } else if (item.type === 'replyComposer') {
+ return (
+
+ {gtMobile && (
+
+ )}
+
+ )
+ } else if (item.type === 'showOtherReplies') {
+ return
+ } else if (item.type === 'skeleton') {
+ if (item.item === 'anchor') {
+ return
+ } else if (item.item === 'reply') {
+ if (thread.state.view === 'linear') {
+ return
+ } else {
+ return
+ }
+ } else if (item.item === 'replyComposer') {
+ return
+ }
+ }
+ return null
+ },
+ [
+ thread,
+ optimisticOnPostReply,
+ onReplyToAnchor,
+ gtMobile,
+ anchorPostSource,
+ ],
+ )
+
+ return (
+ <>
+
+
+
+
+ Post
+
+
+
+
+
+
+
+ {thread.state.error ? (
+
+ ) : (
+
+ }
+ initialNumToRender={initialNumToRender}
+ windowSize={11}
+ sideBorders={false}
+ />
+ )}
+
+ {!gtMobile && canReply && hasSession && (
+
+ )}
+
+ )
+}
+
+function MobileComposePrompt({onPressReply}: {onPressReply: () => unknown}) {
+ const {footerHeight} = useShellLayout()
+
+ const animatedStyle = useAnimatedStyle(() => {
+ return {
+ bottom: footerHeight.get(),
+ }
+ })
+
+ return (
+
+
+
+ )
+}
+
+const keyExtractor = (item: ThreadItem) => {
+ return item.key
+}
diff --git a/src/screens/Profile/Header/Handle.tsx b/src/screens/Profile/Header/Handle.tsx
index a8bf656921..cfbf430c45 100644
--- a/src/screens/Profile/Header/Handle.tsx
+++ b/src/screens/Profile/Header/Handle.tsx
@@ -1,11 +1,11 @@
import {View} from 'react-native'
-import {AppBskyActorDefs} from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles'
import {isIOS} from '#/platform/detection'
-import {Shadow} from '#/state/cache/types'
+import {type Shadow} from '#/state/cache/types'
import {atoms as a, useTheme, web} from '#/alf'
import {NewskieDialog} from '#/components/NewskieDialog'
import {Text} from '#/components/Typography'
diff --git a/src/screens/Profile/Header/Shell.tsx b/src/screens/Profile/Header/Shell.tsx
index 9777c8cc78..53585c0947 100644
--- a/src/screens/Profile/Header/Shell.tsx
+++ b/src/screens/Profile/Header/Shell.tsx
@@ -1,9 +1,11 @@
-import React, {memo, useEffect} from 'react'
+import {memo, useCallback, useEffect, useMemo} from 'react'
import {StyleSheet, TouchableWithoutFeedback, View} from 'react-native'
-import {
+import Animated, {
+ measure,
type MeasuredDimensions,
runOnJS,
runOnUI,
+ useAnimatedRef,
} from 'react-native-reanimated'
import {useSafeAreaInsets} from 'react-native-safe-area-context'
import {type AppBskyActorDefs, type ModerationDecision} from '@atproto/api'
@@ -14,7 +16,6 @@ import {useNavigation} from '@react-navigation/native'
import {useActorStatus} from '#/lib/actor-status'
import {BACK_HITSLOP} from '#/lib/constants'
import {useHaptics} from '#/lib/haptics'
-import {measureHandle, useHandleRef} from '#/lib/hooks/useHandleRef'
import {type NavigationProp} from '#/lib/routes/types'
import {logger} from '#/logger'
import {isIOS} from '#/platform/detection'
@@ -59,9 +60,9 @@ let ProfileHeaderShell = ({
const playHaptic = useHaptics()
const liveStatusControl = useDialogControl()
- const aviRef = useHandleRef()
+ const aviRef = useAnimatedRef()
- const onPressBack = React.useCallback(() => {
+ const onPressBack = useCallback(() => {
if (navigation.canGoBack()) {
navigation.goBack()
} else {
@@ -69,7 +70,7 @@ let ProfileHeaderShell = ({
}
}, [navigation])
- const _openLightbox = React.useCallback(
+ const _openLightbox = useCallback(
(uri: string, thumbRect: MeasuredDimensions | null) => {
openLightbox({
images: [
@@ -92,7 +93,7 @@ let ProfileHeaderShell = ({
[openLightbox],
)
- const isMe = React.useMemo(
+ const isMe = useMemo(
() => currentAccount?.did === profile.did,
[currentAccount, profile],
)
@@ -109,7 +110,7 @@ let ProfileHeaderShell = ({
}
}, [live.isActive, profile.did])
- const onPressAvi = React.useCallback(() => {
+ const onPressAvi = useCallback(() => {
if (live.isActive) {
playHaptic('Light')
logger.metric(
@@ -122,10 +123,9 @@ let ProfileHeaderShell = ({
const modui = moderation.ui('avatar')
const avatar = profile.avatar
if (avatar && !(modui.blur && modui.noOverride)) {
- const aviHandle = aviRef.current
runOnUI(() => {
'worklet'
- const rect = measureHandle(aviHandle)
+ const rect = measure(aviRef)
runOnJS(_openLightbox)(avatar, rect)
})()
}
@@ -223,7 +223,7 @@ let ProfileHeaderShell = ({
styles.avi,
profile.associated?.labeler && styles.aviLabeler,
]}>
-
+
{live.isActive && }
-
+
diff --git a/src/screens/Search/Explore.tsx b/src/screens/Search/Explore.tsx
index 7c9e2a25dc..92eed25aa4 100644
--- a/src/screens/Search/Explore.tsx
+++ b/src/screens/Search/Explore.tsx
@@ -301,19 +301,19 @@ export function Explore({
const onPTR = useCallback(async () => {
setIsPTR(true)
await Promise.all([
- await qc.resetQueries({
+ qc.resetQueries({
queryKey: createGetTrendsQueryKey(),
}),
- await qc.resetQueries({
+ qc.resetQueries({
queryKey: createSuggestedStarterPacksQueryKey(),
}),
- await qc.resetQueries({
+ qc.resetQueries({
queryKey: [getSuggestedUsersQueryKeyRoot],
}),
- await qc.resetQueries({
+ qc.resetQueries({
queryKey: [useActorSearchPaginatedQueryKeyRoot],
}),
- await qc.resetQueries({
+ qc.resetQueries({
queryKey: createGetSuggestedFeedsQueryKey(),
}),
])
diff --git a/src/screens/Settings/SettingsInterests.tsx b/src/screens/Settings/InterestsSettings.tsx
similarity index 93%
rename from src/screens/Settings/SettingsInterests.tsx
rename to src/screens/Settings/InterestsSettings.tsx
index 42259e9b68..e3b5fcb084 100644
--- a/src/screens/Settings/SettingsInterests.tsx
+++ b/src/screens/Settings/InterestsSettings.tsx
@@ -2,9 +2,11 @@ import {useMemo, useState} from 'react'
import {type TextStyle, View, type ViewStyle} from 'react-native'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
+import {type NativeStackScreenProps} from '@react-navigation/native-stack'
import {useQueryClient} from '@tanstack/react-query'
import debounce from 'lodash.debounce'
+import {type CommonNavigatorParams} from '#/lib/routes/types'
import {
preferencesQueryKey,
usePreferencesQuery,
@@ -24,7 +26,8 @@ import * as Layout from '#/components/Layout'
import {Loader} from '#/components/Loader'
import {Text} from '#/components/Typography'
-export function SettingsInterests() {
+type Props = NativeStackScreenProps
+export function InterestsSettingsScreen({}: Props) {
const t = useTheme()
const gutters = useGutters(['base'])
const {data: preferences} = usePreferencesQuery()
@@ -110,13 +113,9 @@ function Inner({
},
)
await Promise.all([
- await qc.resetQueries({
- queryKey: createSuggestedStarterPacksQueryKey(),
- }),
- await qc.resetQueries({queryKey: createGetSuggestedFeedsQueryKey()}),
- await qc.resetQueries({
- queryKey: createGetSuggestedUsersQueryKey({}),
- }),
+ qc.resetQueries({queryKey: createSuggestedStarterPacksQueryKey()}),
+ qc.resetQueries({queryKey: createGetSuggestedFeedsQueryKey()}),
+ qc.resetQueries({queryKey: createGetSuggestedUsersQueryKey({})}),
])
Toast.show(
diff --git a/src/screens/Settings/LegacyNotificationSettings.tsx b/src/screens/Settings/LegacyNotificationSettings.tsx
new file mode 100644
index 0000000000..a9ef5d9831
--- /dev/null
+++ b/src/screens/Settings/LegacyNotificationSettings.tsx
@@ -0,0 +1,21 @@
+import {useCallback} from 'react'
+import {useFocusEffect} from '@react-navigation/native'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'LegacyNotificationSettings'
+>
+export function LegacyNotificationSettingsScreen({navigation}: Props) {
+ useFocusEffect(
+ useCallback(() => {
+ navigation.replace('NotificationSettings')
+ }, [navigation]),
+ )
+
+ return null
+}
diff --git a/src/screens/Settings/NotificationSettings.tsx b/src/screens/Settings/NotificationSettings.tsx
deleted file mode 100644
index ebb230c2ca..0000000000
--- a/src/screens/Settings/NotificationSettings.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import {Text} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {AllNavigatorParams, NativeStackScreenProps} from '#/lib/routes/types'
-import {useNotificationFeedQuery} from '#/state/queries/notifications/feed'
-import {useNotificationSettingsMutation} from '#/state/queries/notifications/settings'
-import {atoms as a} from '#/alf'
-import {Admonition} from '#/components/Admonition'
-import {Error} from '#/components/Error'
-import * as Toggle from '#/components/forms/Toggle'
-import {Beaker_Stroke2_Corner2_Rounded as BeakerIcon} from '#/components/icons/Beaker'
-import * as Layout from '#/components/Layout'
-import {Loader} from '#/components/Loader'
-import * as SettingsList from './components/SettingsList'
-
-type Props = NativeStackScreenProps
-export function NotificationSettingsScreen({}: Props) {
- const {_} = useLingui()
-
- const {
- data,
- isError: isQueryError,
- refetch,
- } = useNotificationFeedQuery({
- filter: 'all',
- })
- const serverPriority = data?.pages.at(0)?.priority
-
- const {
- mutate: onChangePriority,
- isPending: isMutationPending,
- variables,
- } = useNotificationSettingsMutation()
-
- const priority = isMutationPending
- ? variables[0] === 'enabled'
- : serverPriority
-
- return (
-
-
-
-
-
- Notification Settings
-
-
-
-
-
- {isQueryError ? (
-
- ) : (
-
-
-
-
- Notification filters
-
-
-
-
- Enable priority notifications
-
- {!data ? : }
-
-
-
-
-
-
- Experimental: When this
- preference is enabled, you'll only receive reply and quote
- notifications from users you follow. We'll continue to add
- more controls here over time.
-
-
-
-
- )}
-
-
- )
-}
diff --git a/src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx
new file mode 100644
index 0000000000..f726ab558a
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx
@@ -0,0 +1,60 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {Heart2_Stroke2_Corner0_Rounded as HeartIcon} from '#/components/icons/Heart2'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'LikeNotificationSettings'
+>
+export function LikeNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Likes}
+ subtitleText={
+ Get notifications when people like your posts.
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx
new file mode 100644
index 0000000000..c72e8c7578
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx
@@ -0,0 +1,65 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {LikeRepost_Stroke2_Corner2_Rounded as LikeRepostIcon} from '#/components/icons/Heart2'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'LikesOnRepostsNotificationSettings'
+>
+export function LikesOnRepostsNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Likes of your reposts}
+ subtitleText={
+
+ Get notifications when people like posts that you've reposted.
+
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx
new file mode 100644
index 0000000000..0a770157e9
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx
@@ -0,0 +1,63 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {At_Stroke2_Corner2_Rounded as AtIcon} from '#/components/icons/At'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'MentionNotificationSettings'
+>
+export function MentionNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Mentions}
+ subtitleText={
+ Get notifications when people mention you.
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx
new file mode 100644
index 0000000000..a0fe65ecf6
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx
@@ -0,0 +1,68 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {Shapes_Stroke2_Corner0_Rounded as ShapesIcon} from '#/components/icons/Shapes'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'MiscellaneousNotificationSettings'
+>
+export function MiscellaneousNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Everything else}
+ subtitleText={
+
+ Notifications for everything else, such as when someone joins
+ via one of your starter packs.
+
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx
new file mode 100644
index 0000000000..dd603a52f5
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx
@@ -0,0 +1,63 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {PersonPlus_Stroke2_Corner2_Rounded as PersonPlusIcon} from '#/components/icons/Person'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'NewFollowerNotificationSettings'
+>
+export function NewFollowerNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ New followers}
+ subtitleText={
+ Get notifications when people follow you.
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx
new file mode 100644
index 0000000000..afb3df90f5
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx
@@ -0,0 +1,60 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {CloseQuote_Stroke2_Corner0_Rounded as CloseQuoteIcon} from '#/components/icons/Quote'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'QuoteNotificationSettings'
+>
+export function QuoteNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Quotes}
+ subtitleText={
+ Get notifications when people quote your posts.
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx
new file mode 100644
index 0000000000..b3e7c6cff2
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx
@@ -0,0 +1,66 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {Bubble_Stroke2_Corner2_Rounded as BubbleIcon} from '#/components/icons/Bubble'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'ReplyNotificationSettings'
+>
+export function ReplyNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Replies}
+ subtitleText={
+
+ Get notifications when people reply to your posts.
+
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx
new file mode 100644
index 0000000000..aa9e4e32fa
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx
@@ -0,0 +1,63 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {Repost_Stroke2_Corner2_Rounded as RepostIcon} from '#/components/icons/Repost'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'RepostNotificationSettings'
+>
+export function RepostNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Reposts}
+ subtitleText={
+ Get notifications when people repost your posts.
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx
new file mode 100644
index 0000000000..13fec61682
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx
@@ -0,0 +1,66 @@
+import {View} from 'react-native'
+import {Trans} from '@lingui/macro'
+
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {RepostRepost_Stroke2_Corner2_Rounded as RepostRepostIcon} from '#/components/icons/Repost'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+import {PreferenceControls} from './components/PreferenceControls'
+
+type Props = NativeStackScreenProps<
+ AllNavigatorParams,
+ 'RepostsOnRepostsNotificationSettings'
+>
+export function RepostsOnRepostsNotificationSettingsScreen({}: Props) {
+ const {data: preferences, isError} = useNotificationSettingsQuery()
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+
+
+ Reposts of your reposts}
+ subtitleText={
+
+ Get notifications when people repost posts that you've
+ reposted.
+
+ }
+ />
+
+ {isError ? (
+
+
+ Failed to load notification settings.
+
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/components/ItemTextWithSubtitle.tsx b/src/screens/Settings/NotificationSettings/components/ItemTextWithSubtitle.tsx
new file mode 100644
index 0000000000..217fc33b95
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/components/ItemTextWithSubtitle.tsx
@@ -0,0 +1,34 @@
+import {View} from 'react-native'
+
+import {atoms as a, useTheme} from '#/alf'
+import * as Skele from '#/components/Skeleton'
+import {Text} from '#/components/Typography'
+import * as SettingsList from '../../components/SettingsList'
+
+export function ItemTextWithSubtitle({
+ titleText,
+ subtitleText,
+ bold = false,
+ showSkeleton = false,
+}: {
+ titleText: React.ReactNode
+ subtitleText: React.ReactNode
+ bold?: boolean
+ showSkeleton?: boolean
+}) {
+ const t = useTheme()
+ return (
+
+
+ {titleText}
+
+ {showSkeleton ? (
+
+ ) : (
+
+ {subtitleText}
+
+ )}
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx b/src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx
new file mode 100644
index 0000000000..487827d66b
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx
@@ -0,0 +1,201 @@
+import {useMemo} from 'react'
+import {View} from 'react-native'
+import {type AppBskyNotificationDefs} from '@atproto/api'
+import {type FilterablePreference} from '@atproto/api/dist/client/types/app/bsky/notification/defs'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {useGate} from '#/lib/statsig/statsig'
+import {useNotificationSettingsUpdateMutation} from '#/state/queries/notifications/settings'
+import {atoms as a, platform, useTheme} from '#/alf'
+import * as Toggle from '#/components/forms/Toggle'
+import {Loader} from '#/components/Loader'
+import {Text} from '#/components/Typography'
+import {Divider} from '../../components/SettingsList'
+
+export function PreferenceControls({
+ name,
+ syncOthers,
+ preference,
+ allowDisableInApp = true,
+}: {
+ name: Exclude
+ /**
+ * Keep other prefs in sync with `name`. For use in the "everything else" category
+ * which groups starterpack joins + verified + unverified notifications into a single toggle.
+ */
+ syncOthers?: Exclude[]
+ preference?: AppBskyNotificationDefs.Preference | FilterablePreference
+ allowDisableInApp?: boolean
+}) {
+ const gate = useGate()
+
+ if (!gate('reengagement_features')) return null
+
+ if (!preference)
+ return (
+
+
+
+ )
+
+ return (
+
+ )
+}
+
+export function Inner({
+ name,
+ syncOthers = [],
+ preference,
+ allowDisableInApp,
+}: {
+ name: Exclude
+ syncOthers?: Exclude[]
+ preference: AppBskyNotificationDefs.Preference | FilterablePreference
+ allowDisableInApp: boolean
+}) {
+ const t = useTheme()
+ const {_} = useLingui()
+ const {mutate} = useNotificationSettingsUpdateMutation()
+
+ const channels = useMemo(() => {
+ const arr = []
+ if (preference.list) arr.push('list')
+ if (preference.push) arr.push('push')
+ return arr
+ }, [preference])
+
+ const onChangeChannels = (change: string[]) => {
+ const newPreference = {
+ ...preference,
+ list: change.includes('list'),
+ push: change.includes('push'),
+ } satisfies typeof preference
+
+ mutate({
+ [name]: newPreference,
+ ...Object.fromEntries(syncOthers.map(key => [key, newPreference])),
+ })
+ }
+
+ const onChangeFilter = ([change]: string[]) => {
+ if (change !== 'all' && change !== 'follows')
+ throw new Error('Invalid filter')
+
+ const newPreference = {
+ ...preference,
+ include: change,
+ } satisfies typeof preference
+
+ mutate({
+ [name]: newPreference,
+ ...Object.fromEntries(syncOthers.map(key => [key, newPreference])),
+ })
+ }
+
+ return (
+
+
+
+
+
+ Push notifications
+
+
+
+ {allowDisableInApp && (
+
+
+ In-app notifications
+
+
+
+ )}
+
+
+ {'include' in preference && (
+ <>
+
+
+ From
+
+
+
+
+
+ 0 && t.atoms.text,
+ a.font_normal,
+ a.text_md,
+ ]}>
+ Everyone
+
+
+
+
+ 0 && t.atoms.text,
+ a.font_normal,
+ a.text_md,
+ ]}>
+ People I follow
+
+
+
+
+
+ )}
+
+ )
+}
diff --git a/src/screens/Settings/NotificationSettings/index.tsx b/src/screens/Settings/NotificationSettings/index.tsx
new file mode 100644
index 0000000000..800493575d
--- /dev/null
+++ b/src/screens/Settings/NotificationSettings/index.tsx
@@ -0,0 +1,293 @@
+import {useEffect} from 'react'
+import {Linking, View} from 'react-native'
+import * as Notification from 'expo-notifications'
+import {type AppBskyNotificationDefs} from '@atproto/api'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+import {useQuery, useQueryClient} from '@tanstack/react-query'
+
+import {useAppState} from '#/lib/hooks/useAppState'
+import {
+ type AllNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {isAndroid, isIOS, isWeb} from '#/platform/detection'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
+import {atoms as a} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {At_Stroke2_Corner2_Rounded as AtIcon} from '#/components/icons/At'
+// import {BellRinging_Stroke2_Corner0_Rounded as BellRingingIcon} from '#/components/icons/BellRinging'
+import {Bubble_Stroke2_Corner2_Rounded as BubbleIcon} from '#/components/icons/Bubble'
+import {Haptic_Stroke2_Corner2_Rounded as HapticIcon} from '#/components/icons/Haptic'
+import {
+ Heart2_Stroke2_Corner0_Rounded as HeartIcon,
+ LikeRepost_Stroke2_Corner2_Rounded as LikeRepostIcon,
+} from '#/components/icons/Heart2'
+import {PersonPlus_Stroke2_Corner2_Rounded as PersonPlusIcon} from '#/components/icons/Person'
+import {CloseQuote_Stroke2_Corner0_Rounded as CloseQuoteIcon} from '#/components/icons/Quote'
+import {
+ Repost_Stroke2_Corner2_Rounded as RepostIcon,
+ RepostRepost_Stroke2_Corner2_Rounded as RepostRepostIcon,
+} from '#/components/icons/Repost'
+import {Shapes_Stroke2_Corner0_Rounded as ShapesIcon} from '#/components/icons/Shapes'
+import * as Layout from '#/components/Layout'
+import * as SettingsList from '../components/SettingsList'
+import {ItemTextWithSubtitle} from './components/ItemTextWithSubtitle'
+
+const RQKEY = ['notification-permissions']
+
+type Props = NativeStackScreenProps
+export function NotificationSettingsScreen({}: Props) {
+ const {_} = useLingui()
+ const queryClient = useQueryClient()
+ const {data: settings, isError} = useNotificationSettingsQuery()
+
+ const {data: permissions, refetch} = useQuery({
+ queryKey: RQKEY,
+ queryFn: async () => {
+ if (isWeb) return null
+ return await Notification.getPermissionsAsync()
+ },
+ })
+
+ const appState = useAppState()
+ useEffect(() => {
+ if (appState === 'active') {
+ refetch()
+ }
+ }, [appState, refetch])
+
+ const onRequestPermissions = async () => {
+ if (isWeb) return
+ if (permissions?.canAskAgain) {
+ const response = await Notification.requestPermissionsAsync()
+ queryClient.setQueryData(RQKEY, response)
+ } else {
+ if (isAndroid) {
+ try {
+ await Linking.sendIntent(
+ 'android.settings.APP_NOTIFICATION_SETTINGS',
+ [
+ {
+ key: 'android.provider.extra.APP_PACKAGE',
+ value: 'xyz.blueskyweb.app',
+ },
+ ],
+ )
+ } catch {
+ Linking.openSettings()
+ }
+ } else if (isIOS) {
+ Linking.openSettings()
+ }
+ }
+ }
+
+ return (
+
+
+
+
+
+ Notifications
+
+
+
+
+
+
+ {permissions && !permissions.granted && (
+ <>
+
+
+
+ Enable push notifications
+
+
+
+
+ )}
+ {isError && (
+
+
+ Failed to load notification settings.
+
+
+ )}
+
+
+
+ Likes}
+ subtitleText={}
+ showSkeleton={!settings}
+ />
+
+
+
+ New followers}
+ subtitleText={}
+ showSkeleton={!settings}
+ />
+
+
+
+ Replies}
+ subtitleText={}
+ showSkeleton={!settings}
+ />
+
+
+
+ Mentions}
+ subtitleText={}
+ showSkeleton={!settings}
+ />
+
+
+
+ Quotes}
+ subtitleText={}
+ showSkeleton={!settings}
+ />
+
+
+
+ Reposts}
+ subtitleText={}
+ showSkeleton={!settings}
+ />
+
+ {/*
+
+
+ Activity alerts}
+ subtitleText={
+
+ }
+ showSkeleton={!settings}
+ />
+ */}
+
+
+ Likes of your reposts}
+ subtitleText={
+
+ }
+ showSkeleton={!settings}
+ />
+
+
+
+ Reposts of your reposts}
+ subtitleText={
+
+ }
+ showSkeleton={!settings}
+ />
+
+
+
+ Everything else}
+ // technically a bundle of several settings, but since they're set together
+ // and are most likely in sync we'll just show the state of one of them
+ subtitleText={
+
+ }
+ showSkeleton={!settings}
+ />
+
+
+
+
+
+ )
+}
+
+function SettingPreview({
+ preference,
+}: {
+ preference?:
+ | AppBskyNotificationDefs.Preference
+ | AppBskyNotificationDefs.FilterablePreference
+}) {
+ const {_} = useLingui()
+ if (!preference) {
+ return null
+ } else {
+ if ('include' in preference) {
+ if (preference.include === 'all') {
+ if (preference.list && preference.push) {
+ return _(msg`In-app, Push, Everyone`)
+ } else if (preference.list) {
+ return _(msg`In-app, Everyone`)
+ } else if (preference.push) {
+ return _(msg`Push, Everyone`)
+ }
+ } else if (preference.include === 'follows') {
+ if (preference.list && preference.push) {
+ return _(msg`In-app, Push, People you follow`)
+ } else if (preference.list) {
+ return _(msg`In-app, People you follow`)
+ } else if (preference.push) {
+ return _(msg`Push, People you follow`)
+ }
+ }
+ } else {
+ if (preference.list && preference.push) {
+ return _(msg`In-app, Push`)
+ } else if (preference.list) {
+ return _(msg`In-app`)
+ } else if (preference.push) {
+ return _(msg`Push`)
+ }
+ }
+ }
+
+ return _(msg`Off`)
+}
diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
index 9f36c27acc..e1d1970708 100644
--- a/src/screens/Settings/Settings.tsx
+++ b/src/screens/Settings/Settings.tsx
@@ -16,6 +16,7 @@ import {
type CommonNavigatorParams,
type NavigationProp,
} from '#/lib/routes/types'
+import {useGate} from '#/lib/statsig/statsig'
import {sanitizeDisplayName} from '#/lib/strings/display-names'
import {sanitizeHandle} from '#/lib/strings/handles'
import {useProfileShadow} from '#/state/cache/profile-shadow'
@@ -36,6 +37,7 @@ import {AvatarStackWithFetch} from '#/components/AvatarStack'
import {useDialogControl} from '#/components/Dialog'
import {SwitchAccountDialog} from '#/components/dialogs/SwitchAccount'
import {Accessibility_Stroke2_Corner2_Rounded as AccessibilityIcon} from '#/components/icons/Accessibility'
+import {Bell_Stroke2_Corner0_Rounded as NotificationIcon} from '#/components/icons/Bell'
import {BubbleInfo_Stroke2_Corner2_Rounded as BubbleInfoIcon} from '#/components/icons/BubbleInfo'
import {ChevronTop_Stroke2_Corner0_Rounded as ChevronUpIcon} from '#/components/icons/Chevron'
import {CircleQuestion_Stroke2_Corner2_Rounded as CircleQuestionIcon} from '#/components/icons/CircleQuestion'
@@ -80,6 +82,7 @@ export function SettingsScreen({}: Props) {
const {pendingDid, onPressSwitchAccount} = useAccountSwitcher()
const [showAccounts, setShowAccounts] = useState(false)
const [showDevOptions, setShowDevOptions] = useState(false)
+ const gate = useGate()
return (
@@ -180,6 +183,16 @@ export function SettingsScreen({}: Props) {
Moderation
+ {gate('reengagement_features') && (
+
+
+
+ Notifications
+
+
+ )}
diff --git a/src/screens/Settings/ThreadPreferences.tsx b/src/screens/Settings/ThreadPreferences.tsx
index 701d3d9e56..af3cf915f5 100644
--- a/src/screens/Settings/ThreadPreferences.tsx
+++ b/src/screens/Settings/ThreadPreferences.tsx
@@ -2,22 +2,156 @@ import {View} from 'react-native'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
-import {CommonNavigatorParams, NativeStackScreenProps} from '#/lib/routes/types'
+import {
+ type CommonNavigatorParams,
+ type NativeStackScreenProps,
+} from '#/lib/routes/types'
+import {useGate} from '#/lib/statsig/statsig'
import {
usePreferencesQuery,
useSetThreadViewPreferencesMutation,
} from '#/state/queries/preferences'
+import {
+ normalizeSort,
+ normalizeView,
+ useThreadPreferences,
+} from '#/state/queries/preferences/useThreadPreferences'
import {atoms as a, useTheme} from '#/alf'
import * as Toggle from '#/components/forms/Toggle'
import {Beaker_Stroke2_Corner2_Rounded as BeakerIcon} from '#/components/icons/Beaker'
import {Bubbles_Stroke2_Corner2_Rounded as BubblesIcon} from '#/components/icons/Bubble'
import {PersonGroup_Stroke2_Corner2_Rounded as PersonGroupIcon} from '#/components/icons/Person'
+import {Tree_Stroke2_Corner0_Rounded as TreeIcon} from '#/components/icons/Tree'
import * as Layout from '#/components/Layout'
import {Text} from '#/components/Typography'
import * as SettingsList from './components/SettingsList'
type Props = NativeStackScreenProps
export function ThreadPreferencesScreen({}: Props) {
+ const gate = useGate()
+
+ return gate('post_threads_v2_unspecced') ? (
+
+ ) : (
+
+ )
+}
+
+export function ThreadPreferencesV2() {
+ const t = useTheme()
+ const {_} = useLingui()
+ const {
+ sort,
+ setSort,
+ view,
+ setView,
+ prioritizeFollowedUsers,
+ setPrioritizeFollowedUsers,
+ } = useThreadPreferences({save: true})
+
+ return (
+
+
+
+
+
+ Thread Preferences
+
+
+
+
+
+
+
+
+
+ Sort replies
+
+
+
+ Sort replies to the same post by:
+
+ setSort(normalizeSort(values[0]))}>
+
+
+
+
+ Top replies first
+
+
+
+
+
+ Oldest replies first
+
+
+
+
+
+ Newest replies first
+
+
+
+
+
+
+
+
+
+
+ Prioritize your Follows
+
+ setPrioritizeFollowedUsers(value)}
+ style={[a.w_full, a.gap_md]}>
+
+
+ Show replies by people you follow before all other replies
+
+
+
+
+
+
+
+
+
+ Tree view
+
+
+ setView(normalizeView({treeViewEnabled: value}))
+ }
+ style={[a.w_full, a.gap_md]}>
+
+ Show post replies in a threaded tree view
+
+
+
+
+
+
+
+ )
+}
+
+export function ThreadPreferencesV1() {
const {_} = useLingui()
const t = useTheme()
diff --git a/src/screens/Signup/StepInfo/Policies.tsx b/src/screens/Signup/StepInfo/Policies.tsx
index 81533c58e7..17980172de 100644
--- a/src/screens/Signup/StepInfo/Policies.tsx
+++ b/src/screens/Signup/StepInfo/Policies.tsx
@@ -1,6 +1,6 @@
-import {ReactElement} from 'react'
+import {type ReactElement} from 'react'
import {View} from 'react-native'
-import {ComAtprotoServerDescribeServer} from '@atproto/api'
+import {type ComAtprotoServerDescribeServer} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx
index b522bc906d..39ae578557 100644
--- a/src/screens/StarterPack/StarterPackLandingScreen.tsx
+++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx
@@ -5,7 +5,7 @@ import {
AppBskyGraphDefs,
AppBskyGraphStarterpack,
AtUri,
- ModerationOpts,
+ type ModerationOpts,
} from '@atproto/api'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
import {msg, Trans} from '@lingui/macro'
diff --git a/src/screens/StarterPack/Wizard/State.tsx b/src/screens/StarterPack/Wizard/State.tsx
index 1ecd038a49..07d744c062 100644
--- a/src/screens/StarterPack/Wizard/State.tsx
+++ b/src/screens/StarterPack/Wizard/State.tsx
@@ -1,6 +1,6 @@
import React from 'react'
-import {AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
-import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
+import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
+import {type GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
import {msg, plural} from '@lingui/macro'
import {STARTER_PACK_MAX_SIZE} from '#/lib/constants'
diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx
index ef3e936584..d01903eb5a 100644
--- a/src/screens/Takendown.tsx
+++ b/src/screens/Takendown.tsx
@@ -3,7 +3,7 @@ import {Modal, View} from 'react-native'
import {SystemBars} from 'react-native-edge-to-edge'
import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {ComAtprotoAdminDefs, ComAtprotoModerationDefs} from '@atproto/api'
+import {type ComAtprotoAdminDefs, ComAtprotoModerationDefs} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {useMutation} from '@tanstack/react-query'
diff --git a/src/screens/VideoFeed/components/Scrubber.tsx b/src/screens/VideoFeed/components/Scrubber.tsx
index ef31905263..69e68ec9e3 100644
--- a/src/screens/VideoFeed/components/Scrubber.tsx
+++ b/src/screens/VideoFeed/components/Scrubber.tsx
@@ -3,13 +3,13 @@ import {View} from 'react-native'
import {
Gesture,
GestureDetector,
- NativeGesture,
+ type NativeGesture,
} from 'react-native-gesture-handler'
import Animated, {
interpolate,
runOnJS,
runOnUI,
- SharedValue,
+ type SharedValue,
useAnimatedReaction,
useAnimatedStyle,
useSharedValue,
@@ -20,11 +20,11 @@ import {
useSafeAreaInsets,
} from 'react-native-safe-area-context'
import {useEventListener} from 'expo'
-import {VideoPlayer} from 'expo-video'
+import {type VideoPlayer} from 'expo-video'
-import {formatTime} from '#/view/com/util/post-embeds/VideoEmbedInner/web-controls/utils'
import {tokens} from '#/alf'
import {atoms as a} from '#/alf'
+import {formatTime} from '#/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/utils'
import {Text} from '#/components/Typography'
// magic number that is roughly the min height of the write reply button
diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index 8a75751f72..495b3bc622 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -882,7 +882,10 @@ function Overlay({
player={player}
seekingAnimationSV={seekingAnimationSV}
scrollGesture={scrollGesture}>
-
+
diff --git a/src/state/cache/post-shadow.ts b/src/state/cache/post-shadow.ts
index 923e5c0000..d7f1eb8b93 100644
--- a/src/state/cache/post-shadow.ts
+++ b/src/state/cache/post-shadow.ts
@@ -14,6 +14,7 @@ import {findAllPostsInQueryData as findAllPostsInFeedQueryData} from '#/state/qu
import {findAllPostsInQueryData as findAllPostsInQuoteQueryData} from '#/state/queries/post-quotes'
import {findAllPostsInQueryData as findAllPostsInThreadQueryData} from '#/state/queries/post-thread'
import {findAllPostsInQueryData as findAllPostsInSearchQueryData} from '#/state/queries/search-posts'
+import {findAllPostsInQueryData as findAllPostsInThreadV2QueryData} from '#/state/queries/usePostThread/queryCache'
import {castAsShadow, type Shadow} from './types'
export type {Shadow} from './types'
@@ -149,6 +150,9 @@ function* findPostsInCache(
yield node.post
}
}
+ for (let post of findAllPostsInThreadV2QueryData(queryClient, uri)) {
+ yield post
+ }
for (let post of findAllPostsInSearchQueryData(queryClient, uri)) {
yield post
}
diff --git a/src/state/cache/profile-shadow.ts b/src/state/cache/profile-shadow.ts
index a1212d8a29..31bf55d132 100644
--- a/src/state/cache/profile-shadow.ts
+++ b/src/state/cache/profile-shadow.ts
@@ -21,6 +21,7 @@ import {findAllProfilesInQueryData as findAllProfilesInProfileFollowersQueryData
import {findAllProfilesInQueryData as findAllProfilesInProfileFollowsQueryData} from '#/state/queries/profile-follows'
import {findAllProfilesInQueryData as findAllProfilesInSuggestedFollowsQueryData} from '#/state/queries/suggested-follows'
import {findAllProfilesInQueryData as findAllProfilesInSuggestedUsersQueryData} from '#/state/queries/trending/useGetSuggestedUsersQuery'
+import {findAllProfilesInQueryData as findAllProfilesInPostThreadV2QueryData} from '#/state/queries/usePostThread/queryCache'
import type * as bsky from '#/types/bsky'
import {castAsShadow, type Shadow} from './types'
@@ -167,6 +168,7 @@ function* findProfilesInCache(
yield* findAllProfilesInListConvosQueryData(queryClient, did)
yield* findAllProfilesInFeedsQueryData(queryClient, did)
yield* findAllProfilesInPostThreadQueryData(queryClient, did)
+ yield* findAllProfilesInPostThreadV2QueryData(queryClient, did)
yield* findAllProfilesInKnownFollowersQueryData(queryClient, did)
yield* findAllProfilesInExploreFeedPreviewsQueryData(queryClient, did)
}
diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx
index 225b495d3f..a718a761d5 100644
--- a/src/state/feed-feedback.tsx
+++ b/src/state/feed-feedback.tsx
@@ -12,7 +12,7 @@ import throttle from 'lodash.throttle'
import {FEEDBACK_FEEDS, STAGING_FEEDS} from '#/lib/constants'
import {logEvent} from '#/lib/statsig/statsig'
-import {logger} from '#/logger'
+import {Logger} from '#/logger'
import {
type FeedDescriptor,
type FeedPostSliceItem,
@@ -20,6 +20,8 @@ import {
import {getItemsForFeedback} from '#/view/com/posts/PostFeed'
import {useAgent} from './session'
+const logger = Logger.create(Logger.Context.FeedFeedback)
+
export type StateContext = {
enabled: boolean
onItemSeen: (item: any) => void
@@ -89,6 +91,7 @@ export function useFeedFeedback(
}
sendOrAggregateInteractionsForStats(aggregatedStats.current, interactions)
throttledFlushAggregatedStats()
+ logger.debug('flushed')
}, [agent, throttledFlushAggregatedStats, feed])
const sendToFeed = useMemo(
@@ -141,6 +144,9 @@ export function useFeedFeedback(
if (!enabled) {
return
}
+ logger.debug('sendInteraction', {
+ ...interaction,
+ })
if (!history.current.has(interaction)) {
history.current.add(interaction)
queue.current.add(toString(interaction))
diff --git a/src/state/messages/events/agent.ts b/src/state/messages/events/agent.ts
index 1a6cfb3f2a..589c5b6d3a 100644
--- a/src/state/messages/events/agent.ts
+++ b/src/state/messages/events/agent.ts
@@ -1,4 +1,4 @@
-import {BskyAgent, ChatBskyConvoGetLog} from '@atproto/api'
+import {type BskyAgent, type ChatBskyConvoGetLog} from '@atproto/api'
import EventEmitter from 'eventemitter3'
import {nanoid} from 'nanoid/non-secure'
@@ -9,11 +9,11 @@ import {
DEFAULT_POLL_INTERVAL,
} from '#/state/messages/events/const'
import {
- MessagesEventBusDispatch,
+ type MessagesEventBusDispatch,
MessagesEventBusDispatchEvent,
MessagesEventBusErrorCode,
- MessagesEventBusEvent,
- MessagesEventBusParams,
+ type MessagesEventBusEvent,
+ type MessagesEventBusParams,
MessagesEventBusStatus,
} from '#/state/messages/events/types'
import {DM_SERVICE_HEADERS} from '#/state/queries/messages/const'
diff --git a/src/state/modals/index.tsx b/src/state/modals/index.tsx
index 7ebcec4c79..a2cc637450 100644
--- a/src/state/modals/index.tsx
+++ b/src/state/modals/index.tsx
@@ -43,13 +43,6 @@ export interface ChangePasswordModal {
name: 'change-password'
}
-export interface LinkWarningModal {
- name: 'link-warning'
- text: string
- href: string
- share?: boolean
-}
-
export type Modal =
// Account
| DeleteAccountModal
@@ -67,9 +60,6 @@ export type Modal =
| WaitlistModal
| InviteCodesModal
- // Generic
- | LinkWarningModal
-
const ModalContext = React.createContext<{
isModalActive: boolean
activeModals: Modal[]
diff --git a/src/state/queries/notifications/settings.ts b/src/state/queries/notifications/settings.ts
index 2ac42aa328..9661bed1be 100644
--- a/src/state/queries/notifications/settings.ts
+++ b/src/state/queries/notifications/settings.ts
@@ -1,72 +1,63 @@
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-import {useMutation, useQueryClient} from '@tanstack/react-query'
+import {type AppBskyNotificationDefs} from '@atproto/api'
+import {t} from '@lingui/macro'
+import {
+ type QueryClient,
+ useMutation,
+ useQuery,
+ useQueryClient,
+} from '@tanstack/react-query'
-import {until} from '#/lib/async/until'
import {logger} from '#/logger'
-import {RQKEY as RQKEY_NOTIFS} from '#/state/queries/notifications/feed'
-import {invalidateCachedUnreadPage} from '#/state/queries/notifications/unread'
import {useAgent} from '#/state/session'
import * as Toast from '#/view/com/util/Toast'
-export function useNotificationSettingsMutation() {
- const {_} = useLingui()
+const RQKEY_ROOT = 'notification-settings'
+const RQKEY = [RQKEY_ROOT]
+
+export function useNotificationSettingsQuery() {
+ const agent = useAgent()
+
+ return useQuery({
+ queryKey: RQKEY,
+ queryFn: async () => {
+ const response = await agent.app.bsky.notification.getPreferences()
+ return response.data.preferences
+ },
+ })
+}
+export function useNotificationSettingsUpdateMutation() {
const agent = useAgent()
const queryClient = useQueryClient()
return useMutation({
- mutationFn: async (keys: string[]) => {
- const enabled = keys[0] === 'enabled'
-
- await agent.api.app.bsky.notification.putPreferences({
- priority: enabled,
- })
-
- await until(
- 5, // 5 tries
- 1e3, // 1s delay between tries
- res => res.data.priority === enabled,
- () => agent.api.app.bsky.notification.listNotifications({limit: 1}),
+ mutationFn: async (
+ update: Partial,
+ ) => {
+ const response = await agent.app.bsky.notification.putPreferencesV2(
+ update,
)
-
- eagerlySetCachedPriority(queryClient, enabled)
+ return response.data.preferences
},
- onError: err => {
- logger.error('Failed to save notification preferences', {
- safeMessage: err,
- })
- Toast.show(
- _(msg`Failed to save notification preferences, please try again`),
- 'xmark',
- )
+ onMutate: update => {
+ optimisticUpdateNotificationSettings(queryClient, update)
},
- onSuccess: () => {
- Toast.show(_(msg({message: 'Preference saved', context: 'toast'})))
- },
- onSettled: () => {
- invalidateCachedUnreadPage()
- queryClient.invalidateQueries({queryKey: RQKEY_NOTIFS('all')})
- queryClient.invalidateQueries({queryKey: RQKEY_NOTIFS('mentions')})
+ onError: e => {
+ logger.error('Could not update notification settings', {message: e})
+ queryClient.invalidateQueries({queryKey: RQKEY})
+ Toast.show(t`Could not update notification settings`, 'xmark')
},
})
}
-function eagerlySetCachedPriority(
- queryClient: ReturnType,
- enabled: boolean,
+function optimisticUpdateNotificationSettings(
+ queryClient: QueryClient,
+ update: Partial,
) {
- function updateData(old: any) {
- if (!old) return old
- return {
- ...old,
- pages: old.pages.map((page: any) => {
- return {
- ...page,
- priority: enabled,
- }
- }),
- }
- }
- queryClient.setQueryData(RQKEY_NOTIFS('all'), updateData)
- queryClient.setQueryData(RQKEY_NOTIFS('mentions'), updateData)
+ queryClient.setQueryData(
+ RQKEY,
+ (old?: AppBskyNotificationDefs.Preferences) => {
+ if (!old) return old
+ return {...old, ...update}
+ },
+ )
}
diff --git a/src/state/queries/postgate/util.ts b/src/state/queries/postgate/util.ts
index c1955cc74f..0952a1ad09 100644
--- a/src/state/queries/postgate/util.ts
+++ b/src/state/queries/postgate/util.ts
@@ -1,9 +1,9 @@
import {
- $Typed,
+ type $Typed,
AppBskyEmbedRecord,
AppBskyEmbedRecordWithMedia,
- AppBskyFeedDefs,
- AppBskyFeedPostgate,
+ type AppBskyFeedDefs,
+ type AppBskyFeedPostgate,
AtUri,
} from '@atproto/api'
@@ -113,6 +113,7 @@ export function createEmbedViewRecordFromPost(
likeCount: post.likeCount,
quoteCount: post.quoteCount,
indexedAt: post.indexedAt,
+ embeds: post.embed ? [post.embed] : [],
}
}
diff --git a/src/state/queries/preferences/useThreadPreferences.ts b/src/state/queries/preferences/useThreadPreferences.ts
new file mode 100644
index 0000000000..dc3122a72a
--- /dev/null
+++ b/src/state/queries/preferences/useThreadPreferences.ts
@@ -0,0 +1,179 @@
+import {useCallback, useMemo, useRef, useState} from 'react'
+import {type AppBskyUnspeccedGetPostThreadV2} from '@atproto/api'
+import debounce from 'lodash.debounce'
+
+import {OnceKey, useCallOnce} from '#/lib/hooks/useCallOnce'
+import {logger} from '#/logger'
+import {
+ usePreferencesQuery,
+ useSetThreadViewPreferencesMutation,
+} from '#/state/queries/preferences'
+import {type ThreadViewPreferences} from '#/state/queries/preferences/types'
+import {type Literal} from '#/types/utils'
+
+export type ThreadSortOption = Literal<
+ AppBskyUnspeccedGetPostThreadV2.QueryParams['sort'],
+ string
+>
+export type ThreadViewOption = 'linear' | 'tree'
+export type ThreadPreferences = {
+ isLoaded: boolean
+ isSaving: boolean
+ sort: ThreadSortOption
+ setSort: (sort: string) => void
+ view: ThreadViewOption
+ setView: (view: ThreadViewOption) => void
+ prioritizeFollowedUsers: boolean
+ setPrioritizeFollowedUsers: (prioritize: boolean) => void
+}
+
+export function useThreadPreferences({
+ save,
+}: {save?: boolean} = {}): ThreadPreferences {
+ const {data: preferences} = usePreferencesQuery()
+ const serverPrefs = preferences?.threadViewPrefs
+ const once = useCallOnce(OnceKey.PreferencesThread)
+
+ /*
+ * Create local state representations of server state
+ */
+ const [sort, setSort] = useState(normalizeSort(serverPrefs?.sort || 'top'))
+ const [view, setView] = useState(
+ normalizeView({
+ treeViewEnabled: !!serverPrefs?.lab_treeViewEnabled,
+ }),
+ )
+ const [prioritizeFollowedUsers, setPrioritizeFollowedUsers] = useState(
+ !!serverPrefs?.prioritizeFollowedUsers,
+ )
+
+ /**
+ * If we get a server update, update local state
+ */
+ const [prevServerPrefs, setPrevServerPrefs] = useState(serverPrefs)
+ const isLoaded = !!prevServerPrefs
+ if (serverPrefs && prevServerPrefs !== serverPrefs) {
+ setPrevServerPrefs(serverPrefs)
+
+ /*
+ * Update
+ */
+ setSort(normalizeSort(serverPrefs.sort))
+ setPrioritizeFollowedUsers(serverPrefs.prioritizeFollowedUsers)
+ setView(
+ normalizeView({
+ treeViewEnabled: !!serverPrefs.lab_treeViewEnabled,
+ }),
+ )
+
+ once(() => {
+ logger.metric('thread:preferences:load', {
+ sort: serverPrefs.sort,
+ view: serverPrefs.lab_treeViewEnabled ? 'tree' : 'linear',
+ prioritizeFollowedUsers: serverPrefs.prioritizeFollowedUsers,
+ })
+ })
+ }
+
+ const userUpdatedPrefs = useRef(false)
+ const [isSaving, setIsSaving] = useState(false)
+ const {mutateAsync} = useSetThreadViewPreferencesMutation()
+ const savePrefs = useMemo(() => {
+ return debounce(async (prefs: ThreadViewPreferences) => {
+ try {
+ setIsSaving(true)
+ await mutateAsync(prefs)
+ logger.metric('thread:preferences:update', {
+ sort: prefs.sort,
+ view: prefs.lab_treeViewEnabled ? 'tree' : 'linear',
+ prioritizeFollowedUsers: prefs.prioritizeFollowedUsers,
+ })
+ } catch (e) {
+ logger.error('useThreadPreferences failed to save', {
+ safeMessage: e,
+ })
+ } finally {
+ setIsSaving(false)
+ }
+ }, 4e3)
+ }, [mutateAsync])
+
+ if (save && userUpdatedPrefs.current) {
+ savePrefs({
+ sort,
+ prioritizeFollowedUsers,
+ lab_treeViewEnabled: view === 'tree',
+ })
+ userUpdatedPrefs.current = false
+ }
+
+ const setSortWrapped = useCallback(
+ (next: string) => {
+ userUpdatedPrefs.current = true
+ setSort(normalizeSort(next))
+ },
+ [setSort],
+ )
+ const setViewWrapped = useCallback(
+ (next: ThreadViewOption) => {
+ userUpdatedPrefs.current = true
+ setView(next)
+ },
+ [setView],
+ )
+ const setPrioritizeFollowedUsersWrapped = useCallback(
+ (next: boolean) => {
+ userUpdatedPrefs.current = true
+ setPrioritizeFollowedUsers(next)
+ },
+ [setPrioritizeFollowedUsers],
+ )
+
+ return useMemo(
+ () => ({
+ isLoaded,
+ isSaving,
+ sort,
+ setSort: setSortWrapped,
+ view,
+ setView: setViewWrapped,
+ prioritizeFollowedUsers,
+ setPrioritizeFollowedUsers: setPrioritizeFollowedUsersWrapped,
+ }),
+ [
+ isLoaded,
+ isSaving,
+ sort,
+ setSortWrapped,
+ view,
+ setViewWrapped,
+ prioritizeFollowedUsers,
+ setPrioritizeFollowedUsersWrapped,
+ ],
+ )
+}
+
+/**
+ * Migrates user thread preferences from the old sort values to V2
+ */
+export function normalizeSort(sort: string): ThreadSortOption {
+ switch (sort) {
+ case 'oldest':
+ return 'oldest'
+ case 'newest':
+ return 'newest'
+ default:
+ return 'top'
+ }
+}
+
+/**
+ * Transforms existing treeViewEnabled preference into a ThreadViewOption
+ */
+export function normalizeView({
+ treeViewEnabled,
+}: {
+ treeViewEnabled: boolean
+}): ThreadViewOption {
+ return treeViewEnabled ? 'tree' : 'linear'
+}
diff --git a/src/state/queries/usePostThread/const.ts b/src/state/queries/usePostThread/const.ts
new file mode 100644
index 0000000000..9b74361307
--- /dev/null
+++ b/src/state/queries/usePostThread/const.ts
@@ -0,0 +1,27 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import {type AppBskyUnspeccedGetPostThreadV2} from '@atproto/api'
+
+/**
+ * See the `below` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ */
+export const LINEAR_VIEW_BELOW = 10
+
+/**
+ * See the `branchingFactor` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ */
+export const LINEAR_VIEW_BF = 1
+
+/**
+ * See the `below` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ */
+export const TREE_VIEW_BELOW = 4
+
+/**
+ * See the `branchingFactor` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ */
+export const TREE_VIEW_BF = undefined
+
+/**
+ * See the `below` param on {@link AppBskyUnspeccedGetPostThreadV2.QueryParams}
+ */
+export const TREE_VIEW_BELOW_DESKTOP = 6
diff --git a/src/state/queries/usePostThread/index.ts b/src/state/queries/usePostThread/index.ts
new file mode 100644
index 0000000000..782888cfbe
--- /dev/null
+++ b/src/state/queries/usePostThread/index.ts
@@ -0,0 +1,325 @@
+import {useCallback, useMemo, useState} from 'react'
+import {useQuery, useQueryClient} from '@tanstack/react-query'
+
+import {isWeb} from '#/platform/detection'
+import {useModerationOpts} from '#/state/preferences/moderation-opts'
+import {useThreadPreferences} from '#/state/queries/preferences/useThreadPreferences'
+import {
+ LINEAR_VIEW_BELOW,
+ LINEAR_VIEW_BF,
+ TREE_VIEW_BELOW,
+ TREE_VIEW_BELOW_DESKTOP,
+ TREE_VIEW_BF,
+} from '#/state/queries/usePostThread/const'
+import {
+ createCacheMutator,
+ getThreadPlaceholder,
+} from '#/state/queries/usePostThread/queryCache'
+import {
+ buildThread,
+ sortAndAnnotateThreadItems,
+} from '#/state/queries/usePostThread/traversal'
+import {
+ createPostThreadOtherQueryKey,
+ createPostThreadQueryKey,
+ type ThreadItem,
+ type UsePostThreadQueryResult,
+} from '#/state/queries/usePostThread/types'
+import {getThreadgateRecord} from '#/state/queries/usePostThread/utils'
+import * as views from '#/state/queries/usePostThread/views'
+import {useAgent, useSession} from '#/state/session'
+import {useMergeThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
+import {useBreakpoints} from '#/alf'
+
+export * from '#/state/queries/usePostThread/types'
+
+export function usePostThread({anchor}: {anchor?: string}) {
+ const qc = useQueryClient()
+ const agent = useAgent()
+ const {hasSession} = useSession()
+ const {gtPhone} = useBreakpoints()
+ const moderationOpts = useModerationOpts()
+ const mergeThreadgateHiddenReplies = useMergeThreadgateHiddenReplies()
+ const {
+ isLoaded: isThreadPreferencesLoaded,
+ sort,
+ setSort: baseSetSort,
+ view,
+ setView: baseSetView,
+ prioritizeFollowedUsers,
+ } = useThreadPreferences()
+ const below = useMemo(() => {
+ return view === 'linear'
+ ? LINEAR_VIEW_BELOW
+ : isWeb && gtPhone
+ ? TREE_VIEW_BELOW_DESKTOP
+ : TREE_VIEW_BELOW
+ }, [view, gtPhone])
+
+ const postThreadQueryKey = createPostThreadQueryKey({
+ anchor,
+ sort,
+ view,
+ prioritizeFollowedUsers,
+ })
+ const postThreadOtherQueryKey = createPostThreadOtherQueryKey({
+ anchor,
+ prioritizeFollowedUsers,
+ })
+
+ const query = useQuery({
+ enabled: isThreadPreferencesLoaded && !!anchor && !!moderationOpts,
+ queryKey: postThreadQueryKey,
+ async queryFn(ctx) {
+ const {data} = await agent.app.bsky.unspecced.getPostThreadV2({
+ anchor: anchor!,
+ branchingFactor: view === 'linear' ? LINEAR_VIEW_BF : TREE_VIEW_BF,
+ below,
+ sort: sort,
+ prioritizeFollowedUsers: prioritizeFollowedUsers,
+ })
+
+ /*
+ * Initialize `ctx.meta` to track if we know we have additional replies
+ * we could fetch once we hit the end.
+ */
+ ctx.meta = ctx.meta || {
+ hasOtherReplies: false,
+ }
+
+ /*
+ * If we know we have additional replies, we'll set this to true.
+ */
+ if (data.hasOtherReplies) {
+ ctx.meta.hasOtherReplies = true
+ }
+
+ const result = {
+ thread: data.thread || [],
+ threadgate: data.threadgate,
+ hasOtherReplies: !!ctx.meta.hasOtherReplies,
+ }
+
+ const record = getThreadgateRecord(result.threadgate)
+ if (result.threadgate && record) {
+ result.threadgate.record = record
+ }
+
+ return result as UsePostThreadQueryResult
+ },
+ placeholderData() {
+ if (!anchor) return
+ const placeholder = getThreadPlaceholder(qc, anchor)
+ /*
+ * Always return something here, even empty data, so that
+ * `isPlaceholderData` is always true, which we'll use to insert
+ * skeletons.
+ */
+ const thread = placeholder ? [placeholder] : []
+ return {thread, threadgate: undefined, hasOtherReplies: false}
+ },
+ select(data) {
+ const record = getThreadgateRecord(data.threadgate)
+ if (data.threadgate && record) {
+ data.threadgate.record = record
+ }
+ return data
+ },
+ })
+
+ const thread = useMemo(() => query.data?.thread || [], [query.data?.thread])
+ const threadgate = useMemo(
+ () => query.data?.threadgate,
+ [query.data?.threadgate],
+ )
+ const hasOtherThreadItems = useMemo(
+ () => !!query.data?.hasOtherReplies,
+ [query.data?.hasOtherReplies],
+ )
+ const [otherItemsVisible, setOtherItemsVisible] = useState(false)
+
+ /**
+ * Creates a mutator for the post thread cache. This is used to insert
+ * replies into the thread cache after posting.
+ */
+ const mutator = useMemo(
+ () =>
+ createCacheMutator({
+ params: {view, below},
+ postThreadQueryKey,
+ postThreadOtherQueryKey,
+ queryClient: qc,
+ }),
+ [qc, view, below, postThreadQueryKey, postThreadOtherQueryKey],
+ )
+
+ /**
+ * If we have additional items available from the server and the user has
+ * chosen to view them, start loading data
+ */
+ const additionalQueryEnabled = hasOtherThreadItems && otherItemsVisible
+ const additionalItemsQuery = useQuery({
+ enabled: additionalQueryEnabled,
+ queryKey: postThreadOtherQueryKey,
+ async queryFn() {
+ const {data} = await agent.app.bsky.unspecced.getPostThreadOtherV2({
+ anchor: anchor!,
+ prioritizeFollowedUsers,
+ })
+ return data
+ },
+ })
+ const serverOtherThreadItems: ThreadItem[] = useMemo(() => {
+ if (!additionalQueryEnabled) return []
+ if (additionalItemsQuery.isLoading) {
+ return Array.from({length: 2}).map((_, i) =>
+ views.skeleton({
+ key: `other-reply-${i}`,
+ item: 'reply',
+ }),
+ )
+ } else if (additionalItemsQuery.isError) {
+ /*
+ * We could insert an special error component in here, but since these
+ * are optional additional replies, it's not critical that they're shown
+ * atm.
+ */
+ return []
+ } else if (additionalItemsQuery.data?.thread) {
+ const {threadItems} = sortAndAnnotateThreadItems(
+ additionalItemsQuery.data.thread,
+ {
+ view,
+ skipModerationHandling: true,
+ threadgateHiddenReplies: mergeThreadgateHiddenReplies(
+ threadgate?.record,
+ ),
+ moderationOpts: moderationOpts!,
+ },
+ )
+ return threadItems
+ } else {
+ return []
+ }
+ }, [
+ view,
+ additionalQueryEnabled,
+ additionalItemsQuery,
+ mergeThreadgateHiddenReplies,
+ moderationOpts,
+ threadgate?.record,
+ ])
+
+ /**
+ * Sets the sort order for the thread and resets the additional thread items
+ */
+ const setSort: typeof baseSetSort = useCallback(
+ nextSort => {
+ setOtherItemsVisible(false)
+ baseSetSort(nextSort)
+ },
+ [baseSetSort, setOtherItemsVisible],
+ )
+
+ /**
+ * Sets the view variant for the thread and resets the additional thread items
+ */
+ const setView: typeof baseSetView = useCallback(
+ nextView => {
+ setOtherItemsVisible(false)
+ baseSetView(nextView)
+ },
+ [baseSetView, setOtherItemsVisible],
+ )
+
+ /*
+ * This is the main thread response, sorted into separate buckets based on
+ * moderation, and annotated with all UI state needed for rendering.
+ */
+ const {threadItems, otherThreadItems} = useMemo(() => {
+ return sortAndAnnotateThreadItems(thread, {
+ view: view,
+ threadgateHiddenReplies: mergeThreadgateHiddenReplies(threadgate?.record),
+ moderationOpts: moderationOpts!,
+ })
+ }, [
+ thread,
+ threadgate?.record,
+ mergeThreadgateHiddenReplies,
+ moderationOpts,
+ view,
+ ])
+
+ /*
+ * Take all three sets of thread items and combine them into a single thread,
+ * along with any other thread items required for rendering e.g. "Show more
+ * replies" or the reply composer.
+ */
+ const items = useMemo(() => {
+ return buildThread({
+ threadItems,
+ otherThreadItems,
+ serverOtherThreadItems,
+ isLoading: query.isPlaceholderData,
+ hasSession,
+ hasOtherThreadItems,
+ otherItemsVisible,
+ showOtherItems: () => setOtherItemsVisible(true),
+ })
+ }, [
+ threadItems,
+ otherThreadItems,
+ serverOtherThreadItems,
+ query.isPlaceholderData,
+ hasSession,
+ hasOtherThreadItems,
+ otherItemsVisible,
+ setOtherItemsVisible,
+ ])
+
+ return useMemo(
+ () => ({
+ state: {
+ /*
+ * Copy in any query state that is useful
+ */
+ isFetching: query.isFetching,
+ isPlaceholderData: query.isPlaceholderData,
+ error: query.error,
+ /*
+ * Other state
+ */
+ sort,
+ view,
+ otherItemsVisible,
+ },
+ data: {
+ items,
+ threadgate,
+ },
+ actions: {
+ /*
+ * Copy in any query actions that are useful
+ */
+ insertReplies: mutator.insertReplies,
+ refetch: query.refetch,
+ /*
+ * Other actions
+ */
+ setSort,
+ setView,
+ },
+ }),
+ [
+ query,
+ mutator.insertReplies,
+ otherItemsVisible,
+ sort,
+ view,
+ setSort,
+ setView,
+ threadgate,
+ items,
+ ],
+ )
+}
diff --git a/src/state/queries/usePostThread/queryCache.ts b/src/state/queries/usePostThread/queryCache.ts
new file mode 100644
index 0000000000..871033395f
--- /dev/null
+++ b/src/state/queries/usePostThread/queryCache.ts
@@ -0,0 +1,300 @@
+import {
+ type $Typed,
+ type AppBskyActorDefs,
+ type AppBskyFeedDefs,
+ AppBskyUnspeccedDefs,
+ type AppBskyUnspeccedGetPostThreadOtherV2,
+ type AppBskyUnspeccedGetPostThreadV2,
+ AtUri,
+} from '@atproto/api'
+import {type QueryClient} from '@tanstack/react-query'
+
+import {findAllPostsInQueryData as findAllPostsInExploreFeedPreviewsQueryData} from '#/state/queries/explore-feed-previews'
+import {findAllPostsInQueryData as findAllPostsInNotifsQueryData} from '#/state/queries/notifications/feed'
+import {findAllPostsInQueryData as findAllPostsInFeedQueryData} from '#/state/queries/post-feed'
+import {findAllPostsInQueryData as findAllPostsInQuoteQueryData} from '#/state/queries/post-quotes'
+import {findAllPostsInQueryData as findAllPostsInSearchQueryData} from '#/state/queries/search-posts'
+import {getBranch} from '#/state/queries/usePostThread/traversal'
+import {
+ type ApiThreadItem,
+ type createPostThreadOtherQueryKey,
+ type createPostThreadQueryKey,
+ type PostThreadParams,
+ postThreadQueryKeyRoot,
+} from '#/state/queries/usePostThread/types'
+import {getRootPostAtUri} from '#/state/queries/usePostThread/utils'
+import {postViewToThreadPlaceholder} from '#/state/queries/usePostThread/views'
+import {didOrHandleUriMatches, getEmbeddedPost} from '#/state/queries/util'
+import {embedViewRecordToPostView} from '#/state/queries/util'
+
+export function createCacheMutator({
+ queryClient,
+ postThreadQueryKey,
+ postThreadOtherQueryKey,
+ params,
+}: {
+ queryClient: QueryClient
+ postThreadQueryKey: ReturnType
+ postThreadOtherQueryKey: ReturnType
+ params: Pick & {below: number}
+}) {
+ return {
+ insertReplies(
+ parentUri: string,
+ replies: AppBskyUnspeccedGetPostThreadV2.ThreadItem[],
+ ) {
+ /*
+ * Main thread query mutator.
+ */
+ queryClient.setQueryData(
+ postThreadQueryKey,
+ data => {
+ if (!data) return
+ return {
+ ...data,
+ thread: mutator([
+ ...data.thread,
+ ]),
+ }
+ },
+ )
+
+ /*
+ * Additional replies query mutator.
+ */
+ queryClient.setQueryData(
+ postThreadOtherQueryKey,
+ data => {
+ if (!data) return
+ return {
+ ...data,
+ thread: mutator([
+ ...data.thread,
+ ]),
+ }
+ },
+ )
+
+ function mutator(thread: ApiThreadItem[]): T[] {
+ for (let i = 0; i < thread.length; i++) {
+ const existingParent = thread[i]
+ if (!AppBskyUnspeccedDefs.isThreadItemPost(existingParent.value))
+ continue
+ if (existingParent.uri !== parentUri) continue
+
+ /*
+ * Update parent data
+ */
+ existingParent.value.post = {
+ ...existingParent.value.post,
+ replyCount: (existingParent.value.post.replyCount || 0) + 1,
+ }
+
+ const opDid = getRootPostAtUri(existingParent.value.post)?.host
+ const nextItem = thread.at(i + 1)
+ const isReplyToRoot = existingParent.depth === 0
+ const isEndOfReplyChain =
+ !nextItem || nextItem.depth <= existingParent.depth
+ const firstReply = replies.at(0)
+ const opIsReplier = AppBskyUnspeccedDefs.isThreadItemPost(
+ firstReply?.value,
+ )
+ ? opDid === firstReply.value.post.author.did
+ : false
+
+ /*
+ * Always insert replies if the following conditions are met.
+ */
+ const shouldAlwaysInsertReplies =
+ isReplyToRoot ||
+ params.view === 'tree' ||
+ (params.view === 'linear' && isEndOfReplyChain)
+ /*
+ * Maybe insert replies if the replier is the OP and certain conditions are met
+ */
+ const shouldReplaceWithOPReplies =
+ !isReplyToRoot && params.view === 'linear' && opIsReplier
+
+ if (shouldAlwaysInsertReplies || shouldReplaceWithOPReplies) {
+ const branch = getBranch(thread, i, existingParent.depth)
+ /*
+ * OP insertions replace other replies _in linear view_.
+ */
+ const itemsToRemove = shouldReplaceWithOPReplies ? branch.length : 0
+ const itemsToInsert = replies
+ .map((r, ri) => {
+ r.depth = existingParent.depth + 1 + ri
+ return r
+ })
+ .filter(r => {
+ // Filter out replies that are too deep for our UI
+ return r.depth <= params.below
+ })
+
+ thread.splice(i + 1, itemsToRemove, ...itemsToInsert)
+ }
+ }
+
+ return thread as T[]
+ }
+ },
+ /**
+ * Unused atm, post shadow does the trick, but it would be nice to clean up
+ * the whole sub-tree on deletes.
+ */
+ deletePost(post: AppBskyUnspeccedGetPostThreadV2.ThreadItem) {
+ queryClient.setQueryData(
+ postThreadQueryKey,
+ queryData => {
+ if (!queryData) return
+
+ const thread = [...queryData.thread]
+
+ for (let i = 0; i < thread.length; i++) {
+ const existingPost = thread[i]
+ if (!AppBskyUnspeccedDefs.isThreadItemPost(post.value)) continue
+
+ if (existingPost.uri === post.uri) {
+ const branch = getBranch(thread, i, existingPost.depth)
+ thread.splice(branch.start, branch.length)
+ break
+ }
+ }
+
+ return {
+ ...queryData,
+ thread,
+ }
+ },
+ )
+ },
+ }
+}
+
+export function getThreadPlaceholder(
+ queryClient: QueryClient,
+ uri: string,
+): $Typed | void {
+ let partial
+ for (let item of getThreadPlaceholderCandidates(queryClient, uri)) {
+ /*
+ * Currently, the backend doesn't send full post info in some cases (for
+ * example, for quoted posts). We use missing `likeCount` as a way to
+ * detect that. In the future, we should fix this on the backend, which
+ * will let us always stop on the first result.
+ *
+ * TODO can we send in feeds and quotes?
+ */
+ const hasAllInfo = item.value.post.likeCount != null
+ if (hasAllInfo) {
+ return item
+ } else {
+ // Keep searching, we might still find a full post in the cache.
+ partial = item
+ }
+ }
+ return partial
+}
+
+export function* getThreadPlaceholderCandidates(
+ queryClient: QueryClient,
+ uri: string,
+): Generator<
+ $Typed<
+ Omit & {
+ value: $Typed
+ }
+ >,
+ void
+> {
+ /*
+ * Check post thread queries first
+ */
+ for (const post of findAllPostsInQueryData(queryClient, uri)) {
+ yield postViewToThreadPlaceholder(post)
+ }
+
+ /*
+ * Check notifications first. If you have a post in notifications, it's
+ * often due to a like or a repost, and we want to prioritize a post object
+ * with >0 likes/reposts over a stale version with no metrics in order to
+ * avoid a notification->post scroll jump.
+ */
+ for (let post of findAllPostsInNotifsQueryData(queryClient, uri)) {
+ yield postViewToThreadPlaceholder(post)
+ }
+ for (let post of findAllPostsInFeedQueryData(queryClient, uri)) {
+ yield postViewToThreadPlaceholder(post)
+ }
+ for (let post of findAllPostsInQuoteQueryData(queryClient, uri)) {
+ yield postViewToThreadPlaceholder(post)
+ }
+ for (let post of findAllPostsInSearchQueryData(queryClient, uri)) {
+ yield postViewToThreadPlaceholder(post)
+ }
+ for (let post of findAllPostsInExploreFeedPreviewsQueryData(
+ queryClient,
+ uri,
+ )) {
+ yield postViewToThreadPlaceholder(post)
+ }
+}
+
+export function* findAllPostsInQueryData(
+ queryClient: QueryClient,
+ uri: string,
+): Generator {
+ const atUri = new AtUri(uri)
+ const queryDatas =
+ queryClient.getQueriesData({
+ queryKey: [postThreadQueryKeyRoot],
+ })
+
+ for (const [_queryKey, queryData] of queryDatas) {
+ if (!queryData) continue
+
+ const {thread} = queryData
+
+ for (const item of thread) {
+ if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+ if (didOrHandleUriMatches(atUri, item.value.post)) {
+ yield item.value.post
+ }
+
+ const qp = getEmbeddedPost(item.value.post.embed)
+ if (qp && didOrHandleUriMatches(atUri, qp)) {
+ yield embedViewRecordToPostView(qp)
+ }
+ }
+ }
+ }
+}
+
+export function* findAllProfilesInQueryData(
+ queryClient: QueryClient,
+ did: string,
+): Generator {
+ const queryDatas =
+ queryClient.getQueriesData({
+ queryKey: [postThreadQueryKeyRoot],
+ })
+
+ for (const [_queryKey, queryData] of queryDatas) {
+ if (!queryData) continue
+
+ const {thread} = queryData
+
+ for (const item of thread) {
+ if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+ if (item.value.post.author.did === did) {
+ yield item.value.post.author
+ }
+
+ const qp = getEmbeddedPost(item.value.post.embed)
+ if (qp && qp.author.did === did) {
+ yield qp.author
+ }
+ }
+ }
+ }
+}
diff --git a/src/state/queries/usePostThread/traversal.ts b/src/state/queries/usePostThread/traversal.ts
new file mode 100644
index 0000000000..124591125f
--- /dev/null
+++ b/src/state/queries/usePostThread/traversal.ts
@@ -0,0 +1,563 @@
+/* eslint-disable no-labels */
+import {AppBskyUnspeccedDefs, type ModerationOpts} from '@atproto/api'
+
+import {
+ type ApiThreadItem,
+ type PostThreadParams,
+ type ThreadItem,
+ type TraversalMetadata,
+} from '#/state/queries/usePostThread/types'
+import {
+ getPostRecord,
+ getThreadPostNoUnauthenticatedUI,
+ getThreadPostUI,
+ getTraversalMetadata,
+ storeTraversalMetadata,
+} from '#/state/queries/usePostThread/utils'
+import * as views from '#/state/queries/usePostThread/views'
+
+export function sortAndAnnotateThreadItems(
+ thread: ApiThreadItem[],
+ {
+ threadgateHiddenReplies,
+ moderationOpts,
+ view,
+ skipModerationHandling,
+ }: {
+ threadgateHiddenReplies: Set
+ moderationOpts: ModerationOpts
+ view: PostThreadParams['view']
+ /**
+ * Set to `true` in cases where we already know the moderation state of the
+ * post e.g. when fetching additional replies from the server. This will
+ * prevent additional sorting or nested-branch truncation, and all replies,
+ * regardless of moderation state, will be included in the resulting
+ * `threadItems` array.
+ */
+ skipModerationHandling?: boolean
+ },
+) {
+ const threadItems: ThreadItem[] = []
+ const otherThreadItems: ThreadItem[] = []
+ const metadatas = new Map()
+
+ traversal: for (let i = 0; i < thread.length; i++) {
+ const item = thread[i]
+ let parentMetadata: TraversalMetadata | undefined
+ let metadata: TraversalMetadata | undefined
+
+ if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+ parentMetadata = metadatas.get(
+ getPostRecord(item.value.post).reply?.parent?.uri || '',
+ )
+ metadata = getTraversalMetadata({
+ item,
+ parentMetadata,
+ prevItem: thread.at(i - 1),
+ nextItem: thread.at(i + 1),
+ })
+ storeTraversalMetadata(metadatas, metadata)
+ }
+
+ if (item.depth < 0) {
+ /*
+ * Parents are ignored until we find the anchor post, then we walk
+ * _up_ from there.
+ */
+ } else if (item.depth === 0) {
+ if (AppBskyUnspeccedDefs.isThreadItemNoUnauthenticated(item.value)) {
+ threadItems.push(views.threadPostNoUnauthenticated(item))
+ } else if (AppBskyUnspeccedDefs.isThreadItemNotFound(item.value)) {
+ threadItems.push(views.threadPostNotFound(item))
+ } else if (AppBskyUnspeccedDefs.isThreadItemBlocked(item.value)) {
+ threadItems.push(views.threadPostBlocked(item))
+ } else if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+ const post = views.threadPost({
+ uri: item.uri,
+ depth: item.depth,
+ value: item.value,
+ moderationOpts,
+ threadgateHiddenReplies,
+ })
+ threadItems.push(post)
+
+ parentTraversal: for (let pi = i - 1; pi >= 0; pi--) {
+ const parent = thread[pi]
+
+ if (
+ AppBskyUnspeccedDefs.isThreadItemNoUnauthenticated(parent.value)
+ ) {
+ const post = views.threadPostNoUnauthenticated(parent)
+ post.ui = getThreadPostNoUnauthenticatedUI({
+ depth: parent.depth,
+ // ignore for now
+ // prevItemDepth: thread[pi - 1]?.depth,
+ nextItemDepth: thread[pi + 1]?.depth,
+ })
+ threadItems.unshift(post)
+ // for now, break parent traversal at first no-unauthed
+ break parentTraversal
+ } else if (AppBskyUnspeccedDefs.isThreadItemNotFound(parent.value)) {
+ threadItems.unshift(views.threadPostNotFound(parent))
+ break parentTraversal
+ } else if (AppBskyUnspeccedDefs.isThreadItemBlocked(parent.value)) {
+ threadItems.unshift(views.threadPostBlocked(parent))
+ break parentTraversal
+ } else if (AppBskyUnspeccedDefs.isThreadItemPost(parent.value)) {
+ threadItems.unshift(
+ views.threadPost({
+ uri: parent.uri,
+ depth: parent.depth,
+ value: parent.value,
+ moderationOpts,
+ threadgateHiddenReplies,
+ }),
+ )
+ }
+ }
+ }
+ } else if (item.depth > 0) {
+ /*
+ * The API does not send down any unavailable replies, so this will
+ * always be false (for now). If we ever wanted to tombstone them here,
+ * we could.
+ */
+ const shouldBreak =
+ AppBskyUnspeccedDefs.isThreadItemNoUnauthenticated(item.value) ||
+ AppBskyUnspeccedDefs.isThreadItemNotFound(item.value) ||
+ AppBskyUnspeccedDefs.isThreadItemBlocked(item.value)
+
+ if (shouldBreak) {
+ const branch = getBranch(thread, i, item.depth)
+ // could insert tombstone
+ i = branch.end
+ continue traversal
+ } else if (AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+ if (parentMetadata) {
+ /*
+ * Set this value before incrementing the parent's repliesSeenCounter
+ */
+ metadata!.replyIndex = parentMetadata.repliesIndexCounter
+ // Increment the parent's repliesIndexCounter
+ parentMetadata.repliesIndexCounter += 1
+ }
+
+ const post = views.threadPost({
+ uri: item.uri,
+ depth: item.depth,
+ value: item.value,
+ moderationOpts,
+ threadgateHiddenReplies,
+ })
+
+ if (!post.isBlurred || skipModerationHandling) {
+ /*
+ * Not moderated, need to insert it
+ */
+ threadItems.push(post)
+
+ /*
+ * Update seen reply count of parent
+ */
+ if (parentMetadata) {
+ parentMetadata.repliesSeenCounter += 1
+ }
+ } else {
+ /*
+ * Moderated in some way, we're going to walk children
+ */
+ const parent = post
+ const parentIsTopLevelReply = parent.depth === 1
+ // get sub tree
+ const branch = getBranch(thread, i, item.depth)
+
+ if (parentIsTopLevelReply) {
+ // push branch anchor into sorted array
+ otherThreadItems.push(parent)
+ // skip branch anchor in branch traversal
+ const startIndex = branch.start + 1
+
+ for (let ci = startIndex; ci <= branch.end; ci++) {
+ const child = thread[ci]
+
+ if (AppBskyUnspeccedDefs.isThreadItemPost(child.value)) {
+ const childParentMetadata = metadatas.get(
+ getPostRecord(child.value.post).reply?.parent?.uri || '',
+ )
+ const childMetadata = getTraversalMetadata({
+ item: child,
+ prevItem: thread[ci - 1],
+ nextItem: thread[ci + 1],
+ parentMetadata: childParentMetadata,
+ })
+ storeTraversalMetadata(metadatas, childMetadata)
+ if (childParentMetadata) {
+ /*
+ * Set this value before incrementing the parent's repliesIndexCounter
+ */
+ childMetadata!.replyIndex =
+ childParentMetadata.repliesIndexCounter
+ childParentMetadata.repliesIndexCounter += 1
+ }
+
+ const childPost = views.threadPost({
+ uri: child.uri,
+ depth: child.depth,
+ value: child.value,
+ moderationOpts,
+ threadgateHiddenReplies,
+ })
+
+ /*
+ * If a child is moderated in any way, drop it an its sub-branch
+ * entirely. To reveal these, the user must navigate to the
+ * parent post directly.
+ */
+ if (childPost.isBlurred) {
+ ci = getBranch(thread, ci, child.depth).end
+ } else {
+ otherThreadItems.push(childPost)
+
+ if (childParentMetadata) {
+ childParentMetadata.repliesSeenCounter += 1
+ }
+ }
+ } else {
+ /*
+ * Drop the rest of the branch if we hit anything unexpected
+ */
+ break
+ }
+ }
+ }
+
+ /*
+ * Skip to next branch
+ */
+ i = branch.end
+ continue traversal
+ }
+ }
+ }
+ }
+
+ /*
+ * Both `threadItems` and `otherThreadItems` now need to be traversed again to fully compute
+ * UI state based on collected metadata. These arrays will be muted in situ.
+ */
+ for (const subset of [threadItems, otherThreadItems]) {
+ for (let i = 0; i < subset.length; i++) {
+ const item = subset[i]
+ const prevItem = subset.at(i - 1)
+ const nextItem = subset.at(i + 1)
+
+ if (item.type === 'threadPost') {
+ const metadata = metadatas.get(item.uri)
+
+ if (metadata) {
+ if (metadata.parentMetadata) {
+ /*
+ * Track what's before/after now that we've applied moderation
+ */
+ if (prevItem?.type === 'threadPost')
+ metadata.prevItemDepth = prevItem?.depth
+ if (nextItem?.type === 'threadPost')
+ metadata.nextItemDepth = nextItem?.depth
+
+ /*
+ * Item is the last "sibling" if we know for sure we're out of
+ * replies on the parent (even though this item itself may have its
+ * own reply branches).
+ */
+ const isLastSiblingByCounts =
+ metadata.replyIndex ===
+ metadata.parentMetadata.repliesIndexCounter - 1
+
+ /*
+ * Item can also be the last "sibling" if we know we don't have a
+ * next item, OR if that next item's depth is less than this item's
+ * depth (meaning it's a sibling of the parent, not a child of this
+ * item).
+ */
+ const isImplicitlyLastSibling =
+ metadata.nextItemDepth === undefined ||
+ metadata.nextItemDepth < metadata.depth
+
+ /*
+ * Ok now we can set the last sibling state.
+ */
+ metadata.isLastSibling =
+ isLastSiblingByCounts || isImplicitlyLastSibling
+
+ /*
+ * Item is the last "child" in a branch if there is no next item,
+ * or if the next item's depth is less than this item's depth (a
+ * sibling of the parent) or equal to this item's depth (a sibling
+ * of this item)
+ */
+ metadata.isLastChild =
+ metadata.nextItemDepth === undefined ||
+ metadata.nextItemDepth <= metadata.depth
+
+ /*
+ * If this is the last sibling, it's implicitly part of the last
+ * branch of this sub-tree.
+ */
+ if (metadata.isLastSibling) {
+ metadata.isPartOfLastBranchFromDepth = metadata.depth
+
+ /**
+ * If the parent is part of the last branch of the sub-tree, so is the child.
+ */
+ if (metadata.parentMetadata.isPartOfLastBranchFromDepth) {
+ metadata.isPartOfLastBranchFromDepth =
+ metadata.parentMetadata.isPartOfLastBranchFromDepth
+ }
+ }
+
+ /*
+ * If this is the last sibling, and the parent has unhydrated replies,
+ * at some point down the line we will need to show a "read more".
+ */
+ if (
+ metadata.parentMetadata.repliesUnhydrated > 0 &&
+ metadata.isLastSibling
+ ) {
+ metadata.upcomingParentReadMore = metadata.parentMetadata
+ }
+
+ /*
+ * Copy in the parent's upcoming read more, if it exists. Once we
+ * reach the bottom, we'll insert a "read more"
+ */
+ if (metadata.parentMetadata.upcomingParentReadMore) {
+ metadata.upcomingParentReadMore =
+ metadata.parentMetadata.upcomingParentReadMore
+ }
+
+ /*
+ * Copy in the parent's skipped indents
+ */
+ metadata.skippedIndentIndices = new Set([
+ ...metadata.parentMetadata.skippedIndentIndices,
+ ])
+
+ /**
+ * If this is the last sibling, and the parent has no unhydrated
+ * replies, then we know we can skip an indent line.
+ */
+ if (
+ metadata.parentMetadata.repliesUnhydrated <= 0 &&
+ metadata.isLastSibling
+ ) {
+ /**
+ * Depth is 2 more than the 0-index of the indent calculation
+ * bc of how we render these. So instead of handling that in the
+ * component, we just adjust that back to 0-index here.
+ */
+ metadata.skippedIndentIndices.add(item.depth - 2)
+ }
+ }
+
+ /*
+ * If this post has unhydrated replies, and it is the last child, then
+ * it itself needs a "read more"
+ */
+ if (metadata.repliesUnhydrated > 0 && metadata.isLastChild) {
+ metadata.precedesChildReadMore = true
+ subset.splice(i + 1, 0, views.readMore(metadata))
+ i++ // skip next iteration
+ }
+
+ /*
+ * Tree-view only.
+ *
+ * If there's an upcoming parent read more, this branch is part of the
+ * last branch of the sub-tree, and the item itself is the last child,
+ * insert the parent "read more".
+ */
+ if (
+ view === 'tree' &&
+ metadata.upcomingParentReadMore &&
+ metadata.isPartOfLastBranchFromDepth ===
+ metadata.upcomingParentReadMore.depth &&
+ metadata.isLastChild
+ ) {
+ subset.splice(
+ i + 1,
+ 0,
+ views.readMore(metadata.upcomingParentReadMore),
+ )
+ i++
+ }
+
+ /**
+ * Only occurs for the first item in the thread, which may have
+ * additional parents not included in this request.
+ */
+ if (item.value.moreParents) {
+ metadata.followsReadMoreUp = true
+ subset.splice(i, 0, views.readMoreUp(metadata))
+ i++
+ }
+
+ /*
+ * Calculate the final UI state for the thread item.
+ */
+ item.ui = getThreadPostUI(metadata)
+ }
+ }
+ }
+ }
+
+ return {
+ threadItems,
+ otherThreadItems,
+ }
+}
+
+export function buildThread({
+ threadItems,
+ otherThreadItems,
+ serverOtherThreadItems,
+ isLoading,
+ hasSession,
+ otherItemsVisible,
+ hasOtherThreadItems,
+ showOtherItems,
+}: {
+ threadItems: ThreadItem[]
+ otherThreadItems: ThreadItem[]
+ serverOtherThreadItems: ThreadItem[]
+ isLoading: boolean
+ hasSession: boolean
+ otherItemsVisible: boolean
+ hasOtherThreadItems: boolean
+ showOtherItems: () => void
+}) {
+ /**
+ * `threadItems` is memoized here, so don't mutate it directly.
+ */
+ const items = [...threadItems]
+
+ if (isLoading) {
+ const anchorPost = items.at(0)
+ const hasAnchorFromCache = anchorPost && anchorPost.type === 'threadPost'
+ const skeletonReplies = hasAnchorFromCache
+ ? anchorPost.value.post.replyCount ?? 4
+ : 4
+
+ if (!items.length) {
+ items.push(
+ views.skeleton({
+ key: 'anchor-skeleton',
+ item: 'anchor',
+ }),
+ )
+ }
+
+ if (hasSession) {
+ // we might have this from cache
+ const replyDisabled =
+ hasAnchorFromCache &&
+ anchorPost.value.post.viewer?.replyDisabled === true
+
+ if (hasAnchorFromCache) {
+ if (!replyDisabled) {
+ items.push({
+ type: 'replyComposer',
+ key: 'replyComposer',
+ })
+ }
+ } else {
+ items.push(
+ views.skeleton({
+ key: 'replyComposer',
+ item: 'replyComposer',
+ }),
+ )
+ }
+ }
+
+ for (let i = 0; i < skeletonReplies; i++) {
+ items.push(
+ views.skeleton({
+ key: `anchor-skeleton-reply-${i}`,
+ item: 'reply',
+ }),
+ )
+ }
+ } else {
+ for (let i = 0; i < items.length; i++) {
+ const item = items[i]
+ if (
+ item.type === 'threadPost' &&
+ item.depth === 0 &&
+ !item.value.post.viewer?.replyDisabled &&
+ hasSession
+ ) {
+ items.splice(i + 1, 0, {
+ type: 'replyComposer',
+ key: 'replyComposer',
+ })
+ break
+ }
+ }
+
+ if (otherThreadItems.length || hasOtherThreadItems) {
+ if (otherItemsVisible) {
+ items.push(...otherThreadItems)
+ items.push(...serverOtherThreadItems)
+ } else {
+ items.push({
+ type: 'showOtherReplies',
+ key: 'showOtherReplies',
+ onPress: showOtherItems,
+ })
+ }
+ }
+ }
+
+ return items
+}
+
+/**
+ * Get the start and end index of a "branch" of the thread. A "branch" is a
+ * parent and it's children (not siblings). Returned indices are inclusive of
+ * the parent and its last child.
+ *
+ * items[] (index, depth)
+ * └─┬ anchor ──────── (0, 0)
+ * ├─── branch ───── (1, 1)
+ * ├──┬ branch ───── (2, 1) (start)
+ * │ ├──┬ leaf ──── (3, 2)
+ * │ │ └── leaf ── (4, 3)
+ * │ └─── leaf ──── (5, 2) (end)
+ * ├─── branch ───── (6, 1)
+ * └─── branch ───── (7, 1)
+ *
+ * const { start: 2, end: 5, length: 3 } = getBranch(items, 2, 1)
+ */
+export function getBranch(
+ thread: ApiThreadItem[],
+ branchStartIndex: number,
+ branchStartDepth: number,
+) {
+ let end = branchStartIndex
+
+ for (let ci = branchStartIndex + 1; ci < thread.length; ci++) {
+ const next = thread[ci]
+ if (next.depth > branchStartDepth) {
+ end = ci
+ } else {
+ end = ci - 1
+ break
+ }
+ }
+
+ return {
+ start: branchStartIndex,
+ end,
+ length: end - branchStartIndex,
+ }
+}
diff --git a/src/state/queries/usePostThread/types.ts b/src/state/queries/usePostThread/types.ts
new file mode 100644
index 0000000000..2f370b0ab7
--- /dev/null
+++ b/src/state/queries/usePostThread/types.ts
@@ -0,0 +1,227 @@
+import {
+ type AppBskyFeedDefs,
+ type AppBskyFeedPost,
+ type AppBskyFeedThreadgate,
+ type AppBskyUnspeccedDefs,
+ type AppBskyUnspeccedGetPostThreadOtherV2,
+ type AppBskyUnspeccedGetPostThreadV2,
+ type ModerationDecision,
+} from '@atproto/api'
+
+export type ApiThreadItem =
+ | AppBskyUnspeccedGetPostThreadV2.ThreadItem
+ | AppBskyUnspeccedGetPostThreadOtherV2.ThreadItem
+
+export const postThreadQueryKeyRoot = 'post-thread-v2' as const
+
+export const createPostThreadQueryKey = (props: PostThreadParams) =>
+ [postThreadQueryKeyRoot, props] as const
+
+export const createPostThreadOtherQueryKey = (
+ props: Omit & {
+ anchor?: string
+ },
+) => [postThreadQueryKeyRoot, 'other', props] as const
+
+export type PostThreadParams = Pick<
+ AppBskyUnspeccedGetPostThreadV2.QueryParams,
+ 'sort' | 'prioritizeFollowedUsers'
+> & {
+ anchor?: string
+ view: 'tree' | 'linear'
+}
+
+export type UsePostThreadQueryResult = {
+ hasOtherReplies: boolean
+ thread: AppBskyUnspeccedGetPostThreadV2.ThreadItem[]
+ threadgate?: Omit & {
+ record: AppBskyFeedThreadgate.Record
+ }
+}
+
+export type ThreadItem =
+ | {
+ type: 'threadPost'
+ key: string
+ uri: string
+ depth: number
+ value: Omit & {
+ post: Omit & {
+ record: AppBskyFeedPost.Record
+ }
+ }
+ isBlurred: boolean
+ moderation: ModerationDecision
+ ui: {
+ isAnchor: boolean
+ showParentReplyLine: boolean
+ showChildReplyLine: boolean
+ indent: number
+ isLastChild: boolean
+ skippedIndentIndices: Set
+ precedesChildReadMore: boolean
+ }
+ }
+ | {
+ type: 'threadPostNoUnauthenticated'
+ key: string
+ uri: string
+ depth: number
+ value: AppBskyUnspeccedDefs.ThreadItemNoUnauthenticated
+ ui: {
+ showParentReplyLine: boolean
+ showChildReplyLine: boolean
+ }
+ }
+ | {
+ type: 'threadPostNotFound'
+ key: string
+ uri: string
+ depth: number
+ value: AppBskyUnspeccedDefs.ThreadItemNotFound
+ }
+ | {
+ type: 'threadPostBlocked'
+ key: string
+ uri: string
+ depth: number
+ value: AppBskyUnspeccedDefs.ThreadItemBlocked
+ }
+ | {
+ type: 'replyComposer'
+ key: string
+ }
+ | {
+ type: 'showOtherReplies'
+ key: string
+ onPress: () => void
+ }
+ | {
+ /*
+ * Read more replies, downwards in the thread.
+ */
+ type: 'readMore'
+ key: string
+ depth: number
+ href: string
+ moreReplies: number
+ skippedIndentIndices: Set
+ }
+ | {
+ /*
+ * Read more parents, upwards in the thread.
+ */
+ type: 'readMoreUp'
+ key: string
+ href: string
+ }
+ | {
+ type: 'skeleton'
+ key: string
+ item: 'anchor' | 'reply' | 'replyComposer'
+ }
+
+/**
+ * Metadata collected while traversing the raw data from the thread response.
+ * Some values here can be computed immediately, while others need to be
+ * computed during a second pass over the thread after we know things like
+ * total number of replies, the reply index, etc.
+ *
+ * The idea here is that these values should be objectively true in all cases,
+ * such that we can use them later — either individually on in composite — to
+ * drive rendering behaviors.
+ */
+export type TraversalMetadata = {
+ /**
+ * The depth of the post in the reply tree, where 0 is the root post. This is
+ * calculated on the server.
+ */
+ depth: number
+ /**
+ * Indicates if this item is a "read more" link preceding this post that
+ * continues the thread upwards.
+ */
+ followsReadMoreUp: boolean
+ /**
+ * Indicates if the post is the last reply beneath its parent post.
+ */
+ isLastSibling: boolean
+ /**
+ * Indicates the post is the end-of-the-line for a given branch of replies.
+ */
+ isLastChild: boolean
+ /**
+ * Indicates if the post is the left/lower-most branch of the reply tree.
+ * Value corresponds to the depth at which this branch started.
+ */
+ isPartOfLastBranchFromDepth?: number
+ /**
+ * The depth of the slice immediately following this one, if it exists.
+ */
+ nextItemDepth?: number
+ /**
+ * This is a live reference to the parent metadata object. Mutations to this
+ * are available for later use in children.
+ */
+ parentMetadata?: TraversalMetadata
+ /**
+ * Populated during the final traversal of the thread. Denotes whether
+ * there is a "Read more" link for this item immediately following
+ * this item.
+ */
+ precedesChildReadMore: boolean
+ /**
+ * The depth of the slice immediately preceding this one, if it exists.
+ */
+ prevItemDepth?: number
+ /**
+ * Any data needed to be passed along to the "read more" items. Keep this
+ * trim for better memory usage.
+ */
+ postData: {
+ uri: string
+ authorHandle: string
+ }
+ /**
+ * The total number of replies to this post, including those not hydrated
+ * and returned by the response.
+ */
+ repliesCount: number
+ /**
+ * The number of replies to this post not hydrated and returned by the
+ * response.
+ */
+ repliesUnhydrated: number
+ /**
+ * The number of replies that have been seen so far in the traversal.
+ * Excludes replies that are moderated in some way, since those are not
+ * "seen" on first load. Use `repliesIndexCounter` for the total number of
+ * replies that were hydrated in the response.
+ *
+ * After traversal, we can use this to calculate if we actually got all the
+ * replies we expected, or if some were blocked, etc.
+ */
+ repliesSeenCounter: number
+ /**
+ * The total number of replies to this post hydrated in this response. Used
+ * for populating the `replyIndex` of the post by referencing this value on
+ * the parent.
+ */
+ repliesIndexCounter: number
+ /**
+ * The index-0-based index of this reply in the parent post's replies.
+ */
+ replyIndex: number
+ /**
+ * Each slice is responsible for rendering reply lines based on its depth.
+ * This value corresponds to any line indices that can be skipped e.g.
+ * because there are no further replies below this sub-tree to render.
+ */
+ skippedIndentIndices: Set
+ /**
+ * Indicates and stores parent data IF that parent has additional unhydrated
+ * replies. This value is passed down to children along the left/lower-most
+ * branch of the tree. When the end is reached, a "read more" is inserted.
+ */
+ upcomingParentReadMore?: TraversalMetadata
+}
diff --git a/src/state/queries/usePostThread/utils.ts b/src/state/queries/usePostThread/utils.ts
new file mode 100644
index 0000000000..b8ab340d87
--- /dev/null
+++ b/src/state/queries/usePostThread/utils.ts
@@ -0,0 +1,170 @@
+import {
+ type AppBskyFeedDefs,
+ AppBskyFeedPost,
+ AppBskyFeedThreadgate,
+ AppBskyUnspeccedDefs,
+ type AppBskyUnspeccedGetPostThreadV2,
+ AtUri,
+} from '@atproto/api'
+
+import {
+ type ApiThreadItem,
+ type ThreadItem,
+ type TraversalMetadata,
+} from '#/state/queries/usePostThread/types'
+import {isDevMode} from '#/storage/hooks/dev-mode'
+import * as bsky from '#/types/bsky'
+
+export function getThreadgateRecord(
+ view: AppBskyUnspeccedGetPostThreadV2.OutputSchema['threadgate'],
+) {
+ return bsky.dangerousIsType(
+ view?.record,
+ AppBskyFeedThreadgate.isRecord,
+ )
+ ? view?.record
+ : undefined
+}
+
+export function getRootPostAtUri(post: AppBskyFeedDefs.PostView) {
+ if (
+ bsky.dangerousIsType(
+ post.record,
+ AppBskyFeedPost.isRecord,
+ )
+ ) {
+ if (post.record.reply?.root?.uri) {
+ return new AtUri(post.record.reply.root.uri)
+ }
+ }
+}
+
+export function getPostRecord(post: AppBskyFeedDefs.PostView) {
+ return post.record as AppBskyFeedPost.Record
+}
+
+export function getTraversalMetadata({
+ item,
+ prevItem,
+ nextItem,
+ parentMetadata,
+}: {
+ item: ApiThreadItem
+ prevItem?: ApiThreadItem
+ nextItem?: ApiThreadItem
+ parentMetadata?: TraversalMetadata
+}): TraversalMetadata {
+ if (!AppBskyUnspeccedDefs.isThreadItemPost(item.value)) {
+ throw new Error(`Expected thread item to be a post`)
+ }
+ const repliesCount = item.value.post.replyCount || 0
+ const repliesUnhydrated = item.value.moreReplies || 0
+ const metadata = {
+ depth: item.depth,
+ /*
+ * Unknown until after traversal
+ */
+ isLastChild: false,
+ /*
+ * Unknown until after traversal
+ */
+ isLastSibling: false,
+ /*
+ * If it's a top level reply, bc we render each top-level branch as a
+ * separate tree, it's implicitly part of the last branch. For subsequent
+ * replies, we'll override this after traversal.
+ */
+ isPartOfLastBranchFromDepth: item.depth === 1 ? 1 : undefined,
+ nextItemDepth: nextItem?.depth,
+ parentMetadata,
+ prevItemDepth: prevItem?.depth,
+ /*
+ * Unknown until after traversal
+ */
+ precedesChildReadMore: false,
+ /*
+ * Unknown until after traversal
+ */
+ followsReadMoreUp: false,
+ postData: {
+ uri: item.uri,
+ authorHandle: item.value.post.author.handle,
+ },
+ repliesCount,
+ repliesUnhydrated,
+ repliesSeenCounter: 0,
+ repliesIndexCounter: 0,
+ replyIndex: 0,
+ skippedIndentIndices: new Set(),
+ }
+
+ if (isDevMode()) {
+ // @ts-ignore dev only for debugging
+ metadata.postData.text = getPostRecord(item.value.post).text
+ }
+
+ return metadata
+}
+
+export function storeTraversalMetadata(
+ metadatas: Map,
+ metadata: TraversalMetadata,
+) {
+ metadatas.set(metadata.postData.uri, metadata)
+
+ if (isDevMode()) {
+ // @ts-ignore dev only for debugging
+ metadatas.set(metadata.postData.text, metadata)
+ // @ts-ignore
+ window.__thread = metadatas
+ }
+}
+
+export function getThreadPostUI({
+ depth,
+ repliesCount,
+ prevItemDepth,
+ isLastChild,
+ skippedIndentIndices,
+ repliesSeenCounter,
+ repliesUnhydrated,
+ precedesChildReadMore,
+ followsReadMoreUp,
+}: TraversalMetadata): Extract['ui'] {
+ const isReplyAndHasReplies =
+ depth > 0 &&
+ repliesCount > 0 &&
+ (repliesCount - repliesUnhydrated === repliesSeenCounter ||
+ repliesSeenCounter > 0)
+ return {
+ isAnchor: depth === 0,
+ showParentReplyLine:
+ followsReadMoreUp ||
+ (!!prevItemDepth && prevItemDepth !== 0 && prevItemDepth < depth),
+ showChildReplyLine: depth < 0 || isReplyAndHasReplies,
+ indent: depth,
+ /*
+ * If there are no slices below this one, or the next slice has a depth <=
+ * than the depth of this post, it's the last child of the reply tree. It
+ * is not necessarily the last leaf in the parent branch, since it could
+ * have another sibling.
+ */
+ isLastChild,
+ skippedIndentIndices,
+ precedesChildReadMore: precedesChildReadMore ?? false,
+ }
+}
+
+export function getThreadPostNoUnauthenticatedUI({
+ depth,
+ prevItemDepth,
+}: {
+ depth: number
+ prevItemDepth?: number
+ nextItemDepth?: number
+}): Extract['ui'] {
+ return {
+ showChildReplyLine: depth < 0,
+ showParentReplyLine: Boolean(prevItemDepth && prevItemDepth < depth),
+ }
+}
diff --git a/src/state/queries/usePostThread/views.ts b/src/state/queries/usePostThread/views.ts
new file mode 100644
index 0000000000..71acfc77bc
--- /dev/null
+++ b/src/state/queries/usePostThread/views.ts
@@ -0,0 +1,183 @@
+import {
+ type $Typed,
+ type AppBskyFeedDefs,
+ type AppBskyFeedPost,
+ type AppBskyUnspeccedDefs,
+ type AppBskyUnspeccedGetPostThreadV2,
+ AtUri,
+ moderatePost,
+ type ModerationOpts,
+} from '@atproto/api'
+
+import {makeProfileLink} from '#/lib/routes/links'
+import {
+ type ApiThreadItem,
+ type ThreadItem,
+ type TraversalMetadata,
+} from '#/state/queries/usePostThread/types'
+
+export function threadPostNoUnauthenticated({
+ uri,
+ depth,
+ value,
+}: ApiThreadItem): Extract {
+ return {
+ type: 'threadPostNoUnauthenticated',
+ key: uri,
+ uri,
+ depth,
+ value: value as AppBskyUnspeccedDefs.ThreadItemNoUnauthenticated,
+ // @ts-ignore populated by the traversal
+ ui: {},
+ }
+}
+
+export function threadPostNotFound({
+ uri,
+ depth,
+ value,
+}: ApiThreadItem): Extract {
+ return {
+ type: 'threadPostNotFound',
+ key: uri,
+ uri,
+ depth,
+ value: value as AppBskyUnspeccedDefs.ThreadItemNotFound,
+ }
+}
+
+export function threadPostBlocked({
+ uri,
+ depth,
+ value,
+}: ApiThreadItem): Extract {
+ return {
+ type: 'threadPostBlocked',
+ key: uri,
+ uri,
+ depth,
+ value: value as AppBskyUnspeccedDefs.ThreadItemBlocked,
+ }
+}
+
+export function threadPost({
+ uri,
+ depth,
+ value,
+ moderationOpts,
+ threadgateHiddenReplies,
+}: {
+ uri: string
+ depth: number
+ value: $Typed
+ moderationOpts: ModerationOpts
+ threadgateHiddenReplies: Set
+}): Extract {
+ const moderation = moderatePost(value.post, moderationOpts)
+ const modui = moderation.ui('contentList')
+ const blurred = modui.blur || modui.filter
+ const muted = (modui.blurs[0] || modui.filters[0])?.type === 'muted'
+ const hiddenByThreadgate = threadgateHiddenReplies.has(uri)
+ const isBlurred = hiddenByThreadgate || blurred || muted
+ return {
+ type: 'threadPost',
+ key: uri,
+ uri,
+ depth,
+ value: {
+ ...value,
+ /*
+ * Do not spread anything here, load bearing for post shadow strict
+ * equality reference checks.
+ */
+ post: value.post as Omit & {
+ record: AppBskyFeedPost.Record
+ },
+ },
+ isBlurred,
+ moderation,
+ // @ts-ignore populated by the traversal
+ ui: {},
+ }
+}
+
+export function readMore({
+ depth,
+ repliesUnhydrated,
+ skippedIndentIndices,
+ postData,
+}: TraversalMetadata): Extract {
+ const urip = new AtUri(postData.uri)
+ const href = makeProfileLink(
+ {
+ did: urip.host,
+ handle: postData.authorHandle,
+ },
+ 'post',
+ urip.rkey,
+ )
+ return {
+ type: 'readMore' as const,
+ key: `readMore:${postData.uri}`,
+ href,
+ moreReplies: repliesUnhydrated,
+ depth,
+ skippedIndentIndices,
+ }
+}
+
+export function readMoreUp({
+ postData,
+}: TraversalMetadata): Extract {
+ const urip = new AtUri(postData.uri)
+ const href = makeProfileLink(
+ {
+ did: urip.host,
+ handle: postData.authorHandle,
+ },
+ 'post',
+ urip.rkey,
+ )
+ return {
+ type: 'readMoreUp' as const,
+ key: `readMoreUp:${postData.uri}`,
+ href,
+ }
+}
+
+export function skeleton({
+ key,
+ item,
+}: Omit, 'type'>): Extract<
+ ThreadItem,
+ {type: 'skeleton'}
+> {
+ return {
+ type: 'skeleton',
+ key,
+ item,
+ }
+}
+
+export function postViewToThreadPlaceholder(
+ post: AppBskyFeedDefs.PostView,
+): $Typed<
+ Omit & {
+ value: $Typed
+ }
+> {
+ return {
+ $type: 'app.bsky.unspecced.getPostThreadV2#threadItem',
+ uri: post.uri,
+ depth: 0, // reset to 0 for highlighted post
+ value: {
+ $type: 'app.bsky.unspecced.defs#threadItemPost',
+ post,
+ opThread: false,
+ moreParents: false,
+ moreReplies: 0,
+ hiddenByThreadgate: false,
+ mutedByViewer: false,
+ },
+ }
+}
diff --git a/src/state/session/types.ts b/src/state/session/types.ts
index 9aadf9d051..aa8b9a99e0 100644
--- a/src/state/session/types.ts
+++ b/src/state/session/types.ts
@@ -1,5 +1,5 @@
-import {LogEvents} from '#/lib/statsig/statsig'
-import {PersistedAccount} from '#/state/persisted'
+import {type LogEvents} from '#/lib/statsig/statsig'
+import {type PersistedAccount} from '#/state/persisted'
export type SessionAccount = PersistedAccount
diff --git a/src/state/shell/composer/index.tsx b/src/state/shell/composer/index.tsx
index ad07333beb..b317942480 100644
--- a/src/state/shell/composer/index.tsx
+++ b/src/state/shell/composer/index.tsx
@@ -2,6 +2,7 @@ import React from 'react'
import {
type AppBskyActorDefs,
type AppBskyFeedDefs,
+ type AppBskyUnspeccedGetPostThreadV2,
type ModerationDecision,
} from '@atproto/api'
import {msg} from '@lingui/macro'
@@ -24,9 +25,17 @@ export interface ComposerOptsPostRef {
moderation?: ModerationDecision
}
+export type OnPostSuccessData =
+ | {
+ replyToUri?: string
+ posts: AppBskyUnspeccedGetPostThreadV2.ThreadItem[]
+ }
+ | undefined
+
export interface ComposerOpts {
replyTo?: ComposerOptsPostRef
onPost?: (postUri: string | undefined) => void
+ onPostSuccess?: (data: OnPostSuccessData) => void
quote?: AppBskyFeedDefs.PostView
mention?: string // handle of user to mention
openEmojiPicker?: (pos: EmojiPickerPosition | undefined) => void
diff --git a/src/state/threadgate-hidden-replies.tsx b/src/state/threadgate-hidden-replies.tsx
index 60806f5706..8a3ee0f24a 100644
--- a/src/state/threadgate-hidden-replies.tsx
+++ b/src/state/threadgate-hidden-replies.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import {AppBskyFeedThreadgate} from '@atproto/api'
+import {type AppBskyFeedThreadgate} from '@atproto/api'
type StateContext = {
uris: Set
@@ -83,3 +83,17 @@ export function useMergedThreadgateHiddenReplies({
return set
}, [uris, recentlyUnhiddenUris, threadgateRecord])
}
+
+export function useMergeThreadgateHiddenReplies() {
+ const {uris, recentlyUnhiddenUris} = useThreadgateHiddenReplyUris()
+ return React.useCallback(
+ (threadgate?: AppBskyFeedThreadgate.Record) => {
+ const set = new Set([...(threadgate?.hiddenReplies || []), ...uris])
+ for (const uri of recentlyUnhiddenUris) {
+ set.delete(uri)
+ }
+ return set
+ },
+ [uris, recentlyUnhiddenUris],
+ )
+}
diff --git a/src/state/unstable-post-source.tsx b/src/state/unstable-post-source.tsx
index 1fb4af2872..450f2c120b 100644
--- a/src/state/unstable-post-source.tsx
+++ b/src/state/unstable-post-source.tsx
@@ -1,73 +1,102 @@
-import {createContext, useCallback, useContext, useState} from 'react'
-import {type AppBskyFeedDefs} from '@atproto/api'
+import {useEffect, useId, useState} from 'react'
+import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
-import {type FeedDescriptor} from './queries/post-feed'
+import {Logger} from '#/logger'
+import {type FeedDescriptor} from '#/state/queries/post-feed'
/**
- * For passing the source of the post (i.e. the original post, from the feed) to the threadview,
- * without using query params. Deliberately unstable to avoid using query params, use for FeedFeedback
- * and other ephemeral non-critical systems.
+ * Separate logger for better debugging
*/
+const logger = Logger.create(Logger.Context.PostSource)
-type Source = {
+export type PostSource = {
post: AppBskyFeedDefs.FeedViewPost
feed?: FeedDescriptor
}
-const SetUnstablePostSourceContext = createContext<
- (key: string, source: Source) => void
->(() => {})
-const ConsumeUnstablePostSourceContext = createContext<
- (uri: string) => Source | undefined
->(() => undefined)
+/**
+ * A cache of sources that will be consumed by the post thread view. This is
+ * cleaned up any time a source is consumed.
+ */
+const transientSources = new Map()
-export function Provider({children}: {children: React.ReactNode}) {
- const [sources, setSources] = useState>(() => new Map())
+/**
+ * A cache of sources that have been consumed by the post thread view. This is
+ * not cleaned up, but because we use a new ID for each post thread view that
+ * consumes a source, this is never reused unless a user navigates back to a
+ * post thread view that has not been dropped from memory.
+ */
+const consumedSources = new Map()
- const setUnstablePostSource = useCallback((key: string, source: Source) => {
- setSources(prev => {
- const newMap = new Map(prev)
- newMap.set(key, source)
- return newMap
- })
- }, [])
-
- const consumeUnstablePostSource = useCallback(
- (uri: string) => {
- const source = sources.get(uri)
- if (source) {
- setSources(prev => {
- const newMap = new Map(prev)
- newMap.delete(uri)
- return newMap
- })
- }
- return source
- },
- [sources],
+/**
+ * For stashing the feed that the user was browsing when they clicked on a post.
+ *
+ * Used for FeedFeedback and other ephemeral non-critical systems.
+ */
+export function setUnstablePostSource(key: string, source: PostSource) {
+ assertValidDevOnly(
+ key,
+ `setUnstablePostSource key should be a URI containing a handle, received ${key} — use buildPostSourceKey`,
)
-
- return (
-
-
- {children}
-
-
- )
-}
-
-export function useSetUnstablePostSource() {
- return useContext(SetUnstablePostSourceContext)
+ logger.debug('set', {key, source})
+ transientSources.set(key, source)
}
/**
- * DANGER - This hook is unstable and should only be used for FeedFeedback
- * and other ephemeral non-critical systems. Does not change when the URI changes.
+ * This hook is unstable and should only be used for FeedFeedback and other
+ * ephemeral non-critical systems. Views that use this hook will continue to
+ * return a reference to the same source until those views are dropped from
+ * memory.
*/
-export function useUnstablePostSource(uri: string) {
- const consume = useContext(ConsumeUnstablePostSourceContext)
+export function useUnstablePostSource(key: string) {
+ const id = useId()
+ const [source] = useState(() => {
+ assertValidDevOnly(
+ key,
+ `consumeUnstablePostSource key should be a URI containing a handle, received ${key} — be sure to use buildPostSourceKey when setting the source`,
+ true,
+ )
+ const source = consumedSources.get(id) || transientSources.get(key)
+ if (source) {
+ logger.debug('consume', {id, key, source})
+ transientSources.delete(key)
+ consumedSources.set(id, source)
+ }
+ return source
+ })
+
+ useEffect(() => {
+ return () => {
+ consumedSources.delete(id)
+ logger.debug('cleanup', {id})
+ }
+ }, [id])
- const [source] = useState(() => consume(uri))
return source
}
+
+/**
+ * Builds a post source key. This (atm) is a URI where the `host` is the post
+ * author's handle, not DID.
+ */
+export function buildPostSourceKey(key: string, handle: string) {
+ const urip = new AtUri(key)
+ urip.host = handle
+ return urip.toString()
+}
+
+/**
+ * Just a lil dev helper
+ */
+function assertValidDevOnly(key: string, message: string, beChill = false) {
+ if (__DEV__) {
+ const urip = new AtUri(key)
+ if (urip.host.startsWith('did:')) {
+ if (beChill) {
+ logger.warn(message)
+ } else {
+ throw new Error(message)
+ }
+ }
+ }
+}
diff --git a/src/storage/hooks/dev-mode.ts b/src/storage/hooks/dev-mode.ts
index 49eca3bb11..331825c48f 100644
--- a/src/storage/hooks/dev-mode.ts
+++ b/src/storage/hooks/dev-mode.ts
@@ -5,3 +5,17 @@ export function useDevMode() {
return [devMode, setDevMode] as const
}
+
+let cachedIsDevMode: boolean | undefined
+/**
+ * Does not update when toggling dev mode on or off. This util simply retrieves
+ * the value and caches in memory indefinitely. So after an update, you'll need
+ * to reload the app so it can pull a fresh value from storage.
+ */
+export function isDevMode() {
+ if (__DEV__) return true
+ if (cachedIsDevMode === undefined) {
+ cachedIsDevMode = device.get(['devMode']) ?? false
+ }
+ return cachedIsDevMode
+}
diff --git a/src/types/utils.ts b/src/types/utils.ts
new file mode 100644
index 0000000000..f64922a1f1
--- /dev/null
+++ b/src/types/utils.ts
@@ -0,0 +1,5 @@
+export type Literal = T extends A
+ ? string extends T
+ ? never
+ : T
+ : never
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 42f057803f..de060c6c22 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -45,6 +45,7 @@ import {type ImagePickerAsset} from 'expo-image-picker'
import {
AppBskyFeedDefs,
type AppBskyFeedGetPostThread,
+ AppBskyUnspeccedDefs,
type BskyAgent,
type RichText,
} from '@atproto/api'
@@ -55,6 +56,7 @@ import {useQueryClient} from '@tanstack/react-query'
import * as apilib from '#/lib/api/index'
import {EmbeddingDisabledError} from '#/lib/api/resolve'
+import {retry} from '#/lib/async/retry'
import {until} from '#/lib/async/until'
import {
MAX_GRAPHEME_LENGTH,
@@ -62,6 +64,7 @@ import {
type SupportedMimeTypes,
} from '#/lib/constants'
import {useAnimatedScrollHandler} from '#/lib/hooks/useAnimatedScrollHandler_FIXED'
+import {useAppState} from '#/lib/hooks/useAppState'
import {useIsKeyboardVisible} from '#/lib/hooks/useIsKeyboardVisible'
import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
import {usePalette} from '#/lib/hooks/usePalette'
@@ -69,7 +72,7 @@ import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
import {mimeToExt} from '#/lib/media/video/util'
import {logEvent} from '#/lib/statsig/statsig'
import {cleanError} from '#/lib/strings/errors'
-import {colors, s} from '#/lib/styles'
+import {colors} from '#/lib/styles'
import {logger} from '#/logger'
import {isAndroid, isIOS, isNative, isWeb} from '#/platform/detection'
import {useDialogStateControlContext} from '#/state/dialogs'
@@ -87,13 +90,14 @@ import {useProfileQuery} from '#/state/queries/profile'
import {type Gif} from '#/state/queries/tenor'
import {useAgent, useSession} from '#/state/session'
import {useComposerControls} from '#/state/shell/composer'
-import {type ComposerOpts} from '#/state/shell/composer'
+import {type ComposerOpts, type OnPostSuccessData} from '#/state/shell/composer'
import {CharProgress} from '#/view/com/composer/char-progress/CharProgress'
import {ComposerReplyTo} from '#/view/com/composer/ComposerReplyTo'
import {
ExternalEmbedGif,
ExternalEmbedLink,
} from '#/view/com/composer/ExternalEmbed'
+import {ExternalEmbedRemoveBtn} from '#/view/com/composer/ExternalEmbedRemoveBtn'
import {GifAltTextDialog} from '#/view/com/composer/GifAltText'
import {LabelsBtn} from '#/view/com/composer/labels/LabelsBtn'
import {Gallery} from '#/view/com/composer/photos/Gallery'
@@ -113,7 +117,6 @@ import {SelectVideoBtn} from '#/view/com/composer/videos/SelectVideoBtn'
import {SubtitleDialogBtn} from '#/view/com/composer/videos/SubtitleDialog'
import {VideoPreview} from '#/view/com/composer/videos/VideoPreview'
import {VideoTranscodeProgress} from '#/view/com/composer/videos/VideoTranscodeProgress'
-import {LazyQuoteEmbed, QuoteX} from '#/view/com/util/post-embeds/QuoteEmbed'
import {Text} from '#/view/com/util/text/Text'
import * as Toast from '#/view/com/util/Toast'
import {UserAvatar} from '#/view/com/util/UserAvatar'
@@ -122,6 +125,7 @@ import {Button, ButtonIcon, ButtonText} from '#/components/Button'
import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo'
import {EmojiArc_Stroke2_Corner0_Rounded as EmojiSmile} from '#/components/icons/Emoji'
import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
+import {LazyQuoteEmbed} from '#/components/Post/Embed/LazyQuoteEmbed'
import * as Prompt from '#/components/Prompt'
import {Text as NewText} from '#/components/Typography'
import {BottomSheetPortalProvider} from '../../../../modules/bottom-sheet'
@@ -152,6 +156,7 @@ type Props = ComposerOpts
export const ComposePost = ({
replyTo,
onPost,
+ onPostSuccess,
quote: initQuote,
mention: initMention,
openEmojiPicker,
@@ -388,8 +393,10 @@ export const ComposePost = ({
setError('')
setIsPublishing(true)
- let postUri
+ let postUri: string | undefined
+ let postSuccessData: OnPostSuccessData
try {
+ logger.info(`composer: posting...`)
postUri = (
await apilib.post(agent, queryClient, {
thread,
@@ -398,16 +405,48 @@ export const ComposePost = ({
langs: toPostLanguages(langPrefs.postLanguage),
})
).uris[0]
+
+ /*
+ * Wait for app view to have received the post(s). If this fails, it's
+ * ok, because the post _was_ actually published above.
+ */
try {
- await whenAppViewReady(agent, postUri, res => {
- const postedThread = res?.data?.thread
- return AppBskyFeedDefs.isThreadViewPost(postedThread)
- })
+ if (postUri) {
+ logger.info(`composer: waiting for app view`)
+
+ const posts = await retry(
+ 5,
+ _e => true,
+ async () => {
+ const res = await agent.app.bsky.unspecced.getPostThreadV2({
+ anchor: postUri!,
+ above: false,
+ below: thread.posts.length - 1,
+ branchingFactor: 1,
+ })
+ if (res.data.thread.length !== thread.posts.length) {
+ throw new Error(`composer: app view is not ready`)
+ }
+ if (
+ !res.data.thread.every(p =>
+ AppBskyUnspeccedDefs.isThreadItemPost(p.value),
+ )
+ ) {
+ throw new Error(`composer: app view returned non-post items`)
+ }
+ return res.data.thread
+ },
+ 1e3,
+ )
+ postSuccessData = {
+ replyToUri: replyTo?.uri,
+ posts,
+ }
+ }
} catch (waitErr: any) {
- logger.error(waitErr, {
- message: `Waiting for app view failed`,
+ logger.info(`composer: waiting for app view failed`, {
+ safeMessage: waitErr,
})
- // Keep going because the post *was* published.
}
} catch (e: any) {
logger.error(e, {
@@ -465,12 +504,14 @@ export const ComposePost = ({
quotedThread.post.quoteCount !== initQuote.quoteCount
) {
onPost?.(postUri)
+ onPostSuccess?.(postSuccessData)
return true
}
return false
})
} else {
onPost?.(postUri)
+ onPostSuccess?.(postSuccessData)
}
onClose()
Toast.show(
@@ -489,6 +530,7 @@ export const ComposePost = ({
langPrefs.postLanguage,
onClose,
onPost,
+ onPostSuccess,
initQuote,
replyTo,
setLangPrefs,
@@ -782,6 +824,8 @@ let ComposerPost = React.memo(function ComposerPost({
[post.id, onSelectVideo, onImageAdd, _],
)
+ useHideKeyboardOnBackground()
+
return (
{embed.quote?.uri ? (
-
-
+
+
{canRemoveQuote && (
- dispatch({type: 'embed_remove_quote'})} />
+ dispatch({type: 'embed_remove_quote'})}
+ style={{top: 16}}
+ />
)}
@@ -1482,6 +1530,18 @@ function isEmptyPost(post: PostDraft) {
)
}
+function useHideKeyboardOnBackground() {
+ const appState = useAppState()
+
+ useEffect(() => {
+ if (isIOS) {
+ if (appState === 'inactive') {
+ Keyboard.dismiss()
+ }
+ }
+ }, [appState])
+}
+
const styles = StyleSheet.create({
topbarInner: {
flexDirection: 'row',
diff --git a/src/view/com/composer/ComposerReplyTo.tsx b/src/view/com/composer/ComposerReplyTo.tsx
index 0ced143597..acab84f659 100644
--- a/src/view/com/composer/ComposerReplyTo.tsx
+++ b/src/view/com/composer/ComposerReplyTo.tsx
@@ -13,12 +13,13 @@ import {useLingui} from '@lingui/react'
import {sanitizeDisplayName} from '#/lib/strings/display-names'
import {sanitizeHandle} from '#/lib/strings/handles'
import {type ComposerOptsPostRef} from '#/state/shell/composer'
-import {MaybeQuoteEmbed} from '#/view/com/util/post-embeds/QuoteEmbed'
import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
import {atoms as a, useTheme, web} from '#/alf'
+import {QuoteEmbed} from '#/components/Post/Embed'
import {Text} from '#/components/Typography'
import {useSimpleVerificationState} from '#/components/verification'
import {VerificationCheck} from '#/components/verification/VerificationCheck'
+import {parseEmbed} from '#/types/bsky/post'
export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
const t = useTheme()
@@ -51,6 +52,12 @@ export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
}
return null
}, [embed])
+ const parsedQuoteEmbed = quoteEmbed
+ ? parseEmbed({
+ $type: 'app.bsky.embed.record#view',
+ ...quoteEmbed,
+ })
+ : null
const images = useMemo(() => {
if (AppBskyEmbedImages.isView(embed)) {
@@ -124,7 +131,9 @@ export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
)}
- {showFull && quoteEmbed && }
+ {showFull && parsedQuoteEmbed && parsedQuoteEmbed.type === 'post' && (
+
+ )}
)
diff --git a/src/view/com/composer/ExternalEmbed.tsx b/src/view/com/composer/ExternalEmbed.tsx
index d819b28b72..e4bdabac32 100644
--- a/src/view/com/composer/ExternalEmbed.tsx
+++ b/src/view/com/composer/ExternalEmbed.tsx
@@ -1,19 +1,20 @@
import React from 'react'
-import {StyleProp, View, ViewStyle} from 'react-native'
+import {type StyleProp, View, type ViewStyle} from 'react-native'
import {cleanError} from '#/lib/strings/errors'
import {
useResolveGifQuery,
useResolveLinkQuery,
} from '#/state/queries/resolve-link'
-import {Gif} from '#/state/queries/tenor'
+import {type Gif} from '#/state/queries/tenor'
import {ExternalEmbedRemoveBtn} from '#/view/com/composer/ExternalEmbedRemoveBtn'
-import {ExternalLinkEmbed} from '#/view/com/util/post-embeds/ExternalLinkEmbed'
import {atoms as a, useTheme} from '#/alf'
import {Loader} from '#/components/Loader'
+import {ExternalEmbed} from '#/components/Post/Embed/ExternalEmbed'
+import {ModeratedFeedEmbed} from '#/components/Post/Embed/FeedEmbed'
+import {ModeratedListEmbed} from '#/components/Post/Embed/ListEmbed'
import {Embed as StarterPackEmbed} from '#/components/StarterPack/StarterPackCard'
import {Text} from '#/components/Typography'
-import {MaybeFeedCard, MaybeListCard} from '../util/post-embeds'
export const ExternalEmbedGif = ({
onRemove,
@@ -44,7 +45,7 @@ export const ExternalEmbedGif = ({
{linkInfo ? (
-
+
) : error ? (
@@ -80,7 +81,7 @@ export const ExternalEmbedLink = ({
if (data) {
if (data.type === 'external') {
return (
-
)
} else if (data.kind === 'feed') {
- return
+ return (
+
+ )
} else if (data.kind === 'list') {
- return
+ return (
+
+ )
} else if (data.kind === 'starter-pack') {
return
}
diff --git a/src/view/com/composer/ExternalEmbedRemoveBtn.tsx b/src/view/com/composer/ExternalEmbedRemoveBtn.tsx
index 92102f8478..1e363d0184 100644
--- a/src/view/com/composer/ExternalEmbedRemoveBtn.tsx
+++ b/src/view/com/composer/ExternalEmbedRemoveBtn.tsx
@@ -2,22 +2,27 @@ import {View} from 'react-native'
import {msg} from '@lingui/macro'
import {useLingui} from '@lingui/react'
-import {atoms as a} from '#/alf'
+import {atoms as a, useTheme, type ViewStyleProp} from '#/alf'
import {Button, ButtonIcon} from '#/components/Button'
import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
-export function ExternalEmbedRemoveBtn({onRemove}: {onRemove: () => void}) {
+export function ExternalEmbedRemoveBtn({
+ onRemove,
+ style,
+}: {onRemove: () => void} & ViewStyleProp) {
+ const t = useTheme()
const {_} = useLingui()
return (
-
+
diff --git a/src/view/com/composer/GifAltText.tsx b/src/view/com/composer/GifAltText.tsx
index 4d2539c4e3..ceee17eaa0 100644
--- a/src/view/com/composer/GifAltText.tsx
+++ b/src/view/com/composer/GifAltText.tsx
@@ -6,23 +6,23 @@ import {useLingui} from '@lingui/react'
import {HITSLOP_10, MAX_ALT_TEXT} from '#/lib/constants'
import {parseAltFromGIFDescription} from '#/lib/gif-alt-text'
import {
- EmbedPlayerParams,
+ type EmbedPlayerParams,
parseEmbedPlayerFromUrl,
} from '#/lib/strings/embed-player'
import {isAndroid} from '#/platform/detection'
import {useResolveGifQuery} from '#/state/queries/resolve-link'
-import {Gif} from '#/state/queries/tenor'
+import {type Gif} from '#/state/queries/tenor'
import {AltTextCounterWrapper} from '#/view/com/composer/AltTextCounterWrapper'
import {atoms as a, useTheme} from '#/alf'
import {Button, ButtonText} from '#/components/Button'
import * as Dialog from '#/components/Dialog'
-import {DialogControlProps} from '#/components/Dialog'
+import {type DialogControlProps} from '#/components/Dialog'
import * as TextField from '#/components/forms/TextField'
import {Check_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo'
import {PlusSmall_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
+import {GifEmbed} from '#/components/Post/Embed/ExternalEmbed/Gif'
import {Text} from '#/components/Typography'
-import {GifEmbed} from '../util/post-embeds/GifEmbed'
import {AltTextReminder} from './photos/Gallery'
export function GifAltTextDialog({
diff --git a/src/view/com/composer/labels/LabelsBtn.tsx b/src/view/com/composer/labels/LabelsBtn.tsx
index 9548ed0655..902d89b7bb 100644
--- a/src/view/com/composer/labels/LabelsBtn.tsx
+++ b/src/view/com/composer/labels/LabelsBtn.tsx
@@ -4,10 +4,10 @@ import {useLingui} from '@lingui/react'
import {
ADULT_CONTENT_LABELS,
- AdultSelfLabel,
+ type AdultSelfLabel,
OTHER_SELF_LABELS,
- OtherSelfLabel,
- SelfLabel,
+ type OtherSelfLabel,
+ type SelfLabel,
} from '#/lib/moderation'
import {isWeb} from '#/platform/detection'
import {atoms as a, native, useTheme, web} from '#/alf'
diff --git a/src/view/com/composer/photos/ImageAltTextDialog.tsx b/src/view/com/composer/photos/ImageAltTextDialog.tsx
index c0ce32af31..724149937c 100644
--- a/src/view/com/composer/photos/ImageAltTextDialog.tsx
+++ b/src/view/com/composer/photos/ImageAltTextDialog.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import {ImageStyle, useWindowDimensions, View} from 'react-native'
+import {type ImageStyle, useWindowDimensions, View} from 'react-native'
import {Image} from 'expo-image'
import {msg, Plural, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
@@ -7,12 +7,12 @@ import {useLingui} from '@lingui/react'
import {MAX_ALT_TEXT} from '#/lib/constants'
import {enforceLen} from '#/lib/strings/helpers'
import {isAndroid, isWeb} from '#/platform/detection'
-import {ComposerImage} from '#/state/gallery'
+import {type ComposerImage} from '#/state/gallery'
import {AltTextCounterWrapper} from '#/view/com/composer/AltTextCounterWrapper'
import {atoms as a, useTheme} from '#/alf'
import {Button, ButtonText} from '#/components/Button'
import * as Dialog from '#/components/Dialog'
-import {DialogControlProps} from '#/components/Dialog'
+import {type DialogControlProps} from '#/components/Dialog'
import * as TextField from '#/components/forms/TextField'
import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo'
import {Text} from '#/components/Typography'
diff --git a/src/view/com/composer/photos/OpenCameraBtn.tsx b/src/view/com/composer/photos/OpenCameraBtn.tsx
index 1c9440eb16..8bd1aa27b0 100644
--- a/src/view/com/composer/photos/OpenCameraBtn.tsx
+++ b/src/view/com/composer/photos/OpenCameraBtn.tsx
@@ -8,7 +8,7 @@ import {useCameraPermission} from '#/lib/hooks/usePermissions'
import {openCamera} from '#/lib/media/picker'
import {logger} from '#/logger'
import {isMobileWeb, isNative} from '#/platform/detection'
-import {ComposerImage, createComposerImage} from '#/state/gallery'
+import {type ComposerImage, createComposerImage} from '#/state/gallery'
import {atoms as a, useTheme} from '#/alf'
import {Button} from '#/components/Button'
import {Camera_Stroke2_Corner0_Rounded as Camera} from '#/components/icons/Camera'
diff --git a/src/view/com/composer/text-input/TextInput.tsx b/src/view/com/composer/text-input/TextInput.tsx
index 6f5e812ed2..f927015af9 100644
--- a/src/view/com/composer/text-input/TextInput.tsx
+++ b/src/view/com/composer/text-input/TextInput.tsx
@@ -1,5 +1,5 @@
import React, {
- ComponentProps,
+ type ComponentProps,
forwardRef,
useCallback,
useMemo,
@@ -7,16 +7,16 @@ import React, {
useState,
} from 'react'
import {
- NativeSyntheticEvent,
+ type NativeSyntheticEvent,
Text as RNText,
- TextInput as RNTextInput,
- TextInputSelectionChangeEventData,
+ type TextInput as RNTextInput,
+ type TextInputSelectionChangeEventData,
View,
} from 'react-native'
import {AppBskyRichtextFacet, RichText} from '@atproto/api'
import PasteInput, {
- PastedFile,
- PasteInputRef,
+ type PastedFile,
+ type PasteInputRef, // @ts-expect-error no types when installing from github
} from '@mattermost/react-native-paste-input'
import {POST_IMG_MAX} from '#/lib/constants'
@@ -27,7 +27,7 @@ import {getMentionAt, insertMentionAt} from '#/lib/strings/mention-manip'
import {useTheme} from '#/lib/ThemeContext'
import {isAndroid, isNative} from '#/platform/detection'
import {
- LinkFacetMatch,
+ type LinkFacetMatch,
suggestLinkCardUri,
} from '#/view/com/composer/text-input/text-input-util'
import {atoms as a, useAlf} from '#/alf'
diff --git a/src/view/com/home/HomeHeaderLayoutMobile.tsx b/src/view/com/home/HomeHeaderLayoutMobile.tsx
index e48c2cc893..7a40604f43 100644
--- a/src/view/com/home/HomeHeaderLayoutMobile.tsx
+++ b/src/view/com/home/HomeHeaderLayoutMobile.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
import {View} from 'react-native'
import Animated from 'react-native-reanimated'
import {msg} from '@lingui/macro'
@@ -56,13 +55,8 @@ export function HomeHeaderLayoutMobile({
{
- emitSoftReset()
- }}
- onPressIn={() => {
- playHaptic('Heavy')
- }}
- onPressOut={() => {
playHaptic('Light')
+ emitSoftReset()
}}>
@@ -72,7 +66,7 @@ export function HomeHeaderLayoutMobile({
{hasSession && (
diff --git a/src/view/com/modals/EditProfile.tsx b/src/view/com/modals/EditProfile.tsx
deleted file mode 100644
index cb1552fe57..0000000000
--- a/src/view/com/modals/EditProfile.tsx
+++ /dev/null
@@ -1,335 +0,0 @@
-import {useCallback, useState} from 'react'
-import {
- ActivityIndicator,
- KeyboardAvoidingView,
- ScrollView,
- StyleSheet,
- TextInput,
- TouchableOpacity,
- View,
-} from 'react-native'
-import Animated, {FadeOut} from 'react-native-reanimated'
-import {LinearGradient} from 'expo-linear-gradient'
-import {type AppBskyActorDefs} from '@atproto/api'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {MAX_DESCRIPTION, MAX_DISPLAY_NAME, urls} from '#/lib/constants'
-import {usePalette} from '#/lib/hooks/usePalette'
-import {compressIfNeeded} from '#/lib/media/manip'
-import {type PickerImage} from '#/lib/media/picker.shared'
-import {cleanError} from '#/lib/strings/errors'
-import {enforceLen} from '#/lib/strings/helpers'
-import {colors, gradients, s} from '#/lib/styles'
-import {useTheme} from '#/lib/ThemeContext'
-import {logger} from '#/logger'
-import {isWeb} from '#/platform/detection'
-import {useModalControls} from '#/state/modals'
-import {useProfileUpdateMutation} from '#/state/queries/profile'
-import {Text} from '#/view/com/util/text/Text'
-import * as Toast from '#/view/com/util/Toast'
-import {EditableUserAvatar} from '#/view/com/util/UserAvatar'
-import {UserBanner} from '#/view/com/util/UserBanner'
-import {Admonition} from '#/components/Admonition'
-import {InlineLinkText} from '#/components/Link'
-import {useSimpleVerificationState} from '#/components/verification'
-import {ErrorMessage} from '../util/error/ErrorMessage'
-
-const AnimatedTouchableOpacity =
- Animated.createAnimatedComponent(TouchableOpacity)
-
-export const snapPoints = ['fullscreen']
-
-export function Component({
- profile,
- onUpdate,
-}: {
- profile: AppBskyActorDefs.ProfileViewDetailed
- onUpdate?: () => void
-}) {
- const pal = usePalette('default')
- const theme = useTheme()
- const {_} = useLingui()
- const {closeModal} = useModalControls()
- const updateMutation = useProfileUpdateMutation()
- const [imageError, setImageError] = useState('')
- const initialDisplayName = profile.displayName || ''
- const [displayName, setDisplayName] = useState(
- profile.displayName || '',
- )
- const [description, setDescription] = useState(
- profile.description || '',
- )
- const [userBanner, setUserBanner] = useState(
- profile.banner,
- )
- const [userAvatar, setUserAvatar] = useState(
- profile.avatar,
- )
- const [newUserBanner, setNewUserBanner] = useState<
- PickerImage | undefined | null
- >()
- const [newUserAvatar, setNewUserAvatar] = useState<
- PickerImage | undefined | null
- >()
- const onPressCancel = () => {
- closeModal()
- }
- const onSelectNewAvatar = useCallback(
- async (img: PickerImage | null) => {
- setImageError('')
- if (img === null) {
- setNewUserAvatar(null)
- setUserAvatar(null)
- return
- }
- try {
- const finalImg = await compressIfNeeded(img, 1000000)
- setNewUserAvatar(finalImg)
- setUserAvatar(finalImg.path)
- } catch (e: any) {
- setImageError(cleanError(e))
- }
- },
- [setNewUserAvatar, setUserAvatar, setImageError],
- )
-
- const onSelectNewBanner = useCallback(
- async (img: PickerImage | null) => {
- setImageError('')
- if (!img) {
- setNewUserBanner(null)
- setUserBanner(null)
- return
- }
- try {
- const finalImg = await compressIfNeeded(img, 1000000)
- setNewUserBanner(finalImg)
- setUserBanner(finalImg.path)
- } catch (e: any) {
- setImageError(cleanError(e))
- }
- },
- [setNewUserBanner, setUserBanner, setImageError],
- )
-
- const onPressSave = useCallback(async () => {
- setImageError('')
- try {
- await updateMutation.mutateAsync({
- profile,
- updates: {
- displayName,
- description,
- },
- newUserAvatar,
- newUserBanner,
- })
- Toast.show(_(msg({message: 'Profile updated', context: 'toast'})))
- onUpdate?.()
- closeModal()
- } catch (e: any) {
- logger.error('Failed to update user profile', {message: String(e)})
- }
- }, [
- updateMutation,
- profile,
- onUpdate,
- closeModal,
- displayName,
- description,
- newUserAvatar,
- newUserBanner,
- setImageError,
- _,
- ])
- const verification = useSimpleVerificationState({
- profile,
- })
-
- return (
-
-
-
- Edit my profile
-
-
-
-
-
-
-
- {updateMutation.isError && (
-
-
-
- )}
- {imageError !== '' && (
-
-
-
- )}
-
-
-
- Display Name
-
-
- setDisplayName(enforceLen(v, MAX_DISPLAY_NAME))
- }
- accessible={true}
- accessibilityLabel={_(msg`Display name`)}
- accessibilityHint={_(msg`Edit your display name`)}
- />
-
- {verification.isVerified &&
- verification.role === 'default' &&
- displayName !== initialDisplayName && (
-
-
-
- You are verified. You will lose your verification status
- if you change your display name.{' '}
-
- Learn more.
-
-
-
-
- )}
-
-
-
- Description
-
- setDescription(enforceLen(v, MAX_DESCRIPTION))}
- accessible={true}
- accessibilityLabel={_(msg`Description`)}
- accessibilityHint={_(msg`Edit your profile description`)}
- />
-
- {updateMutation.isPending ? (
-
-
-
- ) : (
-
-
-
- Save Changes
-
-
-
- )}
- {!updateMutation.isPending && (
-
-
-
- Cancel
-
-
-
- )}
-
-
-
- )
-}
-
-const styles = StyleSheet.create({
- title: {
- textAlign: 'center',
- fontWeight: '600',
- fontSize: 24,
- marginBottom: 18,
- },
- label: {
- fontWeight: '600',
- paddingHorizontal: 4,
- paddingBottom: 4,
- marginTop: 20,
- },
- form: {
- paddingHorizontal: 14,
- },
- textInput: {
- borderWidth: 1,
- borderRadius: 6,
- paddingHorizontal: 14,
- paddingVertical: 10,
- fontSize: 16,
- },
- textArea: {
- borderWidth: 1,
- borderRadius: 6,
- paddingHorizontal: 12,
- paddingTop: 10,
- fontSize: 16,
- height: 120,
- textAlignVertical: 'top',
- },
- btn: {
- flexDirection: 'row',
- alignItems: 'center',
- justifyContent: 'center',
- width: '100%',
- borderRadius: 32,
- padding: 10,
- marginBottom: 10,
- },
- avi: {
- position: 'absolute',
- top: 80,
- left: 24,
- width: 84,
- height: 84,
- borderWidth: 2,
- borderRadius: 42,
- },
- photos: {
- marginBottom: 36,
- marginHorizontal: -14,
- },
- errorContainer: {marginTop: 20},
-})
diff --git a/src/view/com/modals/LinkWarning.tsx b/src/view/com/modals/LinkWarning.tsx
deleted file mode 100644
index b0bf76ede1..0000000000
--- a/src/view/com/modals/LinkWarning.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import React from 'react'
-import {SafeAreaView, StyleSheet, View} from 'react-native'
-import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useOpenLink} from '#/lib/hooks/useOpenLink'
-import {usePalette} from '#/lib/hooks/usePalette'
-import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
-import {shareUrl} from '#/lib/sharing'
-import {isPossiblyAUrl, splitApexDomain} from '#/lib/strings/url-helpers'
-import {colors, s} from '#/lib/styles'
-import {isWeb} from '#/platform/detection'
-import {useModalControls} from '#/state/modals'
-import {Button} from '#/view/com/util/forms/Button'
-import {Text} from '#/view/com/util/text/Text'
-import {ScrollView} from './util'
-
-export const snapPoints = ['50%']
-
-export function Component({
- text,
- href,
- share,
-}: {
- text: string
- href: string
- share?: boolean
-}) {
- const pal = usePalette('default')
- const {closeModal} = useModalControls()
- const {isMobile} = useWebMediaQueries()
- const {_} = useLingui()
- const potentiallyMisleading = isPossiblyAUrl(text)
- const openLink = useOpenLink()
-
- const onPressVisit = () => {
- closeModal()
- if (share) {
- shareUrl(href)
- } else {
- openLink(href, false, true)
- }
- }
-
- return (
-
-
-
- {potentiallyMisleading ? (
- <>
-
-
- Potentially Misleading Link
-
-
- ) : (
-
- Leaving Bluesky
-
- )}
-
-
-
-
- This link is taking you to the following website:
-
-
-
-
- {potentiallyMisleading && (
-
- Make sure this is where you intend to go!
-
- )}
-
-
-
-
-
-
-
- )
-}
-
-function LinkBox({href}: {href: string}) {
- const pal = usePalette('default')
- const [scheme, hostname, rest] = React.useMemo(() => {
- try {
- const urlp = new URL(href)
- const [subdomain, apexdomain] = splitApexDomain(urlp.hostname)
- return [
- urlp.protocol + '//' + subdomain,
- apexdomain,
- urlp.pathname + urlp.search + urlp.hash,
- ]
- } catch {
- return ['', href, '']
- }
- }, [href])
- return (
-
-
- {scheme}
-
- {hostname}
-
- {rest}
-
-
- )
-}
-
-const styles = StyleSheet.create({
- container: {
- flex: 1,
- paddingBottom: isWeb ? 0 : 40,
- },
- titleSection: {
- flexDirection: 'row',
- justifyContent: 'center',
- alignItems: 'center',
- gap: 6,
- paddingTop: isWeb ? 0 : 4,
- paddingBottom: isWeb ? 14 : 10,
- },
- title: {
- textAlign: 'center',
- fontWeight: '600',
- },
- linkBox: {
- paddingHorizontal: 12,
- paddingVertical: 10,
- borderRadius: 6,
- borderWidth: 1,
- },
- btn: {
- flexDirection: 'row',
- alignItems: 'center',
- justifyContent: 'center',
- borderRadius: 32,
- padding: 14,
- backgroundColor: colors.blue3,
- },
- btnContainer: {
- paddingTop: 20,
- gap: 6,
- },
-})
diff --git a/src/view/com/modals/Modal.tsx b/src/view/com/modals/Modal.tsx
index 1ec4052d09..f9afd183e6 100644
--- a/src/view/com/modals/Modal.tsx
+++ b/src/view/com/modals/Modal.tsx
@@ -13,7 +13,6 @@ import * as DeleteAccountModal from './DeleteAccount'
import * as InviteCodesModal from './InviteCodes'
import * as ContentLanguagesSettingsModal from './lang-settings/ContentLanguagesSettings'
import * as PostLanguagesSettingsModal from './lang-settings/PostLanguagesSettings'
-import * as LinkWarningModal from './LinkWarning'
import * as UserAddRemoveListsModal from './UserAddRemoveLists'
const DEFAULT_SNAPPOINTS = ['90%']
@@ -68,9 +67,6 @@ export function ModalsContainer() {
} else if (activeModal?.name === 'change-password') {
snapPoints = ChangePasswordModal.snapPoints
element =
- } else if (activeModal?.name === 'link-warning') {
- snapPoints = LinkWarningModal.snapPoints
- element =
} else {
return null
}
diff --git a/src/view/com/modals/Modal.web.tsx b/src/view/com/modals/Modal.web.tsx
index 3374c31327..3eb7443802 100644
--- a/src/view/com/modals/Modal.web.tsx
+++ b/src/view/com/modals/Modal.web.tsx
@@ -12,7 +12,6 @@ import * as DeleteAccountModal from './DeleteAccount'
import * as InviteCodesModal from './InviteCodes'
import * as ContentLanguagesSettingsModal from './lang-settings/ContentLanguagesSettings'
import * as PostLanguagesSettingsModal from './lang-settings/PostLanguagesSettings'
-import * as LinkWarningModal from './LinkWarning'
import * as UserAddRemoveLists from './UserAddRemoveLists'
export function ModalsContainer() {
@@ -65,8 +64,6 @@ function Modal({modal}: {modal: ModalIface}) {
element =
} else if (modal.name === 'change-password') {
element =
- } else if (modal.name === 'link-warning') {
- element =
} else {
return null
}
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index 0a460e77b6..85f67919ac 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -30,6 +30,7 @@ import {useLingui} from '@lingui/react'
import {useNavigation} from '@react-navigation/native'
import {useQueryClient} from '@tanstack/react-query'
+import {MAX_POST_LINES} from '#/lib/constants'
import {useAnimatedValue} from '#/lib/hooks/useAnimatedValue'
import {usePalette} from '#/lib/hooks/usePalette'
import {makeProfileLink} from '#/lib/routes/links'
@@ -918,7 +919,8 @@ function AdditionalPostText({post}: {post?: AppBskyFeedDefs.PostView}) {
{text?.length > 0 && (
+ style={[a.text_sm, a.leading_snug, t.atoms.text_contrast_medium]}
+ numberOfLines={MAX_POST_LINES}>
{text}
)}
diff --git a/src/view/com/pager/Pager.tsx b/src/view/com/pager/Pager.tsx
index f62bffc534..8cc3469032 100644
--- a/src/view/com/pager/Pager.tsx
+++ b/src/view/com/pager/Pager.tsx
@@ -1,16 +1,22 @@
-import React, {forwardRef, useCallback, useContext} from 'react'
+import {
+ useCallback,
+ useContext,
+ useImperativeHandle,
+ useRef,
+ useState,
+} from 'react'
import {View} from 'react-native'
import {DrawerGestureContext} from 'react-native-drawer-layout'
import {Gesture, GestureDetector} from 'react-native-gesture-handler'
import PagerView, {
- PagerViewOnPageScrollEventData,
- PagerViewOnPageSelectedEvent,
- PagerViewOnPageSelectedEventData,
- PageScrollStateChangedNativeEventData,
+ type PagerViewOnPageScrollEventData,
+ type PagerViewOnPageSelectedEvent,
+ type PagerViewOnPageSelectedEventData,
+ type PageScrollStateChangedNativeEventData,
} from 'react-native-pager-view'
import Animated, {
runOnJS,
- SharedValue,
+ type SharedValue,
useEvent,
useHandler,
useSharedValue,
@@ -36,8 +42,12 @@ export interface RenderTabBarFnProps {
export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element
interface Props {
+ ref?: React.Ref
initialPage?: number
renderTabBar: RenderTabBarFn
+ // tab pressed, yet to scroll to page
+ onTabPressed?: (index: number) => void
+ // scroll settled
onPageSelected?: (index: number) => void
onPageScrollStateChanged?: (
scrollState: 'idle' | 'dragging' | 'settling',
@@ -47,114 +57,112 @@ interface Props {
const AnimatedPagerView = Animated.createAnimatedComponent(PagerView)
-export const Pager = forwardRef>(
- function PagerImpl(
+export function Pager({
+ ref,
+ children,
+ initialPage = 0,
+ renderTabBar,
+ onPageSelected: parentOnPageSelected,
+ onTabPressed: parentOnTabPressed,
+ onPageScrollStateChanged: parentOnPageScrollStateChanged,
+ testID,
+}: React.PropsWithChildren) {
+ const [selectedPage, setSelectedPage] = useState(initialPage)
+ const pagerView = useRef(null)
+
+ const [isIdle, setIsIdle] = useState(true)
+ const setDrawerSwipeDisabled = useSetDrawerSwipeDisabled()
+ useFocusEffect(
+ useCallback(() => {
+ const canSwipeDrawer = selectedPage === 0 && isIdle
+ setDrawerSwipeDisabled(!canSwipeDrawer)
+ return () => {
+ setDrawerSwipeDisabled(false)
+ }
+ }, [setDrawerSwipeDisabled, selectedPage, isIdle]),
+ )
+
+ useImperativeHandle(ref, () => ({
+ setPage: (index: number) => {
+ pagerView.current?.setPage(index)
+ },
+ }))
+
+ const onPageSelectedJSThread = useCallback(
+ (nextPosition: number) => {
+ setSelectedPage(nextPosition)
+ parentOnPageSelected?.(nextPosition)
+ },
+ [setSelectedPage, parentOnPageSelected],
+ )
+
+ const onTabBarSelect = useCallback(
+ (index: number) => {
+ parentOnTabPressed?.(index)
+ pagerView.current?.setPage(index)
+ },
+ [pagerView, parentOnTabPressed],
+ )
+
+ const dragState = useSharedValue<'idle' | 'settling' | 'dragging'>('idle')
+ const dragProgress = useSharedValue(selectedPage)
+ const didInit = useSharedValue(false)
+ const handlePageScroll = usePagerHandlers(
{
- children,
- initialPage = 0,
- renderTabBar,
- onPageScrollStateChanged: parentOnPageScrollStateChanged,
- onPageSelected: parentOnPageSelected,
- testID,
- }: React.PropsWithChildren,
- ref,
- ) {
- const [selectedPage, setSelectedPage] = React.useState(initialPage)
- const pagerView = React.useRef(null)
-
- const [isIdle, setIsIdle] = React.useState(true)
- const setDrawerSwipeDisabled = useSetDrawerSwipeDisabled()
- useFocusEffect(
- useCallback(() => {
- const canSwipeDrawer = selectedPage === 0 && isIdle
- setDrawerSwipeDisabled(!canSwipeDrawer)
- return () => {
- setDrawerSwipeDisabled(false)
+ onPageScroll(e: PagerViewOnPageScrollEventData) {
+ 'worklet'
+ if (didInit.get() === false) {
+ // On iOS, there's a spurious scroll event with 0 position
+ // even if a different page was supplied as the initial page.
+ // Ignore it and wait for the first confirmed selection instead.
+ return
}
- }, [setDrawerSwipeDisabled, selectedPage, isIdle]),
- )
-
- React.useImperativeHandle(ref, () => ({
- setPage: (index: number) => {
- pagerView.current?.setPage(index)
+ dragProgress.set(e.offset + e.position)
},
- }))
-
- const onPageSelectedJSThread = React.useCallback(
- (nextPosition: number) => {
- setSelectedPage(nextPosition)
- parentOnPageSelected?.(nextPosition)
+ onPageScrollStateChanged(e: PageScrollStateChangedNativeEventData) {
+ 'worklet'
+ runOnJS(setIsIdle)(e.pageScrollState === 'idle')
+ if (dragState.get() === 'idle' && e.pageScrollState === 'settling') {
+ // This is a programmatic scroll on Android.
+ // Stay "idle" to match iOS and avoid confusing downstream code.
+ return
+ }
+ dragState.set(e.pageScrollState)
+ parentOnPageScrollStateChanged?.(e.pageScrollState)
},
- [setSelectedPage, parentOnPageSelected],
- )
-
- const onTabBarSelect = React.useCallback(
- (index: number) => {
- pagerView.current?.setPage(index)
+ onPageSelected(e: PagerViewOnPageSelectedEventData) {
+ 'worklet'
+ didInit.set(true)
+ runOnJS(onPageSelectedJSThread)(e.position)
},
- [pagerView],
- )
+ },
+ [parentOnPageScrollStateChanged],
+ )
- const dragState = useSharedValue<'idle' | 'settling' | 'dragging'>('idle')
- const dragProgress = useSharedValue(selectedPage)
- const didInit = useSharedValue(false)
- const handlePageScroll = usePagerHandlers(
- {
- onPageScroll(e: PagerViewOnPageScrollEventData) {
- 'worklet'
- if (didInit.get() === false) {
- // On iOS, there's a spurious scroll event with 0 position
- // even if a different page was supplied as the initial page.
- // Ignore it and wait for the first confirmed selection instead.
- return
- }
- dragProgress.set(e.offset + e.position)
- },
- onPageScrollStateChanged(e: PageScrollStateChangedNativeEventData) {
- 'worklet'
- runOnJS(setIsIdle)(e.pageScrollState === 'idle')
- if (dragState.get() === 'idle' && e.pageScrollState === 'settling') {
- // This is a programmatic scroll on Android.
- // Stay "idle" to match iOS and avoid confusing downstream code.
- return
- }
- dragState.set(e.pageScrollState)
- parentOnPageScrollStateChanged?.(e.pageScrollState)
- },
- onPageSelected(e: PagerViewOnPageSelectedEventData) {
- 'worklet'
- didInit.set(true)
- runOnJS(onPageSelectedJSThread)(e.position)
- },
- },
- [parentOnPageScrollStateChanged],
- )
+ const drawerGesture = useContext(DrawerGestureContext) ?? Gesture.Native() // noop for web
+ const nativeGesture =
+ Gesture.Native().requireExternalGestureToFail(drawerGesture)
- const drawerGesture = useContext(DrawerGestureContext) ?? Gesture.Native() // noop for web
- const nativeGesture =
- Gesture.Native().requireExternalGestureToFail(drawerGesture)
-
- return (
-
- {renderTabBar({
- selectedPage,
- onSelect: onTabBarSelect,
- dragProgress,
- dragState,
- })}
-
-
- {children}
-
-
-
- )
- },
-)
+ return (
+
+ {renderTabBar({
+ selectedPage,
+ onSelect: onTabBarSelect,
+ dragProgress,
+ dragState,
+ })}
+
+
+ {children}
+
+
+
+ )
+}
function usePagerHandlers(
handlers: {
diff --git a/src/view/com/pager/Pager.web.tsx b/src/view/com/pager/Pager.web.tsx
index c620e73e33..06aac169c8 100644
--- a/src/view/com/pager/Pager.web.tsx
+++ b/src/view/com/pager/Pager.web.tsx
@@ -1,8 +1,19 @@
-import React from 'react'
+import {
+ Children,
+ useCallback,
+ useImperativeHandle,
+ useRef,
+ useState,
+} from 'react'
import {View} from 'react-native'
import {flushSync} from 'react-dom'
import {s} from '#/lib/styles'
+import {atoms as a} from '#/alf'
+
+export interface PagerRef {
+ setPage: (index: number) => void
+}
export interface RenderTabBarFnProps {
selectedPage: number
@@ -12,30 +23,30 @@ export interface RenderTabBarFnProps {
export type RenderTabBarFn = (props: RenderTabBarFnProps) => JSX.Element
interface Props {
+ ref?: React.Ref
initialPage?: number
renderTabBar: RenderTabBarFn
onPageSelected?: (index: number) => void
}
-export const Pager = React.forwardRef(function PagerImpl(
- {
- children,
- initialPage = 0,
- renderTabBar,
- onPageSelected,
- }: React.PropsWithChildren,
- ref,
-) {
- const [selectedPage, setSelectedPage] = React.useState(initialPage)
- const scrollYs = React.useRef>([])
- const anchorRef = React.useRef(null)
- React.useImperativeHandle(ref, () => ({
+export function Pager({
+ ref,
+ children,
+ initialPage = 0,
+ renderTabBar,
+ onPageSelected,
+}: React.PropsWithChildren) {
+ const [selectedPage, setSelectedPage] = useState(initialPage)
+ const scrollYs = useRef>([])
+ const anchorRef = useRef(null)
+
+ useImperativeHandle(ref, () => ({
setPage: (index: number) => {
onTabBarSelect(index)
},
}))
- const onTabBarSelect = React.useCallback(
+ const onTabBarSelect = useCallback(
(index: number) => {
const scrollY = window.scrollY
// We want to determine if the tabbar is already "sticking" at the top (in which
@@ -75,11 +86,13 @@ export const Pager = React.forwardRef(function PagerImpl(
tabBarAnchor: ,
onSelect: e => onTabBarSelect(e),
})}
- {React.Children.map(children, (child, i) => (
-
+ {Children.map(children, (child, i) => (
+
{child}
))}
)
-})
+}
diff --git a/src/view/com/pager/PagerWithHeader.tsx b/src/view/com/pager/PagerWithHeader.tsx
index 1746d2ca13..57aaac0740 100644
--- a/src/view/com/pager/PagerWithHeader.tsx
+++ b/src/view/com/pager/PagerWithHeader.tsx
@@ -1,17 +1,16 @@
-import * as React from 'react'
+import {memo, useCallback, useEffect, useRef, useState} from 'react'
import {
- LayoutChangeEvent,
- NativeScrollEvent,
- ScrollView,
+ type LayoutChangeEvent,
+ type NativeScrollEvent,
+ type ScrollView,
StyleSheet,
View,
} from 'react-native'
import Animated, {
- AnimatedRef,
- runOnJS,
+ type AnimatedRef,
runOnUI,
scrollTo,
- SharedValue,
+ type SharedValue,
useAnimatedRef,
useAnimatedStyle,
useSharedValue,
@@ -20,9 +19,13 @@ import Animated, {
import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
import {ScrollProvider} from '#/lib/ScrollContext'
import {isIOS} from '#/platform/detection'
-import {Pager, PagerRef, RenderTabBarFnProps} from '#/view/com/pager/Pager'
+import {
+ Pager,
+ type PagerRef,
+ type RenderTabBarFnProps,
+} from '#/view/com/pager/Pager'
import {useTheme} from '#/alf'
-import {ListMethods} from '../util/List'
+import {type ListMethods} from '../util/List'
import {PagerHeaderProvider} from './PagerHeaderContext'
import {TabBar} from './TabBar'
@@ -33,6 +36,7 @@ export interface PagerWithHeaderChildParams {
}
export interface PagerWithHeaderProps {
+ ref?: React.Ref
testID?: string
children:
| (((props: PagerWithHeaderChildParams) => JSX.Element) | null)[]
@@ -49,97 +53,94 @@ export interface PagerWithHeaderProps {
onCurrentPageSelected?: (index: number) => void
allowHeaderOverScroll?: boolean
}
-export const PagerWithHeader = React.forwardRef(
- function PageWithHeaderImpl(
- {
- children,
- testID,
+export function PagerWithHeader({
+ ref,
+ children,
+ testID,
+ items,
+ isHeaderReady,
+ renderHeader,
+ initialPage,
+ onPageSelected,
+ onCurrentPageSelected,
+ allowHeaderOverScroll,
+}: PagerWithHeaderProps) {
+ const [currentPage, setCurrentPage] = useState(0)
+ const [tabBarHeight, setTabBarHeight] = useState(0)
+ const [headerOnlyHeight, setHeaderOnlyHeight] = useState(0)
+ const scrollY = useSharedValue(0)
+ const headerHeight = headerOnlyHeight + tabBarHeight
+
+ // capture the header bar sizing
+ const onTabBarLayout = useNonReactiveCallback((evt: LayoutChangeEvent) => {
+ const height = evt.nativeEvent.layout.height
+ if (height > 0) {
+ // The rounding is necessary to prevent jumps on iOS
+ setTabBarHeight(Math.round(height * 2) / 2)
+ }
+ })
+ const onHeaderOnlyLayout = useNonReactiveCallback((height: number) => {
+ if (height > 0) {
+ // The rounding is necessary to prevent jumps on iOS
+ setHeaderOnlyHeight(Math.round(height * 2) / 2)
+ }
+ })
+
+ const renderTabBar = useCallback(
+ (props: RenderTabBarFnProps) => {
+ return (
+
+
+
+ )
+ },
+ [
+ headerOnlyHeight,
items,
isHeaderReady,
renderHeader,
- initialPage,
- onPageSelected,
+ currentPage,
onCurrentPageSelected,
+ onTabBarLayout,
+ onHeaderOnlyLayout,
+ scrollY,
+ testID,
allowHeaderOverScroll,
- }: PagerWithHeaderProps,
- ref,
- ) {
- const [currentPage, setCurrentPage] = React.useState(0)
- const [tabBarHeight, setTabBarHeight] = React.useState(0)
- const [headerOnlyHeight, setHeaderOnlyHeight] = React.useState(0)
- const scrollY = useSharedValue(0)
- const headerHeight = headerOnlyHeight + tabBarHeight
+ ],
+ )
- // capture the header bar sizing
- const onTabBarLayout = useNonReactiveCallback((evt: LayoutChangeEvent) => {
- const height = evt.nativeEvent.layout.height
- if (height > 0) {
- // The rounding is necessary to prevent jumps on iOS
- setTabBarHeight(Math.round(height * 2) / 2)
- }
- })
- const onHeaderOnlyLayout = useNonReactiveCallback((height: number) => {
- if (height > 0) {
- // The rounding is necessary to prevent jumps on iOS
- setHeaderOnlyHeight(Math.round(height * 2) / 2)
- }
- })
+ const scrollRefs = useSharedValue | null>>([])
+ const registerRef = useCallback(
+ (scrollRef: AnimatedRef | null, atIndex: number) => {
+ scrollRefs.modify(refs => {
+ 'worklet'
+ refs[atIndex] = scrollRef
+ return refs
+ })
+ },
+ [scrollRefs],
+ )
- const renderTabBar = React.useCallback(
- (props: RenderTabBarFnProps) => {
- return (
-
-
-
- )
- },
- [
- headerOnlyHeight,
- items,
- isHeaderReady,
- renderHeader,
- currentPage,
- onCurrentPageSelected,
- onTabBarLayout,
- onHeaderOnlyLayout,
- scrollY,
- testID,
- allowHeaderOverScroll,
- ],
- )
-
- const scrollRefs = useSharedValue | null>>([])
- const registerRef = React.useCallback(
- (scrollRef: AnimatedRef | null, atIndex: number) => {
- scrollRefs.modify(refs => {
- 'worklet'
- refs[atIndex] = scrollRef
- return refs
- })
- },
- [scrollRefs],
- )
-
- const lastForcedScrollY = useSharedValue(0)
- const adjustScrollForOtherPages = () => {
+ const lastForcedScrollY = useSharedValue(0)
+ const adjustScrollForOtherPages = useCallback(
+ (scrollState: 'idle' | 'dragging' | 'settling') => {
'worklet'
+ if (scrollState !== 'dragging') return
const currentScrollY = scrollY.get()
const forcedScrollY = Math.min(currentScrollY, headerOnlyHeight)
if (lastForcedScrollY.get() !== forcedScrollY) {
@@ -152,75 +153,69 @@ export const PagerWithHeader = React.forwardRef(
}
}
}
- }
+ },
+ [currentPage, headerOnlyHeight, lastForcedScrollY, scrollRefs, scrollY],
+ )
- const throttleTimeout = React.useRef | null>(
- null,
- )
- const queueThrottledOnScroll = useNonReactiveCallback(() => {
- if (!throttleTimeout.current) {
- throttleTimeout.current = setTimeout(() => {
- throttleTimeout.current = null
- runOnUI(adjustScrollForOtherPages)()
- }, 80 /* Sync often enough you're unlikely to catch it unsynced */)
+ const onScrollWorklet = useCallback(
+ (e: NativeScrollEvent) => {
+ 'worklet'
+ const nextScrollY = e.contentOffset.y
+ // HACK: onScroll is reporting some strange values on load (negative header height).
+ // Highly improbable that you'd be overscrolled by over 400px -
+ // in fact, I actually can't do it, so let's just ignore those. -sfn
+ const isPossiblyInvalid =
+ headerHeight > 0 && Math.round(nextScrollY * 2) / 2 === -headerHeight
+ if (!isPossiblyInvalid) {
+ scrollY.set(nextScrollY)
}
- })
+ },
+ [scrollY, headerHeight],
+ )
- const onScrollWorklet = React.useCallback(
- (e: NativeScrollEvent) => {
- 'worklet'
- const nextScrollY = e.contentOffset.y
- // HACK: onScroll is reporting some strange values on load (negative header height).
- // Highly improbable that you'd be overscrolled by over 400px -
- // in fact, I actually can't do it, so let's just ignore those. -sfn
- const isPossiblyInvalid =
- headerHeight > 0 && Math.round(nextScrollY * 2) / 2 === -headerHeight
- if (!isPossiblyInvalid) {
- scrollY.set(nextScrollY)
- runOnJS(queueThrottledOnScroll)()
- }
- },
- [scrollY, queueThrottledOnScroll, headerHeight],
- )
+ const onPageSelectedInner = useCallback(
+ (index: number) => {
+ setCurrentPage(index)
+ onPageSelected?.(index)
+ },
+ [onPageSelected, setCurrentPage],
+ )
- const onPageSelectedInner = React.useCallback(
- (index: number) => {
- setCurrentPage(index)
- onPageSelected?.(index)
- },
- [onPageSelected, setCurrentPage],
- )
+ const onTabPressed = useCallback(() => {
+ runOnUI(adjustScrollForOtherPages)('dragging')
+ }, [adjustScrollForOtherPages])
- return (
-
- {toArray(children)
- .filter(Boolean)
- .map((child, i) => {
- const isReady =
- isHeaderReady && headerOnlyHeight > 0 && tabBarHeight > 0
- return (
-
-
-
- )
- })}
-
- )
- },
-)
+ return (
+
+ {toArray(children)
+ .filter(Boolean)
+ .map((child, i) => {
+ const isReady =
+ isHeaderReady && headerOnlyHeight > 0 && tabBarHeight > 0
+ return (
+
+
+
+ )
+ })}
+
+ )
+}
let PagerTabBar = ({
currentPage,
@@ -258,7 +253,7 @@ let PagerTabBar = ({
dragState: SharedValue<'idle' | 'dragging' | 'settling'>
}): React.ReactNode => {
const t = useTheme()
- const [minimumHeaderHeight, setMinimumHeaderHeight] = React.useState(0)
+ const [minimumHeaderHeight, setMinimumHeaderHeight] = useState(0)
const headerTransform = useAnimatedStyle(() => {
const translateY =
Math.min(
@@ -275,7 +270,7 @@ let PagerTabBar = ({
],
}
})
- const headerRef = React.useRef(null)
+ const headerRef = useRef(null)
return (
)
}
-PagerTabBar = React.memo(PagerTabBar)
+PagerTabBar = memo(PagerTabBar)
function PagerItem({
headerHeight,
@@ -348,7 +343,7 @@ function PagerItem({
}) {
const scrollElRef = useAnimatedRef()
- React.useEffect(() => {
+ useEffect(() => {
registerRef(scrollElRef, index)
return () => {
registerRef(null, index)
diff --git a/src/view/com/post-thread/PostThread.tsx b/src/view/com/post-thread/PostThread.tsx
index d974ce6b53..94cc04f542 100644
--- a/src/view/com/post-thread/PostThread.tsx
+++ b/src/view/com/post-thread/PostThread.tsx
@@ -1,8 +1,7 @@
import React, {memo, useRef, useState} from 'react'
-import {StyleSheet, useWindowDimensions, View} from 'react-native'
-import {runOnJS} from 'react-native-reanimated'
+import {useWindowDimensions, View} from 'react-native'
+import {runOnJS, useAnimatedStyle} from 'react-native-reanimated'
import Animated from 'react-native-reanimated'
-import {useSafeAreaInsets} from 'react-native-safe-area-context'
import {
AppBskyFeedDefs,
type AppBskyFeedThreadgate,
@@ -13,15 +12,14 @@ import {useLingui} from '@lingui/react'
import {HITSLOP_10} from '#/lib/constants'
import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
-import {useMinimalShellFabTransform} from '#/lib/hooks/useMinimalShellTransform'
import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
import {useSetTitle} from '#/lib/hooks/useSetTitle'
import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
-import {clamp} from '#/lib/numbers'
import {ScrollProvider} from '#/lib/ScrollContext'
import {sanitizeDisplayName} from '#/lib/strings/display-names'
import {cleanError} from '#/lib/strings/errors'
import {isAndroid, isNative, isWeb} from '#/platform/detection'
+import {useFeedFeedback} from '#/state/feed-feedback'
import {useModerationOpts} from '#/state/preferences/moderation-opts'
import {
fillThreadModerationCache,
@@ -36,7 +34,9 @@ import {
import {useSetThreadViewPreferencesMutation} from '#/state/queries/preferences'
import {usePreferencesQuery} from '#/state/queries/preferences'
import {useSession} from '#/state/session'
+import {useShellLayout} from '#/state/shell/shell-layout'
import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
+import {useUnstablePostSource} from '#/state/unstable-post-source'
import {List, type ListMethods} from '#/view/com/util/List'
import {atoms as a, useTheme} from '#/alf'
import {Button, ButtonIcon} from '#/components/Button'
@@ -93,7 +93,7 @@ const keyExtractor = (item: RowItem) => {
return item._reactKey
}
-export function PostThread({uri}: {uri: string | undefined}) {
+export function PostThread({uri}: {uri: string}) {
const {hasSession, currentAccount} = useSession()
const {_} = useLingui()
const t = useTheme()
@@ -104,6 +104,8 @@ export function PostThread({uri}: {uri: string | undefined}) {
HiddenRepliesState.Hide,
)
const headerRef = React.useRef(null)
+ const anchorPostSource = useUnstablePostSource(uri)
+ const feedFeedback = useFeedFeedback(anchorPostSource?.feed, hasSession)
const {data: preferences} = usePreferencesQuery()
const {
@@ -297,11 +299,14 @@ export function PostThread({uri}: {uri: string | undefined}) {
// maintainVisibleContentPosition and onContentSizeChange
// to "hold onto" the correct row instead of the first one.
+ /*
+ * This is basically `!!parents.length`, see notes on `isParentLoading`
+ */
if (!highlightedPost.ctx.isParentLoading && !deferParents) {
// When progressively revealing parents, rendering a placeholder
// here will cause scrolling jumps. Don't add it unless you test it.
// QT'ing this thread is a great way to test all the scrolling hacks:
- // https://bsky.app/profile/www.mozzius.dev/post/3kjqhblh6qk2o
+ // https://bsky.app/profile/samuel.bsky.team/post/3kjqhblh6qk2o
// Everything is loaded
let startIndex = Math.max(0, parents.length - maxParents)
@@ -395,10 +400,18 @@ export function PostThread({uri}: {uri: string | undefined}) {
)
const {openComposer} = useOpenComposer()
- const onPressReply = React.useCallback(() => {
+ const onReplyToAnchor = React.useCallback(() => {
if (thread?.type !== 'post') {
return
}
+ if (anchorPostSource) {
+ feedFeedback.sendInteraction({
+ item: thread.post.uri,
+ event: 'app.bsky.feed.defs#interactionReply',
+ feedContext: anchorPostSource.post.feedContext,
+ reqId: anchorPostSource.post.reqId,
+ })
+ }
openComposer({
replyTo: {
uri: thread.post.uri,
@@ -410,7 +423,14 @@ export function PostThread({uri}: {uri: string | undefined}) {
},
onPost: onPostReply,
})
- }, [openComposer, thread, onPostReply, threadModerationCache])
+ }, [
+ openComposer,
+ thread,
+ onPostReply,
+ threadModerationCache,
+ anchorPostSource,
+ feedFeedback,
+ ])
const canReply = !error && rootPost && !rootPost.viewer?.replyDisabled
const hasParents =
@@ -423,7 +443,7 @@ export function PostThread({uri}: {uri: string | undefined}) {
return (
{!isMobile && (
-
+
)}
)
@@ -511,6 +531,7 @@ export function PostThread({uri}: {uri: string | undefined}) {
}
onPostReply={onPostReply}
hideTopBorder={index === 0 && !item.ctx.isParentLoading}
+ anchorPostSource={anchorPostSource}
/>
)
@@ -561,6 +582,9 @@ export function PostThread({uri}: {uri: string | undefined}) {
onEndReached={onEndReached}
onEndReachedThreshold={2}
onScrollToTop={onScrollToTop}
+ /**
+ * @see https://reactnative.dev/docs/scrollview#maintainvisiblecontentposition
+ */
maintainVisibleContentPosition={
isNative && hasParents
? MAINTAIN_VISIBLE_CONTENT_POSITION
@@ -586,7 +610,7 @@ export function PostThread({uri}: {uri: string | undefined}) {
/>
{isMobile && canReply && hasSession && (
-
+
)}
)
@@ -709,17 +733,16 @@ let ThreadMenu = ({
ThreadMenu = memo(ThreadMenu)
function MobileComposePrompt({onPressReply}: {onPressReply: () => unknown}) {
- const safeAreaInsets = useSafeAreaInsets()
- const fabMinimalShellTransform = useMinimalShellFabTransform()
+ const {footerHeight} = useShellLayout()
+
+ const animatedStyle = useAnimatedStyle(() => {
+ return {
+ bottom: footerHeight.get(),
+ }
+ })
+
return (
-
+
)
@@ -884,12 +907,3 @@ function hasBranchingReplies(node?: ThreadNode) {
}
return true
}
-
-const styles = StyleSheet.create({
- prompt: {
- // @ts-ignore web-only
- position: isWeb ? 'fixed' : 'absolute',
- left: 0,
- right: 0,
- },
-})
diff --git a/src/view/com/post-thread/PostThreadComposePrompt.tsx b/src/view/com/post-thread/PostThreadComposePrompt.tsx
index 40acff3765..dc05617258 100644
--- a/src/view/com/post-thread/PostThreadComposePrompt.tsx
+++ b/src/view/com/post-thread/PostThreadComposePrompt.tsx
@@ -1,20 +1,25 @@
-import {View} from 'react-native'
+import {type StyleProp, View, type ViewStyle} from 'react-native'
+import {LinearGradient} from 'expo-linear-gradient'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {PressableScale} from '#/lib/custom-animations/PressableScale'
import {useHaptics} from '#/lib/haptics'
+import {useHideBottomBarBorderForScreen} from '#/lib/hooks/useHideBottomBarBorder'
import {useProfileQuery} from '#/state/queries/profile'
import {useSession} from '#/state/session'
import {UserAvatar} from '#/view/com/util/UserAvatar'
-import {atoms as a, ios, useBreakpoints, useTheme} from '#/alf'
+import {atoms as a, ios, native, useBreakpoints, useTheme} from '#/alf'
+import {transparentifyColor} from '#/alf/util/colorGeneration'
import {useInteractionState} from '#/components/hooks/useInteractionState'
import {Text} from '#/components/Typography'
export function PostThreadComposePrompt({
onPressCompose,
+ style,
}: {
onPressCompose: () => void
+ style?: StyleProp
}) {
const {currentAccount} = useSession()
const {data: profile} = useProfileQuery({did: currentAccount?.did})
@@ -28,29 +33,44 @@ export function PostThreadComposePrompt({
onOut: onHoverOut,
} = useInteractionState()
+ useHideBottomBarBorderForScreen()
+
return (
- {
- onPressCompose()
- playHaptic('Light')
- }}
- onLongPress={ios(() => {
- onPressCompose()
- playHaptic('Heavy')
- })}
- onHoverIn={onHoverIn}
- onHoverOut={onHoverOut}>
-
+ {!gtMobile && (
+
+ )}
+ {
+ onPressCompose()
+ playHaptic('Light')
+ }}
+ onLongPress={ios(() => {
+ onPressCompose()
+ playHaptic('Heavy')
+ })}
+ onHoverIn={onHoverIn}
+ onHoverOut={onHoverOut}
style={[
a.flex_row,
a.align_center,
@@ -58,17 +78,18 @@ export function PostThreadComposePrompt({
a.gap_sm,
a.rounded_full,
(!gtMobile || hovered) && t.atoms.bg_contrast_25,
+ native([a.border, t.atoms.border_contrast_low]),
a.transition_color,
]}>
Write your reply
-
-
+
+
)
}
diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx
index 8b39072ba6..592224ff54 100644
--- a/src/view/com/post-thread/PostThreadItem.tsx
+++ b/src/view/com/post-thread/PostThreadItem.tsx
@@ -39,13 +39,13 @@ import {FeedFeedbackProvider, useFeedFeedback} from '#/state/feed-feedback'
import {useLanguagePrefs} from '#/state/preferences'
import {type ThreadPost} from '#/state/queries/post-thread'
import {useSession} from '#/state/session'
+import {type OnPostSuccessData} from '#/state/shell/composer'
import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
-import {useUnstablePostSource} from '#/state/unstable-post-source'
+import {type PostSource} from '#/state/unstable-post-source'
import {PostThreadFollowBtn} from '#/view/com/post-thread/PostThreadFollowBtn'
import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
-import {Link, TextLink} from '#/view/com/util/Link'
+import {Link} from '#/view/com/util/Link'
import {formatCount} from '#/view/com/util/numeric/format'
-import {PostEmbeds, PostEmbedViewContext} from '#/view/com/util/post-embeds'
import {PostMeta} from '#/view/com/util/PostMeta'
import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
import {atoms as a, useTheme} from '#/alf'
@@ -61,6 +61,8 @@ import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
import {PostAlerts} from '#/components/moderation/PostAlerts'
import {PostHider} from '#/components/moderation/PostHider'
import {type AppModerationCause} from '#/components/Pills'
+import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'
+import {ShowMoreTextButton} from '#/components/Post/ShowMoreTextButton'
import {PostControls} from '#/components/PostControls'
import * as Prompt from '#/components/Prompt'
import {RichText} from '#/components/RichText'
@@ -85,8 +87,10 @@ export function PostThreadItem({
hasPrecedingItem,
overrideBlur,
onPostReply,
+ onPostSuccess,
hideTopBorder,
threadgateRecord,
+ anchorPostSource,
}: {
post: AppBskyFeedDefs.PostView
record: AppBskyFeedPost.Record
@@ -102,8 +106,10 @@ export function PostThreadItem({
hasPrecedingItem: boolean
overrideBlur: boolean
onPostReply: (postUri: string | undefined) => void
+ onPostSuccess?: (data: OnPostSuccessData) => void
hideTopBorder?: boolean
threadgateRecord?: AppBskyFeedThreadgate.Record
+ anchorPostSource?: PostSource
}) {
const postShadowed = usePostShadow(post)
const richText = useMemo(
@@ -137,8 +143,10 @@ export function PostThreadItem({
hasPrecedingItem={hasPrecedingItem}
overrideBlur={overrideBlur}
onPostReply={onPostReply}
+ onPostSuccess={onPostSuccess}
hideTopBorder={hideTopBorder}
threadgateRecord={threadgateRecord}
+ anchorPostSource={anchorPostSource}
/>
)
}
@@ -182,8 +190,10 @@ let PostThreadItemLoaded = ({
hasPrecedingItem,
overrideBlur,
onPostReply,
+ onPostSuccess,
hideTopBorder,
threadgateRecord,
+ anchorPostSource,
}: {
post: Shadow
record: AppBskyFeedPost.Record
@@ -200,12 +210,13 @@ let PostThreadItemLoaded = ({
hasPrecedingItem: boolean
overrideBlur: boolean
onPostReply: (postUri: string | undefined) => void
+ onPostSuccess?: (data: OnPostSuccessData) => void
hideTopBorder?: boolean
threadgateRecord?: AppBskyFeedThreadgate.Record
+ anchorPostSource?: PostSource
}): React.ReactNode => {
const {currentAccount, hasSession} = useSession()
- const source = useUnstablePostSource(post.uri)
- const feedFeedback = useFeedFeedback(source?.feed, hasSession)
+ const feedFeedback = useFeedFeedback(anchorPostSource?.feed, hasSession)
const t = useTheme()
const pal = usePalette('default')
@@ -276,12 +287,12 @@ let PostThreadItemLoaded = ({
)
const onPressReply = () => {
- if (source) {
+ if (anchorPostSource && isHighlightedPost) {
feedFeedback.sendInteraction({
item: post.uri,
event: 'app.bsky.feed.defs#interactionReply',
- feedContext: source.post.feedContext,
- reqId: source.post.reqId,
+ feedContext: anchorPostSource.post.feedContext,
+ reqId: anchorPostSource.post.reqId,
})
}
openComposer({
@@ -294,27 +305,28 @@ let PostThreadItemLoaded = ({
moderation,
},
onPost: onPostReply,
+ onPostSuccess: onPostSuccess,
})
}
const onOpenAuthor = () => {
- if (source) {
+ if (anchorPostSource) {
feedFeedback.sendInteraction({
item: post.uri,
event: 'app.bsky.feed.defs#clickthroughAuthor',
- feedContext: source.post.feedContext,
- reqId: source.post.reqId,
+ feedContext: anchorPostSource.post.feedContext,
+ reqId: anchorPostSource.post.reqId,
})
}
}
const onOpenEmbed = () => {
- if (source) {
+ if (anchorPostSource) {
feedFeedback.sendInteraction({
item: post.uri,
event: 'app.bsky.feed.defs#clickthroughEmbed',
- feedContext: source.post.feedContext,
- reqId: source.post.reqId,
+ feedContext: anchorPostSource.post.feedContext,
+ reqId: anchorPostSource.post.reqId,
})
}
}
@@ -325,7 +337,7 @@ let PostThreadItemLoaded = ({
const {isActive: live} = useActorStatus(post.author)
- const reason = source?.post.reason
+ const reason = anchorPostSource?.post.reason
const viaRepost = useMemo(() => {
if (AppBskyFeedDefs.isReasonRepost(reason) && reason.uri && reason.cid) {
return {
@@ -454,7 +466,7 @@ let PostThreadItemLoaded = ({
) : undefined}
{post.embed && (
-
@@ -674,19 +686,17 @@ let PostThreadItemLoaded = ({
authorHandle={post.author.handle}
shouldProxyLinks={true}
/>
+ {limitLines && (
+
+ )}
) : undefined}
- {limitLines ? (
-
- ) : undefined}
{post.embed && (
- countLines(richText?.text) >= MAX_POST_LINES,
@@ -128,7 +127,7 @@ function PostInner({
replyAuthorDid = urip.hostname
}
- const onPressReply = React.useCallback(() => {
+ const onPressReply = useCallback(() => {
openComposer({
replyTo: {
uri: post.uri,
@@ -141,18 +140,18 @@ function PostInner({
})
}, [openComposer, post, record, moderation])
- const onPressShowMore = React.useCallback(() => {
+ const onPressShowMore = useCallback(() => {
setLimitLines(false)
}, [setLimitLines])
- const onBeforePress = React.useCallback(() => {
+ const onBeforePress = useCallback(() => {
precacheProfile(queryClient, post.author)
}, [queryClient, post.author])
const {currentAccount} = useSession()
const isMe = replyAuthorDid === currentAccount?.did
- const [hover, setHover] = React.useState(false)
+ const [hover, setHover] = useState(false)
return (
Reply to{' '}
-
+
{richText.text ? (
-
+
+ {limitLines && (
+
+ )}
) : undefined}
- {limitLines ? (
-
- ) : undefined}
{post.embed ? (
- {
sendInteraction({
@@ -232,7 +236,7 @@ let FeedItemInner = ({
reqId,
})
unstableCacheProfileView(queryClient, post.author)
- unstableSetPostSource(post.uri, {
+ setUnstablePostSource(buildPostSourceKey(post.uri, post.author.handle), {
feed: feedDescriptor,
post: {
post,
@@ -365,7 +369,7 @@ let FeedItemInner = ({
) : (
Reposted by{' '}
-
+
{
- const pal = usePalette('default')
- const {_} = useLingui()
const {currentAccount} = useSession()
const [limitLines, setLimitLines] = useState(
() => countLines(richText.text) >= MAX_POST_LINES,
@@ -544,7 +546,7 @@ let PostContent = ({
additionalCauses={additionalPostAlerts}
/>
{richText.text ? (
-
+ <>
-
- ) : undefined}
- {limitLines ? (
-
+ {limitLines && (
+
+ )}
+
) : undefined}
{postEmbed ? (
-
Reply to{' '}
-
+
{
@@ -81,10 +86,9 @@ export function ProfileSubpageHeader({
if (
avatar // TODO && !(view.moderation.avatar.blur && view.moderation.avatar.noOverride)
) {
- const aviHandle = aviRef.current
runOnUI(() => {
'worklet'
- const rect = measureHandle(aviHandle)
+ const rect = measure(aviRef)
runOnJS(_openLightbox)(avatar, rect)
})()
}
@@ -111,7 +115,7 @@ export function ProfileSubpageHeader({
paddingBottom: 14,
paddingHorizontal: isMobile ? 12 : 14,
}}>
-
+
)}
-
+
{isLoading ? (
void
} & TextProps) {
const navigation = useNavigationDeduped()
- const {openModal, closeModal} = useModalControls()
+ const {closeModal} = useModalControls()
+ const {linkWarningDialogControl} = useGlobalDialogsControlContext()
const openLink = useOpenLink()
if (!disableMismatchWarning && typeof text !== 'string') {
@@ -211,9 +213,8 @@ export const TextLink = memo(function TextLink({
linkRequiresWarning(href, typeof text === 'string' ? text : '')
if (requiresWarning) {
e?.preventDefault?.()
- openModal({
- name: 'link-warning',
- text: typeof text === 'string' ? text : '',
+ linkWarningDialogControl.open({
+ displayText: typeof text === 'string' ? text : '',
href,
})
}
@@ -245,13 +246,13 @@ export const TextLink = memo(function TextLink({
onBeforePress,
onPressProp,
closeModal,
- openModal,
navigation,
href,
text,
disableMismatchWarning,
navigationAction,
openLink,
+ linkWarningDialogControl,
],
)
const hrefAttrs = useMemo(() => {
diff --git a/src/view/com/util/List.tsx b/src/view/com/util/List.tsx
index 28f21d0392..7dd04bab3a 100644
--- a/src/view/com/util/List.tsx
+++ b/src/view/com/util/List.tsx
@@ -1,7 +1,7 @@
import React, {memo} from 'react'
-import {RefreshControl, ViewToken} from 'react-native'
+import {RefreshControl, type ViewToken} from 'react-native'
import {
- FlatListPropsWithLayout,
+ type FlatListPropsWithLayout,
runOnJS,
useSharedValue,
} from 'react-native-reanimated'
@@ -11,7 +11,7 @@ import {useAnimatedScrollHandler} from '#/lib/hooks/useAnimatedScrollHandler_FIX
import {useDedupe} from '#/lib/hooks/useDedupe'
import {useScrollHandlers} from '#/lib/ScrollContext'
import {addStyle} from '#/lib/styles'
-import {isAndroid, isIOS} from '#/platform/detection'
+import {isIOS} from '#/platform/detection'
import {useLightbox} from '#/state/lightbox'
import {useTheme} from '#/alf'
import {FlatList_INTERNAL} from './Views'
@@ -152,7 +152,7 @@ let List = React.forwardRef(
return (
{
)}
-
+
void
+ onPress?: (
+ containerRef: AnimatedRef,
+ fetchedDims: Dimensions | null,
+ ) => void
onLongPress?: () => void
onPressIn?: () => void
}) {
const t = useTheme()
const {_} = useLingui()
const largeAlt = useLargeAltBadgeEnabled()
- const containerRef = useHandleRef()
+ const containerRef = useAnimatedRef()
const fetchedDimsRef = useRef<{width: number; height: number} | null>(null)
let aspectRatio: number | undefined
@@ -103,7 +109,7 @@ export function AutoSizedImage({
const hasAlt = !!image.alt
const contents = (
-
+
) : null}
-
+
)
if (cropDisabled) {
diff --git a/src/view/com/util/images/Gallery.tsx b/src/view/com/util/images/Gallery.tsx
index cc3eda68d2..323264ea4b 100644
--- a/src/view/com/util/images/Gallery.tsx
+++ b/src/view/com/util/images/Gallery.tsx
@@ -1,16 +1,16 @@
-import React from 'react'
-import {Pressable, StyleProp, View, ViewStyle} from 'react-native'
-import {Image, ImageStyle} from 'expo-image'
-import {AppBskyEmbedImages} from '@atproto/api'
+import {Pressable, type StyleProp, View, type ViewStyle} from 'react-native'
+import {type AnimatedRef} from 'react-native-reanimated'
+import {Image, type ImageStyle} from 'expo-image'
+import {type AppBskyEmbedImages} from '@atproto/api'
import {msg} from '@lingui/macro'
import {useLingui} from '@lingui/react'
+import type React from 'react'
-import {HandleRef} from '#/lib/hooks/useHandleRef'
-import {Dimensions} from '#/lib/media/types'
+import {type Dimensions} from '#/lib/media/types'
import {useLargeAltBadgeEnabled} from '#/state/preferences/large-alt-badge'
-import {PostEmbedViewContext} from '#/view/com/util/post-embeds/types'
import {atoms as a, useTheme} from '#/alf'
import {MediaInsetBorder} from '#/components/MediaInsetBorder'
+import {PostEmbedViewContext} from '#/components/Post/Embed/types'
import {Text} from '#/components/Typography'
type EventFunction = (index: number) => void
@@ -20,7 +20,7 @@ interface Props {
index: number
onPress?: (
index: number,
- containerRefs: HandleRef[],
+ containerRefs: AnimatedRef[],
fetchedDims: (Dimensions | null)[],
) => void
onLongPress?: EventFunction
@@ -28,7 +28,7 @@ interface Props {
imageStyle?: StyleProp
viewContext?: PostEmbedViewContext
insetBorderStyle?: StyleProp
- containerRefs: HandleRef[]
+ containerRefs: AnimatedRef[]
thumbDimsRef: React.MutableRefObject<(Dimensions | null)[]>
}
diff --git a/src/view/com/util/images/ImageLayoutGrid.tsx b/src/view/com/util/images/ImageLayoutGrid.tsx
index 16ea9d453f..757d952a19 100644
--- a/src/view/com/util/images/ImageLayoutGrid.tsx
+++ b/src/view/com/util/images/ImageLayoutGrid.tsx
@@ -1,18 +1,18 @@
import React from 'react'
-import {StyleProp, StyleSheet, View, ViewStyle} from 'react-native'
-import {AppBskyEmbedImages} from '@atproto/api'
+import {type StyleProp, StyleSheet, View, type ViewStyle} from 'react-native'
+import {type AnimatedRef, useAnimatedRef} from 'react-native-reanimated'
+import {type AppBskyEmbedImages} from '@atproto/api'
-import {HandleRef, useHandleRef} from '#/lib/hooks/useHandleRef'
-import {PostEmbedViewContext} from '#/view/com/util/post-embeds/types'
import {atoms as a, useBreakpoints} from '#/alf'
-import {Dimensions} from '../../lightbox/ImageViewing/@types'
+import {PostEmbedViewContext} from '#/components/Post/Embed/types'
+import {type Dimensions} from '../../lightbox/ImageViewing/@types'
import {GalleryItem} from './Gallery'
interface ImageLayoutGridProps {
images: AppBskyEmbedImages.ViewImage[]
onPress?: (
index: number,
- containerRefs: HandleRef[],
+ containerRefs: AnimatedRef[],
fetchedDims: (Dimensions | null)[],
) => void
onLongPress?: (index: number) => void
@@ -43,7 +43,7 @@ interface ImageLayoutGridInnerProps {
images: AppBskyEmbedImages.ViewImage[]
onPress?: (
index: number,
- containerRefs: HandleRef[],
+ containerRefs: AnimatedRef[],
fetchedDims: (Dimensions | null)[],
) => void
onLongPress?: (index: number) => void
@@ -56,10 +56,10 @@ function ImageLayoutGridInner(props: ImageLayoutGridInnerProps) {
const gap = props.gap
const count = props.images.length
- const containerRef1 = useHandleRef()
- const containerRef2 = useHandleRef()
- const containerRef3 = useHandleRef()
- const containerRef4 = useHandleRef()
+ const containerRef1 = useAnimatedRef()
+ const containerRef2 = useAnimatedRef()
+ const containerRef3 = useAnimatedRef()
+ const containerRef4 = useAnimatedRef()
const thumbDimsRef = React.useRef<(Dimensions | null)[]>([])
switch (count) {
diff --git a/src/view/com/util/post-embeds/QuoteEmbed.tsx b/src/view/com/util/post-embeds/QuoteEmbed.tsx
deleted file mode 100644
index f788af1f86..0000000000
--- a/src/view/com/util/post-embeds/QuoteEmbed.tsx
+++ /dev/null
@@ -1,337 +0,0 @@
-import React from 'react'
-import {
- StyleProp,
- StyleSheet,
- TouchableOpacity,
- View,
- ViewStyle,
-} from 'react-native'
-import {
- AppBskyEmbedExternal,
- AppBskyEmbedImages,
- AppBskyEmbedRecord,
- AppBskyEmbedRecordWithMedia,
- AppBskyEmbedVideo,
- AppBskyFeedDefs,
- AppBskyFeedPost,
- moderatePost,
- ModerationDecision,
- RichText as RichTextAPI,
-} from '@atproto/api'
-import {AtUri} from '@atproto/api'
-import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-import {useQueryClient} from '@tanstack/react-query'
-
-import {HITSLOP_20} from '#/lib/constants'
-import {usePalette} from '#/lib/hooks/usePalette'
-import {InfoCircleIcon} from '#/lib/icons'
-import {makeProfileLink} from '#/lib/routes/links'
-import {s} from '#/lib/styles'
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {precacheProfile} from '#/state/queries/profile'
-import {useResolveLinkQuery} from '#/state/queries/resolve-link'
-import {useSession} from '#/state/session'
-import {atoms as a, useTheme} from '#/alf'
-import {RichText} from '#/components/RichText'
-import {SubtleWebHover} from '#/components/SubtleWebHover'
-import * as bsky from '#/types/bsky'
-import {ContentHider} from '../../../../components/moderation/ContentHider'
-import {PostAlerts} from '../../../../components/moderation/PostAlerts'
-import {Link} from '../Link'
-import {PostMeta} from '../PostMeta'
-import {Text} from '../text/Text'
-import {PostEmbeds} from '.'
-import {QuoteEmbedViewContext} from './types'
-
-export function MaybeQuoteEmbed({
- embed,
- onOpen,
- style,
- allowNestedQuotes,
- viewContext,
-}: {
- embed: AppBskyEmbedRecord.View
- onOpen?: () => void
- style?: StyleProp
- allowNestedQuotes?: boolean
- viewContext?: QuoteEmbedViewContext
-}) {
- const t = useTheme()
- const pal = usePalette('default')
- const {currentAccount} = useSession()
- if (
- AppBskyEmbedRecord.isViewRecord(embed.record) &&
- AppBskyFeedPost.isRecord(embed.record.value) &&
- AppBskyFeedPost.validateRecord(embed.record.value).success
- ) {
- return (
-
- )
- } else if (AppBskyEmbedRecord.isViewBlocked(embed.record)) {
- return (
-
-
-
- Blocked
-
-
- )
- } else if (AppBskyEmbedRecord.isViewNotFound(embed.record)) {
- return (
-
-
-
- Deleted
-
-
- )
- } else if (AppBskyEmbedRecord.isViewDetached(embed.record)) {
- const isViewerOwner = currentAccount?.did
- ? embed.record.uri.includes(currentAccount.did)
- : false
- return (
-
-
-
- {isViewerOwner ? (
- Removed by you
- ) : (
- Removed by author
- )}
-
-
- )
- }
- return null
-}
-
-function QuoteEmbedModerated({
- viewRecord,
- onOpen,
- style,
- allowNestedQuotes,
- viewContext,
-}: {
- viewRecord: AppBskyEmbedRecord.ViewRecord
- onOpen?: () => void
- style?: StyleProp
- allowNestedQuotes?: boolean
- viewContext?: QuoteEmbedViewContext
-}) {
- const moderationOpts = useModerationOpts()
- const postView = React.useMemo(
- () => viewRecordToPostView(viewRecord),
- [viewRecord],
- )
- const moderation = React.useMemo(() => {
- return moderationOpts ? moderatePost(postView, moderationOpts) : undefined
- }, [postView, moderationOpts])
-
- return (
-
- )
-}
-
-export function QuoteEmbed({
- quote,
- moderation,
- onOpen,
- style,
- allowNestedQuotes,
-}: {
- quote: AppBskyFeedDefs.PostView
- moderation?: ModerationDecision
- onOpen?: () => void
- style?: StyleProp
- allowNestedQuotes?: boolean
- viewContext?: QuoteEmbedViewContext
-}) {
- const t = useTheme()
- const queryClient = useQueryClient()
- const pal = usePalette('default')
- const itemUrip = new AtUri(quote.uri)
- const itemHref = makeProfileLink(quote.author, 'post', itemUrip.rkey)
- const itemTitle = `Post by ${quote.author.handle}`
-
- const richText = React.useMemo(() => {
- if (
- !bsky.dangerousIsType(
- quote.record,
- AppBskyFeedPost.isRecord,
- )
- )
- return undefined
- const {text, facets} = quote.record
- return text.trim()
- ? new RichTextAPI({text: text, facets: facets})
- : undefined
- }, [quote.record])
-
- const embed = React.useMemo(() => {
- const e = quote.embed
-
- if (allowNestedQuotes) {
- return e
- } else {
- if (
- AppBskyEmbedImages.isView(e) ||
- AppBskyEmbedExternal.isView(e) ||
- AppBskyEmbedVideo.isView(e)
- ) {
- return e
- } else if (
- AppBskyEmbedRecordWithMedia.isView(e) &&
- (AppBskyEmbedImages.isView(e.media) ||
- AppBskyEmbedExternal.isView(e.media) ||
- AppBskyEmbedVideo.isView(e.media))
- ) {
- return e.media
- }
- }
- }, [quote.embed, allowNestedQuotes])
-
- const onBeforePress = React.useCallback(() => {
- precacheProfile(queryClient, quote.author)
- onOpen?.()
- }, [queryClient, quote.author, onOpen])
-
- const [hover, setHover] = React.useState(false)
- return (
- {
- setHover(true)
- }}
- onPointerLeave={() => {
- setHover(false)
- }}>
-
-
-
-
-
-
- {moderation ? (
-
- ) : null}
- {richText ? (
-
- ) : null}
- {embed && }
-
-
-
- )
-}
-
-export function QuoteX({onRemove}: {onRemove: () => void}) {
- const {_} = useLingui()
- return (
-
-
-
- )
-}
-
-export function LazyQuoteEmbed({uri}: {uri: string}) {
- const {data} = useResolveLinkQuery(uri)
- const moderationOpts = useModerationOpts()
- if (!data || data.type !== 'record' || data.kind !== 'post') {
- return null
- }
- const moderation = moderationOpts
- ? moderatePost(data.view, moderationOpts)
- : undefined
- return
-}
-
-function viewRecordToPostView(
- viewRecord: AppBskyEmbedRecord.ViewRecord,
-): AppBskyFeedDefs.PostView {
- const {value, embeds, ...rest} = viewRecord
- return {
- ...rest,
- $type: 'app.bsky.feed.defs#postView',
- record: value,
- embed: embeds?.[0],
- }
-}
-
-const styles = StyleSheet.create({
- errorContainer: {
- flexDirection: 'row',
- alignItems: 'center',
- gap: 4,
- borderRadius: 8,
- marginTop: 8,
- paddingVertical: 14,
- paddingHorizontal: 14,
- borderWidth: StyleSheet.hairlineWidth,
- },
- alert: {
- marginBottom: 6,
- },
-})
diff --git a/src/view/com/util/post-embeds/index.tsx b/src/view/com/util/post-embeds/index.tsx
deleted file mode 100644
index 431baa2b22..0000000000
--- a/src/view/com/util/post-embeds/index.tsx
+++ /dev/null
@@ -1,324 +0,0 @@
-import React from 'react'
-import {
- InteractionManager,
- type StyleProp,
- StyleSheet,
- View,
- type ViewStyle,
-} from 'react-native'
-import {
- type MeasuredDimensions,
- runOnJS,
- runOnUI,
-} from 'react-native-reanimated'
-import {Image} from 'expo-image'
-import {
- AppBskyEmbedExternal,
- AppBskyEmbedImages,
- AppBskyEmbedRecord,
- AppBskyEmbedRecordWithMedia,
- AppBskyEmbedVideo,
- AppBskyFeedDefs,
- AppBskyGraphDefs,
- moderateFeedGenerator,
- moderateUserList,
- type ModerationDecision,
-} from '@atproto/api'
-
-import {type HandleRef, measureHandle} from '#/lib/hooks/useHandleRef'
-import {usePalette} from '#/lib/hooks/usePalette'
-import {useLightboxControls} from '#/state/lightbox'
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {FeedSourceCard} from '#/view/com/feeds/FeedSourceCard'
-import {atoms as a, useTheme} from '#/alf'
-import * as ListCard from '#/components/ListCard'
-import {Embed as StarterPackCard} from '#/components/StarterPack/StarterPackCard'
-import {ContentHider} from '../../../../components/moderation/ContentHider'
-import {type Dimensions} from '../../lightbox/ImageViewing/@types'
-import {AutoSizedImage} from '../images/AutoSizedImage'
-import {ImageLayoutGrid} from '../images/ImageLayoutGrid'
-import {ExternalLinkEmbed} from './ExternalLinkEmbed'
-import {MaybeQuoteEmbed} from './QuoteEmbed'
-import {PostEmbedViewContext, QuoteEmbedViewContext} from './types'
-import {VideoEmbed} from './VideoEmbed'
-
-export * from './types'
-
-type Embed =
- | AppBskyEmbedRecord.View
- | AppBskyEmbedImages.View
- | AppBskyEmbedVideo.View
- | AppBskyEmbedExternal.View
- | AppBskyEmbedRecordWithMedia.View
- | {$type: string; [k: string]: unknown}
-
-export function PostEmbeds({
- embed,
- moderation,
- onOpen,
- style,
- allowNestedQuotes,
- viewContext,
-}: {
- embed?: Embed
- moderation?: ModerationDecision
- onOpen?: () => void
- style?: StyleProp
- allowNestedQuotes?: boolean
- viewContext?: PostEmbedViewContext
-}) {
- const {openLightbox} = useLightboxControls()
-
- // quote post with media
- // =
- if (AppBskyEmbedRecordWithMedia.isView(embed)) {
- return (
-
-
-
-
- )
- }
-
- if (AppBskyEmbedRecord.isView(embed)) {
- // custom feed embed (i.e. generator view)
- if (AppBskyFeedDefs.isGeneratorView(embed.record)) {
- return (
-
-
-
- )
- }
-
- // list embed
- if (AppBskyGraphDefs.isListView(embed.record)) {
- return (
-
-
-
- )
- }
-
- // starter pack embed
- if (AppBskyGraphDefs.isStarterPackViewBasic(embed.record)) {
- return (
-
-
-
- )
- }
-
- // quote post
- // =
- return (
-
- )
- }
-
- // image embed
- // =
- if (AppBskyEmbedImages.isView(embed)) {
- const {images} = embed
-
- if (images.length > 0) {
- const items = embed.images.map(img => ({
- uri: img.fullsize,
- thumbUri: img.thumb,
- alt: img.alt,
- dimensions: img.aspectRatio ?? null,
- }))
- const _openLightbox = (
- index: number,
- thumbRects: (MeasuredDimensions | null)[],
- fetchedDims: (Dimensions | null)[],
- ) => {
- openLightbox({
- images: items.map((item, i) => ({
- ...item,
- thumbRect: thumbRects[i] ?? null,
- thumbDimensions: fetchedDims[i] ?? null,
- type: 'image',
- })),
- index,
- })
- }
- const onPress = (
- index: number,
- refs: HandleRef[],
- fetchedDims: (Dimensions | null)[],
- ) => {
- const handles = refs.map(r => r.current)
- runOnUI(() => {
- 'worklet'
- const rects = handles.map(measureHandle)
- runOnJS(_openLightbox)(index, rects, fetchedDims)
- })()
- }
- const onPressIn = (_: number) => {
- InteractionManager.runAfterInteractions(() => {
- Image.prefetch(items.map(i => i.uri))
- })
- }
-
- if (images.length === 1) {
- const image = images[0]
- return (
-
-
-
- onPress(0, [containerRef], [dims])
- }
- onPressIn={() => onPressIn(0)}
- hideBadge={
- viewContext === PostEmbedViewContext.FeedEmbedRecordWithMedia
- }
- />
-
-
- )
- }
-
- return (
-
-
-
-
-
- )
- }
- }
-
- // external link embed
- // =
- if (AppBskyEmbedExternal.isView(embed)) {
- const link = embed.external
- return (
-
-
-
- )
- }
-
- // video embed
- // =
- if (AppBskyEmbedVideo.isView(embed)) {
- return (
-
-
-
- )
- }
-
- return
-}
-
-export function MaybeFeedCard({view}: {view: AppBskyFeedDefs.GeneratorView}) {
- const pal = usePalette('default')
- const moderationOpts = useModerationOpts()
- const moderation = React.useMemo(() => {
- return moderationOpts
- ? moderateFeedGenerator(view, moderationOpts)
- : undefined
- }, [view, moderationOpts])
-
- return (
-
-
-
- )
-}
-
-export function MaybeListCard({view}: {view: AppBskyGraphDefs.ListView}) {
- const moderationOpts = useModerationOpts()
- const moderation = React.useMemo(() => {
- return moderationOpts ? moderateUserList(view, moderationOpts) : undefined
- }, [view, moderationOpts])
- const t = useTheme()
-
- return (
-
-
-
-
-
- )
-}
-
-const styles = StyleSheet.create({
- altContainer: {
- backgroundColor: 'rgba(0, 0, 0, 0.75)',
- borderRadius: 6,
- paddingHorizontal: 6,
- paddingVertical: 3,
- position: 'absolute',
- right: 6,
- bottom: 6,
- },
- alt: {
- color: 'white',
- fontSize: 7,
- fontWeight: '600',
- },
- customFeedOuter: {
- borderWidth: StyleSheet.hairlineWidth,
- borderRadius: 8,
- paddingHorizontal: 12,
- paddingVertical: 12,
- },
-})
diff --git a/src/view/com/util/post-embeds/types.ts b/src/view/com/util/post-embeds/types.ts
deleted file mode 100644
index 08e9032768..0000000000
--- a/src/view/com/util/post-embeds/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export enum PostEmbedViewContext {
- ThreadHighlighted = 'ThreadHighlighted',
- Feed = 'Feed',
- FeedEmbedRecordWithMedia = 'FeedEmbedRecordWithMedia',
-}
-
-export enum QuoteEmbedViewContext {
- FeedEmbedRecordWithMedia = PostEmbedViewContext.FeedEmbedRecordWithMedia,
-}
diff --git a/src/view/screens/Notifications.tsx b/src/view/screens/Notifications.tsx
index ace0de2aed..528d6be870 100644
--- a/src/view/screens/Notifications.tsx
+++ b/src/view/screens/Notifications.tsx
@@ -130,7 +130,7 @@ export function NotificationsScreen({}: Props) {
export function PostThreadScreen({route}: Props) {
const setMinimalShellMode = useSetMinimalShellMode()
+ const gate = useGate()
const {name, rkey} = route.params
const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey)
useFocusEffect(
- React.useCallback(() => {
+ useCallback(() => {
setMinimalShellMode(false)
}, [setMinimalShellMode]),
)
return (
-
+ {gate('post_threads_v2_unspecced') || __DEV__ ? (
+
+ ) : (
+
+ )}
)
}
diff --git a/src/view/shell/Composer.ios.tsx b/src/view/shell/Composer.ios.tsx
index 8b53f40416..393b8f80e6 100644
--- a/src/view/shell/Composer.ios.tsx
+++ b/src/view/shell/Composer.ios.tsx
@@ -37,6 +37,7 @@ export function Composer({}: {winHeight: number}) {
cancelRef={ref}
replyTo={state?.replyTo}
onPost={state?.onPost}
+ onPostSuccess={state?.onPostSuccess}
quote={state?.quote}
mention={state?.mention}
text={state?.text}
diff --git a/src/view/shell/Composer.tsx b/src/view/shell/Composer.tsx
index e40c3528b9..a17de6163d 100644
--- a/src/view/shell/Composer.tsx
+++ b/src/view/shell/Composer.tsx
@@ -49,6 +49,7 @@ export function Composer({winHeight}: {winHeight: number}) {
{
@@ -146,7 +148,7 @@ export function BottomBar({navigation}: BottomTabBarProps) {
style={[
styles.bottomBar,
pal.view,
- pal.border,
+ hideBorder ? {borderColor: pal.view.backgroundColor} : pal.border,
{paddingBottom: clamp(safeAreaInsets.bottom, 15, 60)},
footerMinimalShellTransform,
]}
diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx
index 7a320cb438..8dce85cd17 100644
--- a/src/view/shell/bottom-bar/BottomBarWeb.tsx
+++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx
@@ -5,16 +5,18 @@ import {msg, plural, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {useNavigationState} from '@react-navigation/native'
+import {useHideBottomBarBorder} from '#/lib/hooks/useHideBottomBarBorder'
import {useMinimalShellFooterTransform} from '#/lib/hooks/useMinimalShellTransform'
import {getCurrentRoute, isTab} from '#/lib/routes/helpers'
import {makeProfileLink} from '#/lib/routes/links'
-import {CommonNavigatorParams} from '#/lib/routes/types'
+import {type CommonNavigatorParams} from '#/lib/routes/types'
import {useGate} from '#/lib/statsig/statsig'
import {useHomeBadge} from '#/state/home-badge'
import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations'
import {useUnreadNotifications} from '#/state/queries/notifications/unread'
import {useSession} from '#/state/session'
import {useLoggedOutViewControls} from '#/state/shell/logged-out'
+import {useShellLayout} from '#/state/shell/shell-layout'
import {useCloseAllActiveElements} from '#/state/util'
import {Link} from '#/view/com/util/Link'
import {Logo} from '#/view/icons/Logo'
@@ -49,6 +51,8 @@ export function BottomBarWeb() {
const footerMinimalShellTransform = useMinimalShellFooterTransform()
const {requestSwitchToAccount} = useLoggedOutViewControls()
const closeAllActiveElements = useCloseAllActiveElements()
+ const {footerHeight} = useShellLayout()
+ const hideBorder = useHideBottomBarBorder()
const iconWidth = 26
const unreadMessageCount = useUnreadMessageCount()
@@ -74,9 +78,12 @@ export function BottomBarWeb() {
styles.bottomBar,
styles.bottomBarWeb,
t.atoms.bg,
- t.atoms.border_contrast_low,
+ hideBorder
+ ? {borderColor: t.atoms.bg.backgroundColor}
+ : t.atoms.border_contrast_low,
footerMinimalShellTransform,
- ]}>
+ ]}
+ onLayout={event => footerHeight.set(event.nativeEvent.layout.height)}>
{hasSession ? (
<>
+
diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx
index a7ff76d61b..8969d68f89 100644
--- a/src/view/shell/index.web.tsx
+++ b/src/view/shell/index.web.tsx
@@ -18,6 +18,7 @@ import {ModalsContainer} from '#/view/com/modals/Modal'
import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
import {atoms as a, select, useTheme} from '#/alf'
import {EmailDialog} from '#/components/dialogs/EmailDialog'
+import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
import {SigninDialog} from '#/components/dialogs/Signin'
import {Outlet as PortalOutlet} from '#/components/Portal'
@@ -69,6 +70,7 @@ function ShellInner() {
+
diff --git a/yarn.lock b/yarn.lock
index d299bede55..fe3ce7caf4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -55,18 +55,18 @@
resolved "https://registry.yarnpkg.com/@atproto-labs/simple-store/-/simple-store-0.2.0.tgz#f39098747dabf8a245d0ed6edc50f362aa4d95f8"
integrity sha512-0bRbAlI8Ayh03wRwncAMEAyUKtZ+AuTS1jgPrfym1WVOAOiottI/ZmgccqLl6w5MbxVcClNQF7WYGKvGwGoIhA==
-"@atproto-labs/xrpc-utils@0.0.14":
- version "0.0.14"
- resolved "https://registry.yarnpkg.com/@atproto-labs/xrpc-utils/-/xrpc-utils-0.0.14.tgz#eefe1ccf61a4288708601324496b0106d5ed4ae3"
- integrity sha512-/f0Dhzi08w3Oqv38wdwQ5bw238GbxhYIcxg08kVReEMTlkyRDC6H5RuqHf8Ff9J3FKqjKHGdxaOdrPNM1hCgeQ==
+"@atproto-labs/xrpc-utils@0.0.16":
+ version "0.0.16"
+ resolved "https://registry.yarnpkg.com/@atproto-labs/xrpc-utils/-/xrpc-utils-0.0.16.tgz#f76c4f615685c60997401f052cbd9f0145d12576"
+ integrity sha512-WvTQhGjIhFrd/0pMGecE7Xn8BtvvKAgVlNs8UaE6CVRifiCOIvIBwlx1vnslJAavK3FtwL1kKkUdxNtxHciZSQ==
dependencies:
"@atproto/xrpc" "^0.7.0"
- "@atproto/xrpc-server" "^0.7.18"
+ "@atproto/xrpc-server" "^0.8.0"
-"@atproto/api@^0.15.9":
- version "0.15.9"
- resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.15.9.tgz#f8c40afd6e414ab107d63d6f08d9e264bf9a149a"
- integrity sha512-CyAILiIcbN+V5CFAI6MDb247epm25RGkP7HSan5LUaOHiyg1NCAmflWCN/bbMdJX9kLqjAPAG3eN4BUUbYe//Q==
+"@atproto/api@^0.15.16":
+ version "0.15.16"
+ resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.15.16.tgz#1962e7067e03a661e17c3164874596ef1e7ed7ad"
+ integrity sha512-ZNBrzBg2l0lHreKik1lJn8lrhAktwlY8NUPBU/hO9dwjAnDHQTiSzNFZt65dp9djmqZ75sX/VJ+heNuaJBvnhQ==
dependencies:
"@atproto/common-web" "^0.4.2"
"@atproto/lexicon" "^0.4.11"
@@ -77,14 +77,14 @@
tlds "^1.234.0"
zod "^3.23.8"
-"@atproto/aws@^0.2.21":
- version "0.2.21"
- resolved "https://registry.yarnpkg.com/@atproto/aws/-/aws-0.2.21.tgz#06006a101c8004db11384a19366296cd87468326"
- integrity sha512-bosExZ3YdFjOehNBcNWsC2mZBrAVLO8Ut/JquypXSahFeeXZP/9rd9F1VGf+vAmjFEKagHXQCb6CRFfJyN+I7A==
+"@atproto/aws@^0.2.22":
+ version "0.2.22"
+ resolved "https://registry.yarnpkg.com/@atproto/aws/-/aws-0.2.22.tgz#14a664c06e3569945e4ab143d3a8a03400c7d1de"
+ integrity sha512-xZ+0/zHHmpgzdLJGTDkFl5Wd39Wm5MyyMLdGYSzyt0wGTBmH6Ktp7ZgR8rmQVNYN1+VkMcdClAiNhg+BSH3mRw==
dependencies:
"@atproto/common" "^0.4.11"
"@atproto/crypto" "^0.4.4"
- "@atproto/repo" "^0.8.1"
+ "@atproto/repo" "^0.8.2"
"@aws-sdk/client-cloudfront" "^3.261.0"
"@aws-sdk/client-kms" "^3.196.0"
"@aws-sdk/client-s3" "^3.224.0"
@@ -94,23 +94,23 @@
multiformats "^9.9.0"
uint8arrays "3.0.0"
-"@atproto/bsky@^0.0.151":
- version "0.0.151"
- resolved "https://registry.yarnpkg.com/@atproto/bsky/-/bsky-0.0.151.tgz#a0e5b59e163a3b74379fb547601be4fc66b7a133"
- integrity sha512-42pvUsyGw0nR6Sxlda824maY4gBxUni1cXPG+7uGe6Ixm6XAaPhfTgT1rAg++1rDXH9tT1EXAVnMxg38S6osLg==
+"@atproto/bsky@^0.0.161":
+ version "0.0.161"
+ resolved "https://registry.yarnpkg.com/@atproto/bsky/-/bsky-0.0.161.tgz#671280c1d40f5c4eb0cc31d338a9e950acbf0ce0"
+ integrity sha512-L4uzadjt+oyVq3+W7rc1A+X2DyZDsTfeSD15w7k6+6JzICp32qavDuVjut3CIBqXCt7ykvSDujApyLsB/lcWJQ==
dependencies:
"@atproto-labs/fetch-node" "0.1.9"
- "@atproto-labs/xrpc-utils" "0.0.14"
- "@atproto/api" "^0.15.9"
+ "@atproto-labs/xrpc-utils" "0.0.16"
+ "@atproto/api" "^0.15.16"
"@atproto/common" "^0.4.11"
"@atproto/crypto" "^0.4.4"
"@atproto/did" "^0.1.5"
"@atproto/identity" "^0.4.8"
"@atproto/lexicon" "^0.4.11"
- "@atproto/repo" "^0.8.1"
- "@atproto/sync" "^0.1.23"
+ "@atproto/repo" "^0.8.2"
+ "@atproto/sync" "^0.1.26"
"@atproto/syntax" "^0.4.0"
- "@atproto/xrpc-server" "^0.7.18"
+ "@atproto/xrpc-server" "^0.8.0"
"@bufbuild/protobuf" "^1.5.0"
"@connectrpc/connect" "^1.1.4"
"@connectrpc/connect-express" "^1.1.4"
@@ -140,10 +140,10 @@
uint8arrays "3.0.0"
undici "^6.19.8"
-"@atproto/bsync@^0.0.19":
- version "0.0.19"
- resolved "https://registry.yarnpkg.com/@atproto/bsync/-/bsync-0.0.19.tgz#bab3d5e4e7c1ca8de16d9b5efebc49dde12d7160"
- integrity sha512-AF9aWbU0VlpT//lIuYKhNRplTv+99ld58kfHTS8jfXCpiOZwxwneTkB1hzE+slXJ63K8i/GyzsQCyvRHWzGWCQ==
+"@atproto/bsync@^0.0.20":
+ version "0.0.20"
+ resolved "https://registry.yarnpkg.com/@atproto/bsync/-/bsync-0.0.20.tgz#7409c39a1d4715a5be4ce4a545155de238fc9469"
+ integrity sha512-KbHoZcFpKY869dMQRZXrOXccMkndgLiDY4sfLkCTgp/A0pWw3CKuJmQSmtKHIkWcVkOnfsfJW0J/SgyrXLrn9Q==
dependencies:
"@atproto/common" "^0.4.11"
"@atproto/syntax" "^0.4.0"
@@ -218,23 +218,23 @@
"@noble/hashes" "^1.6.1"
uint8arrays "3.0.0"
-"@atproto/dev-env@^0.3.133":
- version "0.3.133"
- resolved "https://registry.yarnpkg.com/@atproto/dev-env/-/dev-env-0.3.133.tgz#4ca58c9c4c99f001f26ce50629214f81d6acd3ab"
- integrity sha512-GtKDa+q0Fx2tJZL44cDAINMCxNmt1aKkGVpW/6PTnuSSjdA7ErBUEL3opbwgaAcPRGZfscB0mQmGfWR0BUmvUw==
+"@atproto/dev-env@^0.3.144":
+ version "0.3.144"
+ resolved "https://registry.yarnpkg.com/@atproto/dev-env/-/dev-env-0.3.144.tgz#cd2949ff870ca4cde23b4c377b08740a2e64151f"
+ integrity sha512-ND0oGp7itSnXxlAHlFxYjGFyCcu0f4eSucImVtKRxTcW8UeyyTtJcQP8OyNvtC8j13YjbW124r0g25Wlm0j9XQ==
dependencies:
- "@atproto/api" "^0.15.9"
- "@atproto/bsky" "^0.0.151"
- "@atproto/bsync" "^0.0.19"
+ "@atproto/api" "^0.15.16"
+ "@atproto/bsky" "^0.0.161"
+ "@atproto/bsync" "^0.0.20"
"@atproto/common-web" "^0.4.2"
"@atproto/crypto" "^0.4.4"
"@atproto/identity" "^0.4.8"
"@atproto/lexicon" "^0.4.11"
- "@atproto/ozone" "^0.1.112"
- "@atproto/pds" "^0.4.139"
- "@atproto/sync" "^0.1.23"
+ "@atproto/ozone" "^0.1.121"
+ "@atproto/pds" "^0.4.150"
+ "@atproto/sync" "^0.1.26"
"@atproto/syntax" "^0.4.0"
- "@atproto/xrpc-server" "^0.7.18"
+ "@atproto/xrpc-server" "^0.8.0"
"@did-plc/lib" "^0.0.1"
"@did-plc/server" "^0.0.1"
dotenv "^16.0.3"
@@ -244,7 +244,7 @@
uint8arrays "3.0.0"
undici "^6.14.1"
-"@atproto/did@^0.1.5":
+"@atproto/did@0.1.5", "@atproto/did@^0.1.5":
version "0.1.5"
resolved "https://registry.yarnpkg.com/@atproto/did/-/did-0.1.5.tgz#5bfe73625d54c4c687c00ff370971ce01c39bd61"
integrity sha512-8+1D08QdGE5TF0bB0vV8HLVrVZJeLNITpRTUVEoABNMRaUS7CoYSVb0+JNQDeJIVmqMjOL8dOjvCUDkp3gEaGQ==
@@ -259,18 +259,18 @@
"@atproto/common-web" "^0.4.2"
"@atproto/crypto" "^0.4.4"
-"@atproto/jwk-jose@0.1.6":
- version "0.1.6"
- resolved "https://registry.yarnpkg.com/@atproto/jwk-jose/-/jwk-jose-0.1.6.tgz#e9fc5a714cd9fe0589f931f3b406585716b5ac03"
- integrity sha512-r4DGMvvmazy6CxqAcnplpUxvp6Vd8UwKxQBZRpmm1aNsVonf5qj1yeDkECTiwoe/FPbvtdamlzClB3UZc7Yb5w==
+"@atproto/jwk-jose@0.1.8":
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/@atproto/jwk-jose/-/jwk-jose-0.1.8.tgz#2dc8ad2cc900e7bc231add293f6518b06dc017ec"
+ integrity sha512-aoU2Q0GpIl388KhCcv9YvAxNscALUv3xzLq5gjVPdJ+zmqw94nGZNcjiNvpnbfS+VQM9e2DrrTuwmDXnxfrrSA==
dependencies:
- "@atproto/jwk" "0.1.5"
+ "@atproto/jwk" "0.3.0"
jose "^5.2.0"
-"@atproto/jwk@0.1.5":
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/@atproto/jwk/-/jwk-0.1.5.tgz#d1e2650431f7f09ed80be48f05908bcd136c2606"
- integrity sha512-OzZFLhX41TOcMeanP3aZlL5bLeaUIZT15MI4aU5cwflNq/rwpGOpz3uwDjZc8ytgUjuTQ8LabSz5jMmwoTSWFg==
+"@atproto/jwk@0.3.0":
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/@atproto/jwk/-/jwk-0.3.0.tgz#275fa676f6b5988ddedf4ee0475dd285de9b831b"
+ integrity sha512-MIAXyNMGu1tCNHjqW/8jqfE/wgWCIoK2cJ0mR6UxwhNPvkbe35TcpRYJdtQu/E6MUd7TziyDBa/GO4dKAiePhQ==
dependencies:
multiformats "^9.9.0"
zod "^3.23.8"
@@ -286,32 +286,32 @@
multiformats "^9.9.0"
zod "^3.23.8"
-"@atproto/oauth-provider-api@0.1.2":
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/@atproto/oauth-provider-api/-/oauth-provider-api-0.1.2.tgz#cdca03af4426f8cf9b09bc9eb57a8604f9513831"
- integrity sha512-tNAuMrE6D3696euavxo1+Jh7Re0PPwJstbyY8SrdVPXgKJh/LrbpKUKiPNW/p5KyVfRs2tWeAxy+ReESu6SmXA==
+"@atproto/oauth-provider-api@0.1.4":
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/@atproto/oauth-provider-api/-/oauth-provider-api-0.1.4.tgz#a775182e3648dc693a04e3cb604eb62cd9ddfd8c"
+ integrity sha512-3PRrf0gTAVMCETjtIH/3AaQaHBDbjsRBc/OYrlWBZ9IPplchBXtQGH/KcnjE4kK2Ef8p45qQSl3dNWg3EXsbHQ==
dependencies:
- "@atproto/jwk" "0.1.5"
- "@atproto/oauth-types" "0.2.7"
+ "@atproto/jwk" "0.3.0"
+ "@atproto/oauth-types" "0.3.0"
-"@atproto/oauth-provider-frontend@0.1.5":
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/@atproto/oauth-provider-frontend/-/oauth-provider-frontend-0.1.5.tgz#66fd8760fade2ac94111ad5389f33f4d8ce5bba2"
- integrity sha512-FdDBuwy827+etjIcRwZU7dtxa8Ltso3ufVLMEi8A2V91v21XDysZjLANC6cvmNNSUcS4E/J6ZAwTrQDo7O5axw==
+"@atproto/oauth-provider-frontend@0.1.8":
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/@atproto/oauth-provider-frontend/-/oauth-provider-frontend-0.1.8.tgz#21d944566c63f54524f239a10f7c65d150982f40"
+ integrity sha512-uqfHv+n2xq7vTpuBP1Red7PhpaAbbJbwSbRsSfplJQ16XmF5NCMU8dHGCGRTEHngLZ9UquuIefN3w1QTrNzD0w==
optionalDependencies:
- "@atproto/oauth-provider-api" "0.1.2"
+ "@atproto/oauth-provider-api" "0.1.4"
-"@atproto/oauth-provider-ui@0.1.6":
- version "0.1.6"
- resolved "https://registry.yarnpkg.com/@atproto/oauth-provider-ui/-/oauth-provider-ui-0.1.6.tgz#4bae995ff57671ac3915f58fdb2cf6a76a0fe42d"
- integrity sha512-pJzV9ouNj1/TDUCl3CWEZrHoUese4lcKx5F59t2OiLFm2K7T7QrszKUIMyU5QdiQHv551B0ZJOkJ8+4b/fVGPA==
+"@atproto/oauth-provider-ui@0.1.9":
+ version "0.1.9"
+ resolved "https://registry.yarnpkg.com/@atproto/oauth-provider-ui/-/oauth-provider-ui-0.1.9.tgz#8c43a1affa94ecb537072e6d569b8a24cdd42e72"
+ integrity sha512-a6/VAeQWRMxpgnqo/TuqXg3EW2tO68jLh8Mv1uyV1NiZbT7fNlgkII/djIl3fLoEa95I3p236NZxjhKELSBbGg==
optionalDependencies:
- "@atproto/oauth-provider-api" "0.1.2"
+ "@atproto/oauth-provider-api" "0.1.4"
-"@atproto/oauth-provider@^0.7.8":
- version "0.7.8"
- resolved "https://registry.yarnpkg.com/@atproto/oauth-provider/-/oauth-provider-0.7.8.tgz#287b15eb6b0bc0bb4b2da2339150253db006c6e0"
- integrity sha512-+dEU9dTyfWKeZ/Nu7ocR6fO73RcG0vwDjT45vgcnM9L7jtuPk9zfpmiR4ODYBk9QUu2DURo9yBhtXNJI3Yz8aQ==
+"@atproto/oauth-provider@^0.9.1":
+ version "0.9.1"
+ resolved "https://registry.yarnpkg.com/@atproto/oauth-provider/-/oauth-provider-0.9.1.tgz#0147b75d1ad444455159f0a687ce87b3b49a2894"
+ integrity sha512-2Gm3jv45cGLmUQV0C4/orCJBsHu4wajy+JTN9f/ATX3vvjnFtAd/1GRvAMKDGXtdF7VIjNFlD+4lqhoDxYJpng==
dependencies:
"@atproto-labs/fetch" "0.2.3"
"@atproto-labs/fetch-node" "0.1.9"
@@ -319,12 +319,13 @@
"@atproto-labs/simple-store" "0.2.0"
"@atproto-labs/simple-store-memory" "0.1.3"
"@atproto/common" "^0.4.11"
- "@atproto/jwk" "0.1.5"
- "@atproto/jwk-jose" "0.1.6"
- "@atproto/oauth-provider-api" "0.1.2"
- "@atproto/oauth-provider-frontend" "0.1.5"
- "@atproto/oauth-provider-ui" "0.1.6"
- "@atproto/oauth-types" "0.2.7"
+ "@atproto/did" "0.1.5"
+ "@atproto/jwk" "0.3.0"
+ "@atproto/jwk-jose" "0.1.8"
+ "@atproto/oauth-provider-api" "0.1.4"
+ "@atproto/oauth-provider-frontend" "0.1.8"
+ "@atproto/oauth-provider-ui" "0.1.9"
+ "@atproto/oauth-types" "0.3.0"
"@atproto/syntax" "0.4.0"
"@hapi/accept" "^6.0.3"
"@hapi/address" "^5.1.1"
@@ -338,27 +339,27 @@
jose "^5.2.0"
zod "^3.23.8"
-"@atproto/oauth-types@0.2.7":
- version "0.2.7"
- resolved "https://registry.yarnpkg.com/@atproto/oauth-types/-/oauth-types-0.2.7.tgz#c210868052f8babd98510c19816e3d9a156b33c7"
- integrity sha512-2SlDveiSI0oowC+sfuNd/npV8jw/FhokSS26qyUyldTg1g9ZlhxXUfMP4IZOPeZcVn9EszzQRHs1H9ZJqVQIew==
+"@atproto/oauth-types@0.3.0":
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/@atproto/oauth-types/-/oauth-types-0.3.0.tgz#8d49d939486ac281bc13d0b1fe4462b7e519fdf0"
+ integrity sha512-ptfsJARKODXfuOoDQag4a6PpEkDEj4Urz3jOmnQZy2YspPc/TNm1o0HglU0YehELv1vfhh9gEz40BJztPPhiLA==
dependencies:
- "@atproto/jwk" "0.1.5"
+ "@atproto/jwk" "0.3.0"
zod "^3.23.8"
-"@atproto/ozone@^0.1.112":
- version "0.1.112"
- resolved "https://registry.yarnpkg.com/@atproto/ozone/-/ozone-0.1.112.tgz#6b6b5ac052dd4e6dfec3c88f83c9b53f4902fcbe"
- integrity sha512-Euut64N/4UyRXyV6m1ATE9K6o6EpCf46ozD4GG8HJ9AC5zEgBYMSkH4l6SLrhKrYYIGXkvglk1WYuuDQKYb3LA==
+"@atproto/ozone@^0.1.121":
+ version "0.1.121"
+ resolved "https://registry.yarnpkg.com/@atproto/ozone/-/ozone-0.1.121.tgz#309b7e876f3b598ed4e79bb5a79e2346931588fe"
+ integrity sha512-kc3NxiXSPqQmWz8yXlV5cFnZ469ViQd0AexEMw467AcB8ikK1WSxhLsa1EiNAQuLOOpyeXSmAKGAUFHzSOIMpw==
dependencies:
- "@atproto/api" "^0.15.9"
+ "@atproto/api" "^0.15.16"
"@atproto/common" "^0.4.11"
"@atproto/crypto" "^0.4.4"
"@atproto/identity" "^0.4.8"
"@atproto/lexicon" "^0.4.11"
"@atproto/syntax" "^0.4.0"
"@atproto/xrpc" "^0.7.0"
- "@atproto/xrpc-server" "^0.7.18"
+ "@atproto/xrpc-server" "^0.8.0"
"@did-plc/lib" "^0.0.1"
compression "^1.7.4"
cors "^2.8.5"
@@ -376,24 +377,24 @@
undici "^6.14.1"
ws "^8.12.0"
-"@atproto/pds@^0.4.139":
- version "0.4.139"
- resolved "https://registry.yarnpkg.com/@atproto/pds/-/pds-0.4.139.tgz#70ae5afd7d90eab214c652d57a5e6478af454fbe"
- integrity sha512-VD1VTSAnbAme4D4Xk/Wdl05qs8YbCe39/i960EyXzw2fYNvL9jMpKm3z0lwhrYN9q7phFhr2ubU2QjfRFDbDAQ==
+"@atproto/pds@^0.4.150":
+ version "0.4.150"
+ resolved "https://registry.yarnpkg.com/@atproto/pds/-/pds-0.4.150.tgz#45686b05b8ed46e265efa5231ab16e6eda72a8e8"
+ integrity sha512-CPT6H2uDTe4ZAyxQbws2dIlmdFFf6GQGwMc0OE3kI1wBBaLHprpexjM2Gd4ObtYNxGOOV0fwoCDAth8qqZ4XVw==
dependencies:
"@atproto-labs/fetch-node" "0.1.9"
- "@atproto-labs/xrpc-utils" "0.0.14"
- "@atproto/api" "^0.15.9"
- "@atproto/aws" "^0.2.21"
+ "@atproto-labs/xrpc-utils" "0.0.16"
+ "@atproto/api" "^0.15.16"
+ "@atproto/aws" "^0.2.22"
"@atproto/common" "^0.4.11"
"@atproto/crypto" "^0.4.4"
"@atproto/identity" "^0.4.8"
"@atproto/lexicon" "^0.4.11"
- "@atproto/oauth-provider" "^0.7.8"
- "@atproto/repo" "^0.8.1"
+ "@atproto/oauth-provider" "^0.9.1"
+ "@atproto/repo" "^0.8.2"
"@atproto/syntax" "^0.4.0"
"@atproto/xrpc" "^0.7.0"
- "@atproto/xrpc-server" "^0.7.18"
+ "@atproto/xrpc-server" "^0.8.0"
"@did-plc/lib" "^0.0.4"
"@hapi/address" "^5.1.1"
better-sqlite3 "^10.0.0"
@@ -423,10 +424,10 @@
undici "^6.19.8"
zod "^3.23.8"
-"@atproto/repo@^0.8.1":
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/@atproto/repo/-/repo-0.8.1.tgz#be8c6b93c000944b81aaa1026d6c50d82c025d74"
- integrity sha512-d1NtHhXYJVJlFVI6mbVOUnpB0rnhqxPnZcALkJoYJjaDPVr4NNqRFAtrwb+GHzxT6DhijoXYQf24pKGfEFDd4g==
+"@atproto/repo@^0.8.2":
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/@atproto/repo/-/repo-0.8.2.tgz#7953cb2c637c94505da76f74a784b2aae050c204"
+ integrity sha512-lP0g5Uw3TUC2Tc7te8YKCpRoIhBYI+Uvn11fupGEaMcMjgLdYtB0Kc0AiqWXF42KqlBG9dAEoJITi2GRzDNHUg==
dependencies:
"@atproto/common" "^0.4.11"
"@atproto/common-web" "^0.4.2"
@@ -438,17 +439,17 @@
varint "^6.0.0"
zod "^3.23.8"
-"@atproto/sync@^0.1.23":
- version "0.1.23"
- resolved "https://registry.yarnpkg.com/@atproto/sync/-/sync-0.1.23.tgz#01d4ecf9d5ddc624d14e8fb98927f0b2a97eafeb"
- integrity sha512-1ItRNHMLMcBeTziOZpxS4Q+ha2enQce3fSiAQaCpLCQ8VTNq1D1aRR6ePZCQFzab9jDDtBz0v4FufOnMByRIeg==
+"@atproto/sync@^0.1.26":
+ version "0.1.26"
+ resolved "https://registry.yarnpkg.com/@atproto/sync/-/sync-0.1.26.tgz#6be2876be612d9cd704452598ee679b2e912cfe3"
+ integrity sha512-bpUIajtPrE3RgFW8mIfrI4EM/LJ4JjQhI5fsqc78zCHZawuflpllf1aH70roDWWiskMWoiLWnVRxdYXdeEgbXA==
dependencies:
"@atproto/common" "^0.4.11"
"@atproto/identity" "^0.4.8"
"@atproto/lexicon" "^0.4.11"
- "@atproto/repo" "^0.8.1"
+ "@atproto/repo" "^0.8.2"
"@atproto/syntax" "^0.4.0"
- "@atproto/xrpc-server" "^0.7.18"
+ "@atproto/xrpc-server" "^0.8.0"
multiformats "^9.9.0"
p-queue "^6.6.2"
ws "^8.12.0"
@@ -458,10 +459,10 @@
resolved "https://registry.yarnpkg.com/@atproto/syntax/-/syntax-0.4.0.tgz#bec71552087bb24c208a06ef418c0040b65542f2"
integrity sha512-b9y5ceHS8YKOfP3mdKmwAx5yVj9294UN7FG2XzP6V5aKUdFazEYRnR9m5n5ZQFKa3GNvz7de9guZCJ/sUTcOAA==
-"@atproto/xrpc-server@^0.7.18":
- version "0.7.18"
- resolved "https://registry.yarnpkg.com/@atproto/xrpc-server/-/xrpc-server-0.7.18.tgz#7cb6e517da2afec1c9bee70d92c07667a80718ec"
- integrity sha512-kjlAsI+UNbbm6AK3Y5Hb4BJ7VQHNKiYYu2kX5vhZJZHO8qfO40GPYYb/2TknZV8IG6fDPBQhUpcDRolI86sgag==
+"@atproto/xrpc-server@^0.8.0":
+ version "0.8.0"
+ resolved "https://registry.yarnpkg.com/@atproto/xrpc-server/-/xrpc-server-0.8.0.tgz#a32c9c71411ec6ee476fcd0260d5e9e80be348bd"
+ integrity sha512-jDAEVHVhM4IvC0y491gXBuD4b1D9/XrM3HaEronRneAdNZ0qE0nsiJNqiHfQ6r4BvFdHnABM9KyHV9EQTvmxfg==
dependencies:
"@atproto/common" "^0.4.11"
"@atproto/crypto" "^0.4.4"
@@ -3762,29 +3763,29 @@
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.47.0.tgz#5478fdf443ff8158f9de171c704ae45308696c7d"
integrity sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==
-"@expo/cli@0.24.10":
- version "0.24.10"
- resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.24.10.tgz#f23d150f011cdebd6f503343d9be3c6283fb4096"
- integrity sha512-auPE4MSRdkJkHsWJk935VoqX/BGMKARgXOLtJybTFUi64K3MkvdUoBrujcn/QzXl5DTGhacFd9qxUeQss6/qwg==
+"@expo/cli@0.24.14":
+ version "0.24.14"
+ resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.24.14.tgz#af2e7ea5a08e3574e868cb0ec2110e68d32672e0"
+ integrity sha512-o+QYyfIBhSRTgaywKTLJhm2Fg5PrSeUVCXS+uQySamgoMjLNhHa8QwE64mW/FmJr5hZLiqUEQxb60FK4JcyqXg==
dependencies:
"@0no-co/graphql.web" "^1.0.8"
"@babel/runtime" "^7.20.0"
"@expo/code-signing-certificates" "^0.0.5"
- "@expo/config" "~11.0.7"
+ "@expo/config" "~11.0.10"
"@expo/config-plugins" "~10.0.2"
"@expo/devcert" "^1.1.2"
"@expo/env" "~1.0.5"
"@expo/image-utils" "^0.7.4"
"@expo/json-file" "^9.1.4"
- "@expo/metro-config" "~0.20.12"
+ "@expo/metro-config" "~0.20.14"
"@expo/osascript" "^2.2.4"
"@expo/package-manager" "^1.8.4"
"@expo/plist" "^0.3.4"
- "@expo/prebuild-config" "^9.0.5"
+ "@expo/prebuild-config" "^9.0.6"
"@expo/spawn-async" "^1.7.2"
"@expo/ws-tunnel" "^1.0.1"
"@expo/xcpretty" "^4.3.0"
- "@react-native/dev-middleware" "0.79.2"
+ "@react-native/dev-middleware" "0.79.3"
"@urql/core" "^5.0.6"
"@urql/exchange-retry" "^1.3.0"
accepts "^1.3.8"
@@ -3799,9 +3800,9 @@
debug "^4.3.4"
env-editor "^0.4.1"
freeport-async "^2.0.0"
- getenv "^1.0.0"
+ getenv "^2.0.0"
glob "^10.4.2"
- lan-network "^0.1.4"
+ lan-network "^0.1.6"
minimatch "^9.0.0"
node-forge "^1.3.1"
npm-package-arg "^11.0.0"
@@ -3857,7 +3858,7 @@
xcode "^3.0.1"
xml2js "0.6.0"
-"@expo/config-plugins@~10.0.1", "@expo/config-plugins@~10.0.2":
+"@expo/config-plugins@~10.0.2":
version "10.0.2"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-10.0.2.tgz#040867991e9c8c527b4f5c13a47bcf040a7479fe"
integrity sha512-TzUn3pPdpwCS0yYaSlZOClgDmCX8N4I2lfgitX5oStqmvpPtB+vqtdyqsVM02fQ2tlJIAqwBW+NHaHqqy8Jv7g==
@@ -3912,6 +3913,11 @@
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-53.0.3.tgz#d083d9b095972e89eee96c41d085feb5b92d2749"
integrity sha512-V1e6CiM4TXtGxG/W2Msjp/QOx/vikLo5IUGMvEMjgAglBfGYx3PXfqsUb5aZDt6kqA3bDDwFuZoS5vNm/SYwSg==
+"@expo/config-types@^53.0.4":
+ version "53.0.4"
+ resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-53.0.4.tgz#fe64fac734531ae883d18529b32586c23ffb1ceb"
+ integrity sha512-0s+9vFx83WIToEr0Iwy4CcmiUXa5BgwBmEjylBB2eojX5XAMm9mJvw9KpjAb8m7zq2G0Q6bRbeufkzgbipuNQg==
+
"@expo/config@~10.0.4":
version "10.0.5"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-10.0.5.tgz#2de75e3f5d46a55f9f5140b73e0913265e6a41c6"
@@ -3931,14 +3937,14 @@
slugify "^1.3.4"
sucrase "3.35.0"
-"@expo/config@~11.0.6", "@expo/config@~11.0.7":
- version "11.0.7"
- resolved "https://registry.yarnpkg.com/@expo/config/-/config-11.0.7.tgz#e6a6071942854269825e2450c3a115c963a4fd56"
- integrity sha512-pppH3Cy2IfituiYACMeW7cWYezcjmHKq7lDLfH1gMHT+zZ1QaYNs3EN6Kcc/QAXV//KFFhU0Qq4H/UrLuPp/yg==
+"@expo/config@~11.0.10", "@expo/config@~11.0.9":
+ version "11.0.10"
+ resolved "https://registry.yarnpkg.com/@expo/config/-/config-11.0.10.tgz#559d9425a4e0de4fab96ccac01ff40f5cebbc04b"
+ integrity sha512-8S8Krr/c5lnl0eF03tA2UGY9rGBhZcbWKz2UWw5dpL/+zstwUmog8oyuuC8aRcn7GiTQLlbBkxcMeT8sOGlhbA==
dependencies:
"@babel/code-frame" "~7.10.4"
- "@expo/config-plugins" "~10.0.1"
- "@expo/config-types" "^53.0.3"
+ "@expo/config-plugins" "~10.0.2"
+ "@expo/config-types" "^53.0.4"
"@expo/json-file" "^9.1.4"
deepmerge "^4.3.1"
getenv "^1.0.0"
@@ -3991,23 +3997,24 @@
dotenv-expand "~11.0.6"
getenv "^1.0.0"
-"@expo/fingerprint@0.12.4":
- version "0.12.4"
- resolved "https://registry.yarnpkg.com/@expo/fingerprint/-/fingerprint-0.12.4.tgz#d4cc4de50e7b6d4e03b0d38850d1e4a136b74c8c"
- integrity sha512-HOJVvjiQYVHIouCOfFf4JRrQvBDIV/12GVG2iwbw1iGwmpQVkPgEXa9lN0f2yuS4J3QXHs73wr9jvuCjMmJlfw==
+"@expo/fingerprint@0.13.0":
+ version "0.13.0"
+ resolved "https://registry.yarnpkg.com/@expo/fingerprint/-/fingerprint-0.13.0.tgz#5f5600122940ac381ed697743c10bdbddf6c55c1"
+ integrity sha512-3IwpH0p3uO8jrJSLOUNDzJVh7VEBod0emnCBq0hD72sy6ICmzauM6Xf4he+2Tip7fzImCJRd63GaehV+CCtpvA==
dependencies:
"@expo/spawn-async" "^1.7.2"
arg "^5.0.2"
chalk "^4.1.2"
debug "^4.3.4"
find-up "^5.0.0"
- getenv "^1.0.0"
+ getenv "^2.0.0"
+ ignore "^5.3.1"
minimatch "^9.0.0"
p-limit "^3.1.0"
resolve-from "^5.0.0"
semver "^7.6.0"
-"@expo/html-elements@^0.12.4":
+"@expo/html-elements@^0.12.5":
version "0.12.5"
resolved "https://registry.yarnpkg.com/@expo/html-elements/-/html-elements-0.12.5.tgz#be7e7af9f2be6d3f1aa3ec2e7ae1c121c91a9aa1"
integrity sha512-28KWO88YKykKU7ke5sEQs5TivFRMs1Aktz13xxgqAf5rTgb+lka0VKVt3W2fG7ksbUQ407rtUqz7SEAq298NvQ==
@@ -4054,16 +4061,16 @@
json5 "^2.2.3"
write-file-atomic "^2.3.0"
-"@expo/metro-config@0.20.12", "@expo/metro-config@~0.20.12":
- version "0.20.12"
- resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.20.12.tgz#f6e2c33a305cb0ab8b0aa0dadafd6adf09058b9c"
- integrity sha512-O9zaAF3gH76EXkwuQCpXLKC5dBy344/pqoszWmtOloKo4gJy74aNPUy2LRS57pDHyjZe1HjrxVkMcr7lZCIsag==
+"@expo/metro-config@0.20.14", "@expo/metro-config@~0.20.14":
+ version "0.20.14"
+ resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.20.14.tgz#5abf8cd6454fe7f75c1f8529cf79619da32af82d"
+ integrity sha512-tYDDubuZycK+NX00XN7BMu73kBur/evOPcKfxc+UBeFfgN2EifOITtdwSUDdRsbtJ2OnXwMY1HfRUG3Lq3l4cw==
dependencies:
"@babel/core" "^7.20.0"
"@babel/generator" "^7.20.5"
"@babel/parser" "^7.20.0"
"@babel/types" "^7.20.0"
- "@expo/config" "~11.0.7"
+ "@expo/config" "~11.0.9"
"@expo/env" "~1.0.5"
"@expo/json-file" "~9.1.4"
"@expo/spawn-async" "^1.7.2"
@@ -4126,14 +4133,14 @@
base64-js "^1.2.3"
xmlbuilder "^15.1.1"
-"@expo/prebuild-config@^9.0.5":
- version "9.0.5"
- resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-9.0.5.tgz#b8b864b5e19489a1f66442ae30d5d7295f658297"
- integrity sha512-oiSVU5ePu9lsOvn5p4xplqjzPlcZHzKYwzuonTa9GCH1GxcOEIBsvMVQiHBXHtqvgV2dztjm34kdXV//+9jtCA==
+"@expo/prebuild-config@^9.0.6":
+ version "9.0.6"
+ resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-9.0.6.tgz#f634e7b8f9ebebeaf2e7d2f2be46926c23834d2b"
+ integrity sha512-HDTdlMkTQZ95rd6EpvuLM+xkZV03yGLc38FqI37qKFLJtUN1WnYVaWsuXKoljd1OrVEVsHe6CfqKwaPZ52D56Q==
dependencies:
- "@expo/config" "~11.0.7"
+ "@expo/config" "~11.0.9"
"@expo/config-plugins" "~10.0.2"
- "@expo/config-types" "^53.0.3"
+ "@expo/config-types" "^53.0.4"
"@expo/image-utils" "^0.7.4"
"@expo/json-file" "^9.1.4"
"@react-native/normalize-colors" "0.79.2"
@@ -4402,10 +4409,10 @@
protobufjs "^7.2.5"
yargs "^17.7.2"
-"@haileyok/bluesky-video@0.2.6":
- version "0.2.6"
- resolved "https://registry.yarnpkg.com/@haileyok/bluesky-video/-/bluesky-video-0.2.6.tgz#61bb4ff908498558fd2320f06ba0f74ea03598b4"
- integrity sha512-IlzrTATD7ci/a+ehSA7pIhOvxxNTe35zdzBYt8EmVvKKafyeFhxGfDuuP5qxfQmHurcQMIL+3HeZgnAXwQQNmQ==
+"@haileyok/bluesky-video@0.3.1":
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/@haileyok/bluesky-video/-/bluesky-video-0.3.1.tgz#c996d8433e8f1988f2e9644adf39366fb4305d00"
+ integrity sha512-TU5c0RCV1yWF/HEZA22E0qXjxNzu0SOuMZpvdo+QVrO4tQcja9k8nHBbKRmyj60Odke4HQMoTOfNDNq/xo2Grw==
"@hapi/accept@^6.0.3":
version "6.0.3"
@@ -5105,12 +5112,11 @@
"@babel/runtime" "^7.20.13"
"@lingui/core" "4.14.1"
-"@mattermost/react-native-paste-input@^0.7.1":
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/@mattermost/react-native-paste-input/-/react-native-paste-input-0.7.1.tgz#f14585030b992cf7c9bbd0921225eefa501756ba"
- integrity sha512-kY8LKtqRX2T/rtn/HNrzTitijuATvyzd6yl5WNWOsszmyzNcssKStjjCTBup04CyMxfwutUU1CWrYUb3hQO7oA==
+"@mattermost/react-native-paste-input@mattermost/react-native-paste-input":
+ version "0.8.1"
+ resolved "https://codeload.github.com/mattermost/react-native-paste-input/tar.gz/f260447edc645a817ab1ba7b46d8341d84dba8e9"
dependencies:
- semver "7.6.0"
+ semver "7.6.3"
"@messageformat/parser@^5.0.0":
version "5.1.0"
@@ -5119,12 +5125,12 @@
dependencies:
moo "^0.5.1"
-"@miblanchard/react-native-slider@^2.3.1":
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/@miblanchard/react-native-slider/-/react-native-slider-2.3.1.tgz#79e0f1f9b1ce43ef25ee51ee9256c012e5dfa412"
- integrity sha512-J/hZDBWmXq8fJeOnTVHqIUVDHshqMSpJVxJ4WqwuCBKl5Rke9OBYXIdkSlgi75OgtScAr8FKK5KNkDKHUf6JIg==
+"@miblanchard/react-native-slider@^2.6.0":
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/@miblanchard/react-native-slider/-/react-native-slider-2.6.0.tgz#9f78c805d637ffaff0e3e7429932d2995a67edc9"
+ integrity sha512-o7hk/f/8vkqh6QNR5L52m+ws846fQeD/qNCC9CCSRdBqjq66KiCgbxzlhRzKM/gbtxcvMYMIEEJ1yes5cr6I3A==
-"@mozzius/expo-dynamic-app-icon@^1.5.0":
+"@mozzius/expo-dynamic-app-icon@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@mozzius/expo-dynamic-app-icon/-/expo-dynamic-app-icon-1.5.0.tgz#c5f88c309965b6d6b89cfd5e2c00faa7bda736af"
integrity sha512-yE2yEPO+HQmOqsX7cECh7/vu/LXnqhHGsVm3UiVi/3gaK8u5hAkPTNzZ0Qu6vnMwjPnY+uFbN6X+6Aj9c9yjMQ==
@@ -6127,23 +6133,23 @@
resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.11.0.tgz#4587fbce6a382adedad74311e96ee10bb2b2d63a"
integrity sha512-QuZU6gbxmOID5zZgd/H90NgBnbJ3VV6qVzp6c7/dDrmWdX8S0X5YFYgDcQFjE3dRen9wB9FWnj2VVdPU64adSg==
-"@react-native/assets-registry@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.79.2.tgz#731963e664c8543f5b277e56c058bde612b69f50"
- integrity sha512-5h2Z7/+/HL/0h88s0JHOdRCW4CXMCJoROxqzHqxdrjGL6EBD1DdaB4ZqkCOEVSW4Vjhir5Qb97C8i/MPWEYPtg==
+"@react-native/assets-registry@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.79.3.tgz#022218d55a5d9d221a6d176987ab0b35c10d388b"
+ integrity sha512-Vy8DQXCJ21YSAiHxrNBz35VqVlZPpRYm50xRTWRf660JwHuJkFQG8cUkrLzm7AUriqUXxwpkQHcY+b0ibw9ejQ==
-"@react-native/babel-plugin-codegen@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.79.2.tgz#f3f86766a01487aaaa623ec62514af4c84400953"
- integrity sha512-d+NB7Uosn2ZWd4O4+7ZkB6q1a+0z2opD/4+Bzhk/Tv6fc5FrSftK2Noqxvo3/bhbdGFVPxf0yvLE8et4W17x/Q==
+"@react-native/babel-plugin-codegen@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.79.3.tgz#acad4acaead398a8c8bcdecbe44040aa0c2dc2d7"
+ integrity sha512-Zb8F4bSEKKZfms5n1MQ0o5mudDcpAINkKiFuFTU0PErYGjY3kZ+JeIP+gS6KCXsckxCfMEKQwqKicP/4DWgsZQ==
dependencies:
"@babel/traverse" "^7.25.3"
- "@react-native/codegen" "0.79.2"
+ "@react-native/codegen" "0.79.3"
-"@react-native/babel-preset@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.79.2.tgz#5a683a6efeea357a326f70c84a881be2bafbeae3"
- integrity sha512-/HNu869oUq4FUXizpiNWrIhucsYZqu0/0spudJEzk9SEKar0EjVDP7zkg/sKK+KccNypDQGW7nFXT8onzvQ3og==
+"@react-native/babel-preset@0.79.2", "@react-native/babel-preset@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.79.3.tgz#8ad6c149cd488fbc18d62983119bdcbfc15ff651"
+ integrity sha512-VHGNP02bDD2Ul1my0pLVwe/0dsEBHxR343ySpgnkCNEEm9C1ANQIL2wvnJrHZPcqfAkWfFQ8Ln3t+6fdm4A/Dg==
dependencies:
"@babel/core" "^7.25.2"
"@babel/plugin-proposal-export-default-from" "^7.24.7"
@@ -6186,15 +6192,15 @@
"@babel/plugin-transform-typescript" "^7.25.2"
"@babel/plugin-transform-unicode-regex" "^7.24.7"
"@babel/template" "^7.25.0"
- "@react-native/babel-plugin-codegen" "0.79.2"
+ "@react-native/babel-plugin-codegen" "0.79.3"
babel-plugin-syntax-hermes-parser "0.25.1"
babel-plugin-transform-flow-enums "^0.0.2"
react-refresh "^0.14.0"
-"@react-native/codegen@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.79.2.tgz#75270d8162e78c02b0272396a3c6942e39e8703d"
- integrity sha512-8JTlGLuLi1p8Jx2N/enwwEd7/2CfrqJpv90Cp77QLRX3VHF2hdyavRIxAmXMwN95k+Me7CUuPtqn2X3IBXOWYg==
+"@react-native/codegen@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.79.3.tgz#49689132718c81a3b25426769bc6fd8fd2a0469f"
+ integrity sha512-CZejXqKch/a5/s/MO5T8mkAgvzCXgsTkQtpCF15kWR9HN8T+16k0CsN7TXAxXycltoxiE3XRglOrZNEa/TiZUQ==
dependencies:
glob "^7.1.1"
hermes-parser "0.25.1"
@@ -6202,12 +6208,12 @@
nullthrows "^1.1.1"
yargs "^17.6.2"
-"@react-native/community-cli-plugin@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.79.2.tgz#d3a0efbdfb554cf3a7e9bfb27865a7caeeeaa1b3"
- integrity sha512-E+YEY2dL+68HyR2iahsZdyBKBUi9QyPyaN9vsnda1jNgCjNpSPk2yAF5cXsho+zKK5ZQna3JSeE1Kbi2IfGJbw==
+"@react-native/community-cli-plugin@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.79.3.tgz#84821d3401074e036ba05b8b6ca1ee122cb43e29"
+ integrity sha512-N/+p4HQqN4yK6IRzn7OgMvUIcrmEWkecglk1q5nj+AzNpfIOzB+mqR20SYmnPfeXF+mZzYCzRANb3KiM+WsSDA==
dependencies:
- "@react-native/dev-middleware" "0.79.2"
+ "@react-native/dev-middleware" "0.79.3"
chalk "^4.0.0"
debug "^2.2.0"
invariant "^2.2.4"
@@ -6216,18 +6222,18 @@
metro-core "^0.82.0"
semver "^7.1.3"
-"@react-native/debugger-frontend@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.79.2.tgz#1377de6d9cabe5455bf332e06408167da5f60c19"
- integrity sha512-cGmC7X6kju76DopSBNc+PRAEetbd7TWF9J9o84hOp/xL3ahxR2kuxJy0oJX8Eg8oehhGGEXTuMKHzNa3rDBeSg==
+"@react-native/debugger-frontend@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.79.3.tgz#9cb57d8e88c22552194ab5f6f257605b151bc5b3"
+ integrity sha512-ImNDuEeKH6lEsLXms3ZsgIrNF94jymfuhPcVY5L0trzaYNo9ZFE9Ni2/18E1IbfXxdeIHrCSBJlWD6CTm7wu5A==
-"@react-native/dev-middleware@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.79.2.tgz#f09f1a75b4cd0b56dfd82a07bf41157a9c45619c"
- integrity sha512-9q4CpkklsAs1L0Bw8XYCoqqyBSrfRALGEw4/r0EkR38Y/6fVfNfdsjSns0pTLO6h0VpxswK34L/hm4uK3MoLHw==
+"@react-native/dev-middleware@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.79.3.tgz#3e315ef7516ebad60a4202b4094d84fedecb4064"
+ integrity sha512-x88+RGOyG71+idQefnQg7wLhzjn/Scs+re1O5vqCkTVzRAc/f7SdHMlbmECUxJPd08FqMcOJr7/X3nsJBrNuuw==
dependencies:
"@isaacs/ttlcache" "^1.4.1"
- "@react-native/debugger-frontend" "0.79.2"
+ "@react-native/debugger-frontend" "0.79.3"
chrome-launcher "^0.15.2"
chromium-edge-launcher "^0.2.0"
connect "^3.6.5"
@@ -6238,14 +6244,14 @@
serve-static "^1.16.2"
ws "^6.2.3"
-"@react-native/eslint-config@^0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/eslint-config/-/eslint-config-0.79.2.tgz#b42c95fe2399aae84209356b0971dd68c4149e4e"
- integrity sha512-ukb9qGvrFC/3YVlWVy/GGM+auKdGIsbbumCyfOYPfUdhHFWA/twz1zK4bJQmCZ38iINuTENYedRzoE+U57GclA==
+"@react-native/eslint-config@^0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/eslint-config/-/eslint-config-0.79.3.tgz#a72352ce98a7d05b5686dc446ba933fee3b944a9"
+ integrity sha512-pvPXfXFoVfwqGEItIl7emv6bRTpi0NWv4jmb0ZBwSJ7+zM8bRRw7JwxLA+iwrevh0QAqrF66Nu5xl39ysWcavg==
dependencies:
"@babel/core" "^7.25.2"
"@babel/eslint-parser" "^7.25.1"
- "@react-native/eslint-plugin" "0.79.2"
+ "@react-native/eslint-plugin" "0.79.3"
"@typescript-eslint/eslint-plugin" "^7.1.1"
"@typescript-eslint/parser" "^7.1.1"
eslint-config-prettier "^8.5.0"
@@ -6256,35 +6262,35 @@
eslint-plugin-react-hooks "^4.6.0"
eslint-plugin-react-native "^4.0.0"
-"@react-native/eslint-plugin@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/eslint-plugin/-/eslint-plugin-0.79.2.tgz#23d18226bb4335404e6db561bf1a47ac7d1380ed"
- integrity sha512-Abu+0OuwTje9E5eQOvYpTUuXvDgGjHeFhnfNVY9BXalBK8OrX20EFlonWvIbFqii136eS5KLEBm2Wjqk2V5XJg==
+"@react-native/eslint-plugin@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/eslint-plugin/-/eslint-plugin-0.79.3.tgz#c1ac34d45b92f963b9af66e860c45cd891235741"
+ integrity sha512-6QZzCsV+Wc+HdOAMMoMqDea3SSzsvBBktGc/cqaLubKGiztTb22d+vtzZGWqCqUEVkhQKdK7qhWAs0kJPEbiXw==
-"@react-native/gradle-plugin@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.79.2.tgz#d41d4e2c63baf688a2b47652c6260f2a2f1ec091"
- integrity sha512-6MJFemrwR0bOT0QM+2BxX9k3/pvZQNmJ3Js5pF/6owsA0cUDiCO57otiEU8Fz+UywWEzn1FoQfOfQ8vt2GYmoA==
+"@react-native/gradle-plugin@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.79.3.tgz#69ba47ac406ccdb3b3829f311bd7c27e6fad7ebc"
+ integrity sha512-imfpZLhNBc9UFSzb/MOy2tNcIBHqVmexh/qdzw83F75BmUtLb/Gs1L2V5gw+WI1r7RqDILbWk7gXB8zUllwd+g==
-"@react-native/js-polyfills@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.79.2.tgz#15eb4da0fe9e8d61d2980d08fd06b5f49e133b0f"
- integrity sha512-IaY87Ckd4GTPMkO1/Fe8fC1IgIx3vc3q9Tyt/6qS3Mtk9nC0x9q4kSR5t+HHq0/MuvGtu8HpdxXGy5wLaM+zUw==
+"@react-native/js-polyfills@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.79.3.tgz#bf5614363f118c6bdf2f773c578e603c88d0425c"
+ integrity sha512-PEBtg6Kox6KahjCAch0UrqCAmHiNLEbp2SblUEoFAQnov4DSxBN9safh+QSVaCiMAwLjvNfXrJyygZz60Dqz3Q==
-"@react-native/normalize-colors@0.79.2", "@react-native/normalize-colors@^0.73.0", "@react-native/normalize-colors@^0.74.1":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.79.2.tgz#9ab70ca257c7411e4ab74cf7f91332c27d39cc6f"
- integrity sha512-+b+GNrupWrWw1okHnEENz63j7NSMqhKeFMOyzYLBwKcprG8fqJQhDIGXfizKdxeIa5NnGSAevKL1Ev1zJ56X8w==
+"@react-native/normalize-colors@0.79.2", "@react-native/normalize-colors@0.79.3", "@react-native/normalize-colors@^0.73.0", "@react-native/normalize-colors@^0.74.1":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.79.3.tgz#e491937436a2c287707e24263308c818a66eb447"
+ integrity sha512-T75NIQPRFCj6DFMxtcVMJTZR+3vHXaUMSd15t+CkJpc5LnyX91GVaPxpRSAdjFh7m3Yppl5MpdjV/fntImheYQ==
-"@react-native/typescript-config@^0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/typescript-config/-/typescript-config-0.79.2.tgz#02cb07db89ef80159b3c1b3e82e81b0c0d5ce908"
- integrity sha512-krHAkkPRCOEhuqN3iwRUwIyE1rAnUQ9//huzUc1ukcoQ7Y4qFxM6amhNloAmYn4QH1Ay6o5At00VbEh2xoHISA==
+"@react-native/typescript-config@^0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/typescript-config/-/typescript-config-0.79.3.tgz#21101b591c67ecef6ae5189f96a448b3bcaf1e9e"
+ integrity sha512-dqKAU8D3NkExthnpBOPZjZ/NGU5qqBaqZ12v9IlMqP9sVTWSuY1iswfzomp0AYeJBxo4ZpBNmrdlnQZYQSVWiw==
-"@react-native/virtualized-lists@0.79.2":
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.79.2.tgz#ed5a419a30b7ddec978b7816ff698a9d85507e15"
- integrity sha512-9G6ROJeP+rdw9Bvr5ruOlag11ET7j1z/En1riFFNo6W3xZvJY+alCuH1ttm12y9+zBm4n8jwCk4lGhjYaV4dKw==
+"@react-native/virtualized-lists@0.79.3":
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.79.3.tgz#4a2799017cd3795f519422f48b3c0bbc4739a245"
+ integrity sha512-/0rRozkn+iIHya2vnnvprDgT7QkfI54FLrACAN3BLP7MRlfOIGOrZsXpRLndnLBVnjNzkcre84i1RecjoXnwIA==
dependencies:
invariant "^2.2.4"
nullthrows "^1.1.1"
@@ -6398,6 +6404,11 @@
resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.2.2.tgz#0c5f26e417b8f524924fa4531b82ad5603216e90"
integrity sha512-D+SKQ266ra/wo87s9+UI/rKQi3qhGPCR8eSCDe0VJudhjHsqyNU+JJ5lnIGCgmZaWFTXgdBP/gdr1Iz1zqGs4Q==
+"@sentry/babel-plugin-component-annotate@3.4.0":
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.4.0.tgz#f47a7652e16f84556df82cbc38f0004bca1335d1"
+ integrity sha512-tSzfc3aE7m0PM0Aj7HBDet5llH9AB9oc+tBQ8AvOqUSnWodLrNCuWeQszJ7mIBovD3figgCU3h0cvI6U5cDtsg==
+
"@sentry/browser@8.54.0":
version "8.54.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.54.0.tgz#5487075908aac564892e689e1b6d233fdb314f5b"
@@ -6428,70 +6439,75 @@
resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.42.2.tgz#a32a4f226e717122b37d9969e8d4d0e14779f720"
integrity sha512-GtJSuxER7Vrp1IpxdUyRZzcckzMnb4N5KTW7sbTwUiwqARRo+wxS+gczYrS8tdgtmXs5XYhzhs+t4d52ITHMIg==
-"@sentry/cli-darwin@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.42.4.tgz#029521d3052c644e3bac1c926e53d1e658b8cb28"
- integrity sha512-PZV4Y97VDWBR4rIt0HkJfXaBXlebIN2s/FDzC3iHINZE5OG62CDFsnC4/lbGlf2/UZLDaGGIK7mYwSHhTvN+HQ==
+"@sentry/cli-darwin@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.45.0.tgz#e3d6feae4fadcfdf91db9c7b9c4689a66d3d8d19"
+ integrity sha512-p4Uxfv/L2fQdP3/wYnKVVz9gzZJf/1Xp9D+6raax/3Bu5y87yHYUqcdt98y/VAXQD4ofp2QgmhGUVPofvQNZmg==
"@sentry/cli-linux-arm64@2.42.2":
version "2.42.2"
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.42.2.tgz#1c06c83ff21f51ec23acf5be3b1f8c7553bf86b1"
integrity sha512-BOxzI7sgEU5Dhq3o4SblFXdE9zScpz6EXc5Zwr1UDZvzgXZGosUtKVc7d1LmkrHP8Q2o18HcDWtF3WvJRb5Zpw==
-"@sentry/cli-linux-arm64@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.42.4.tgz#b5e2d2399764998e3d661f144aae0c3f3495d1f1"
- integrity sha512-Ex8vRnryyzC/9e43daEmEqPS+9uirY/l6Hw2lAvhBblFaL7PTWNx52H+8GnYGd9Zy2H3rWNyBDYfHwnErg38zA==
+"@sentry/cli-linux-arm64@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.45.0.tgz#384c8e17f7e7dc007d164033d0e7c75aa83a2e9b"
+ integrity sha512-gUcLoEjzg7AIc4QQGEZwRHri+EHf3Gcms9zAR1VHiNF3/C/jL4WeDPJF2YiWAQt6EtH84tHiyhw1Ab/R8XFClg==
"@sentry/cli-linux-arm@2.42.2":
version "2.42.2"
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.42.2.tgz#00cadc359ae3c051efb3e63873c033c61dbd1ca1"
integrity sha512-7udCw+YL9lwq+9eL3WLspvnuG+k5Icg92YE7zsteTzWLwgPVzaxeZD2f8hwhsu+wmL+jNqbpCRmktPteh3i2mg==
-"@sentry/cli-linux-arm@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.42.4.tgz#286996c3969a553c07a74a2a67c6d3671e2c79b5"
- integrity sha512-lBn0oeeg62h68/4Eo6zbPq99Idz5t0VRV48rEU/WKeM4MtQCvG/iGGQ3lBFW2yNiUBzXZIK9poXLEcgbwmcRVw==
+"@sentry/cli-linux-arm@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.45.0.tgz#b9d6f86f3934b4d9ced5b45a8158ff2ac2bdd25d"
+ integrity sha512-6sEskFLlFKJ+e0MOYgIclBTUX5jYMyYhHIxXahEkI/4vx6JO0uvpyRAkUJRpJkRh/lPog0FM+tbP3so+VxB2qQ==
"@sentry/cli-linux-i686@2.42.2":
version "2.42.2"
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.42.2.tgz#3b817b715dd806c20dfbffd539725ad8089c310a"
integrity sha512-Sw/dQp5ZPvKnq3/y7wIJyxTUJYPGoTX/YeMbDs8BzDlu9to2LWV3K3r7hE7W1Lpbaw4tSquUHiQjP5QHCOS7aQ==
-"@sentry/cli-linux-i686@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.42.4.tgz#03e72598dc37e96a99e4329e20db9e74df277f83"
- integrity sha512-IBJg0aHjsLCL4LvcFa3cXIjA+4t5kPqBT9y+PoDu4goIFxYD8zl7mbUdGJutvJafTk8Akf4ss4JJXQBjg019zA==
+"@sentry/cli-linux-i686@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.45.0.tgz#39e22beb84cfa26e11bdc198364315fdfb4da4d5"
+ integrity sha512-VmmOaEAzSW23YdGNdy/+oQjCNAMY+HmOGA77A25/ep/9AV7PQB6FI7xO5Y1PVvlkxZFJ23e373njSsEeg4uDZw==
"@sentry/cli-linux-x64@2.42.2":
version "2.42.2"
resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.42.2.tgz#ddf906bc3071cc79ce6e633eddcb76bb9068e688"
integrity sha512-mU4zUspAal6TIwlNLBV5oq6yYqiENnCWSxtSQVzWs0Jyq97wtqGNG9U+QrnwjJZ+ta/hvye9fvL2X25D/RxHQw==
-"@sentry/cli-linux-x64@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.42.4.tgz#a3bc31a909f61029620e5d2ae0f8d8625ed8982a"
- integrity sha512-gXI5OEiOSNiAEz7VCE6AZcAgHJ47mlgal3+NmbE8XcHmFOnyDws9FNie6PJAy8KZjXi3nqoBP9JVAbnmOix3uA==
+"@sentry/cli-linux-x64@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.45.0.tgz#25cd3699297f9433835fb5edd42dad722c11f041"
+ integrity sha512-a0Oj68mrb25a0WjX/ShZ6AAd4PPiuLcgyzQr7bl2+DvYxIOajwkGbR+CZFEhOVZcfhTnixKy/qIXEzApEPHPQg==
+
+"@sentry/cli-win32-arm64@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.45.0.tgz#50c7d29ea2169bdb4d98bbde81c5f7dac0dd3955"
+ integrity sha512-vn+CwS4p+52pQSLNPoi20ZOrQmv01ZgAmuMnjkh1oUZfTyBAwWLrAh6Cy4cztcN8DfL5dOWKQBo8DBKURE4ttg==
"@sentry/cli-win32-i686@2.42.2":
version "2.42.2"
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.42.2.tgz#9036085c7c6ce455ad45fda411c55ff39c06eb95"
integrity sha512-iHvFHPGqgJMNqXJoQpqttfsv2GI3cGodeTq4aoVLU/BT3+hXzbV0x1VpvvEhncJkDgDicJpFLM8sEPHb3b8abw==
-"@sentry/cli-win32-i686@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.42.4.tgz#0de663fc574f4bce2057e099c5b76b65f99a3bd6"
- integrity sha512-vZuR3UPHKqOMniyrijrrsNwn9usaRysXq78F6WV0cL0ZyPLAmY+KBnTDSFk1Oig2pURnzaTm+RtcZu2fc8mlzg==
+"@sentry/cli-win32-i686@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.45.0.tgz#201075c4aec37a3e797160e0b468641245437f0c"
+ integrity sha512-8mMoDdlwxtcdNIMtteMK7dbi7054jak8wKSHJ5yzMw8UmWxC5thc/gXBc1uPduiaI56VjoJV+phWHBKCD+6I4w==
"@sentry/cli-win32-x64@2.42.2":
version "2.42.2"
resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.42.2.tgz#7d6464b63f32c9f97fff428f246b1f039b402233"
integrity sha512-vPPGHjYoaGmfrU7xhfFxG7qlTBacroz5NdT+0FmDn6692D8IvpNXl1K+eV3Kag44ipJBBeR8g1HRJyx/F/9ACw==
-"@sentry/cli-win32-x64@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.42.4.tgz#f572a03084f3b1a4f355c1fbeb1339cb56ad91c9"
- integrity sha512-OIBj3uaQ6nAERSm5Dcf8UIhyElEEwMNsZEEppQpN4IKl0mrwb/57AznM23Dvpu6GR8WGbVQUSolt879YZR5E9g==
+"@sentry/cli-win32-x64@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.45.0.tgz#2075e9e1ea3c3609e0fa1a758ca033e94e1c600f"
+ integrity sha512-ZvK9cIqFaq7vZ0jkHJ/xh5au6902Dr+AUxSk6L6vCL7JCe2p93KGL/4d8VFB5PD/P7Y9b+105G/e0QIFKzpeOw==
"@sentry/cli@2.42.2":
version "2.42.2"
@@ -6512,10 +6528,10 @@
"@sentry/cli-win32-i686" "2.42.2"
"@sentry/cli-win32-x64" "2.42.2"
-"@sentry/cli@2.42.4":
- version "2.42.4"
- resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.42.4.tgz#df6ac3e92a60a715b231873433894ed77e601086"
- integrity sha512-BoSZDAWJiz/40tu6LuMDkSgwk4xTsq6zwqYoUqLU3vKBR/VsaaQGvu6EWxZXORthfZU2/5Agz0+t220cge6VQw==
+"@sentry/cli@2.45.0":
+ version "2.45.0"
+ resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.45.0.tgz#35feed7a2fee54faf25daed73001a2a2a3143396"
+ integrity sha512-4sWu7zgzgHAjIxIjXUA/66qgeEf5ZOlloO+/JaGD5qXNSW0G7KMTR6iYjReNKMgdBCTH6bUUt9qiuA+Ex9Masw==
dependencies:
https-proxy-agent "^5.0.0"
node-fetch "^2.6.7"
@@ -6523,27 +6539,28 @@
proxy-from-env "^1.1.0"
which "^2.0.2"
optionalDependencies:
- "@sentry/cli-darwin" "2.42.4"
- "@sentry/cli-linux-arm" "2.42.4"
- "@sentry/cli-linux-arm64" "2.42.4"
- "@sentry/cli-linux-i686" "2.42.4"
- "@sentry/cli-linux-x64" "2.42.4"
- "@sentry/cli-win32-i686" "2.42.4"
- "@sentry/cli-win32-x64" "2.42.4"
+ "@sentry/cli-darwin" "2.45.0"
+ "@sentry/cli-linux-arm" "2.45.0"
+ "@sentry/cli-linux-arm64" "2.45.0"
+ "@sentry/cli-linux-i686" "2.45.0"
+ "@sentry/cli-linux-x64" "2.45.0"
+ "@sentry/cli-win32-arm64" "2.45.0"
+ "@sentry/cli-win32-i686" "2.45.0"
+ "@sentry/cli-win32-x64" "2.45.0"
"@sentry/core@8.54.0":
version "8.54.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.54.0.tgz#a2ebec965cadcb6de89e116689feeef79d5862a6"
integrity sha512-03bWf+D1j28unOocY/5FDB6bUHtYlm6m6ollVejhg45ZmK9iPjdtxNWbrLsjT1WRym0Tjzowu+A3p+eebYEv0Q==
-"@sentry/react-native@~6.10.0":
- version "6.10.0"
- resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-6.10.0.tgz#9efafb9b85870bd4c5189763edde30709b9f3213"
- integrity sha512-B56vc+pnFHMiu3cabFb454v4qD0zObW6JVzJ5Gb6fIMdt93AFIJg10ZErzC+ump7xM4BOEROFFRuLiyvadvlPA==
+"@sentry/react-native@~6.14.0":
+ version "6.14.0"
+ resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-6.14.0.tgz#bc6bdaf03860bb8946f8c30570a9abd82ed6cfc0"
+ integrity sha512-BBqixN6oV6tCNp1ABXfzvD531zxj1fUAH0HDPvOR/jX0h9f9pYfxCyI64B+DoQbVZKFsg8nte0QIHkZDhRAW9A==
dependencies:
- "@sentry/babel-plugin-component-annotate" "3.2.2"
+ "@sentry/babel-plugin-component-annotate" "3.4.0"
"@sentry/browser" "8.54.0"
- "@sentry/cli" "2.42.4"
+ "@sentry/cli" "2.45.0"
"@sentry/core" "8.54.0"
"@sentry/react" "8.54.0"
"@sentry/types" "8.54.0"
@@ -8717,6 +8734,33 @@ babel-preset-expo@~13.1.11:
react-refresh "^0.14.2"
resolve-from "^5.0.0"
+babel-preset-expo@~13.2.0:
+ version "13.2.0"
+ resolved "https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-13.2.0.tgz#d4540009d07242e3c3d63184b7a34efda95e8e64"
+ integrity sha512-oNUeUZPMNRPmx/2jaKJLSQFP/MFI1M91vP+Gp+j8/FPl9p/ps603DNwCaRdcT/Vj3FfREdlIwRio1qDCjY0oAA==
+ dependencies:
+ "@babel/helper-module-imports" "^7.25.9"
+ "@babel/plugin-proposal-decorators" "^7.12.9"
+ "@babel/plugin-proposal-export-default-from" "^7.24.7"
+ "@babel/plugin-syntax-export-default-from" "^7.24.7"
+ "@babel/plugin-transform-export-namespace-from" "^7.25.9"
+ "@babel/plugin-transform-flow-strip-types" "^7.25.2"
+ "@babel/plugin-transform-modules-commonjs" "^7.24.8"
+ "@babel/plugin-transform-object-rest-spread" "^7.24.7"
+ "@babel/plugin-transform-parameters" "^7.24.7"
+ "@babel/plugin-transform-private-methods" "^7.24.7"
+ "@babel/plugin-transform-private-property-in-object" "^7.24.7"
+ "@babel/plugin-transform-runtime" "^7.24.7"
+ "@babel/preset-react" "^7.22.15"
+ "@babel/preset-typescript" "^7.23.0"
+ "@react-native/babel-preset" "0.79.3"
+ babel-plugin-react-native-web "~0.19.13"
+ babel-plugin-syntax-hermes-parser "^0.25.1"
+ babel-plugin-transform-flow-enums "^0.0.2"
+ debug "^4.3.4"
+ react-refresh "^0.14.2"
+ resolve-from "^5.0.0"
+
babel-preset-jest@^29.6.3:
version "29.6.3"
resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
@@ -8735,11 +8779,6 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-base-64@0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
- integrity sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==
-
base64-arraybuffer@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
@@ -11132,18 +11171,18 @@ expo-application@~6.1.4:
resolved "https://registry.yarnpkg.com/expo-application/-/expo-application-6.1.4.tgz#34ee2f7a86e3689f15961b296e82934e0f85afd6"
integrity sha512-jXVZb3llTQ5j4C/I03GxKjujmhKex9Xo5JDZo/pRjScHSr4NoeMjPKWThyWVlWDM1v5YSEcsRJebVfTvq9SR5Q==
-expo-asset@~11.1.4:
- version "11.1.4"
- resolved "https://registry.yarnpkg.com/expo-asset/-/expo-asset-11.1.4.tgz#0258156f76c306521eb2a0d27e98d26258d12ad9"
- integrity sha512-e3210sF0YHKRTCjVUOVmDAJ0Dk4vepL9RocKe36S7S+VthoCZwsBGLAM2LLvBa1SdmODF92AS0Nrcfi/1/VlbQ==
+expo-asset@~11.1.5:
+ version "11.1.5"
+ resolved "https://registry.yarnpkg.com/expo-asset/-/expo-asset-11.1.5.tgz#5cad3d781c9d0edec31b9b3adbba574eb4d5dd3e"
+ integrity sha512-GEQDCqC25uDBoXHEnXeBuwpeXvI+3fRGvtzwwt0ZKKzWaN+TgeF8H7c76p3Zi4DfBMFDcduM0CmOvJX+yCCLUQ==
dependencies:
"@expo/image-utils" "^0.7.4"
- expo-constants "~17.1.4"
+ expo-constants "~17.1.5"
-expo-blur@~14.1.4:
- version "14.1.4"
- resolved "https://registry.yarnpkg.com/expo-blur/-/expo-blur-14.1.4.tgz#d246c0a224ce63321d022edfc0e6a8c5fa2cc865"
- integrity sha512-55P9tK/RjJZEcu2tU7BqX3wmIOrGMOOkmHztJMMws+ZGHzvtjnPmT7dsQxhOU9vPj77oHnKetYHU2sik3iBcCw==
+expo-blur@~14.1.5:
+ version "14.1.5"
+ resolved "https://registry.yarnpkg.com/expo-blur/-/expo-blur-14.1.5.tgz#910712389e19286ccdc136275bf569f427aa05ef"
+ integrity sha512-CCLJHxN4eoAl06ESKT3CbMasJ98WsjF9ZQEJnuxtDb9ffrYbZ+g9ru84fukjNUOTtc8A8yXE5z8NgY1l0OMrmQ==
expo-build-properties@~0.14.6:
version "0.14.6"
@@ -11153,10 +11192,10 @@ expo-build-properties@~0.14.6:
ajv "^8.11.0"
semver "^7.6.0"
-expo-camera@~16.1.6:
- version "16.1.6"
- resolved "https://registry.yarnpkg.com/expo-camera/-/expo-camera-16.1.6.tgz#9badbc3b93cab3386e3e70721d4f3c1983ab539c"
- integrity sha512-caVSfoTUaayYhH5gicrXWCgBQIVrotPOH3jUDr4vhN5VQDB/+TWaY+le2nQtNXgQEz14Af+H/TNvYpvvNj5Ktg==
+expo-camera@~16.1.8:
+ version "16.1.8"
+ resolved "https://registry.yarnpkg.com/expo-camera/-/expo-camera-16.1.8.tgz#6c30dfb5c982795351f1053c36f048a11869e21b"
+ integrity sha512-NpBbkUhHG6cs2TNUQBFSEtXb5j1/kTPIhiuqBcHosZG2yb/8MuM/ii4McJaqfe/6pn0YPqkH4k0Uod11DOSLmw==
dependencies:
invariant "^2.2.4"
@@ -11165,7 +11204,7 @@ expo-clipboard@~7.1.4:
resolved "https://registry.yarnpkg.com/expo-clipboard/-/expo-clipboard-7.1.4.tgz#f2cda0d3cbfd2d307aa85dd7ba6843d6bbaf4227"
integrity sha512-NHhfKnrzb4o0PacUKD93ByadU0JmPBoFTFYbbFJZ9OAX6SImpSqG5gfrMUR3vVj4Qx9f1LpMcdAv5lBzv868ow==
-expo-constants@17.0.3, expo-constants@^13.0.2, expo-constants@~17.1.4, expo-constants@~17.1.5:
+expo-constants@17.0.3, expo-constants@^13.0.2, expo-constants@~17.1.5, expo-constants@~17.1.6:
version "17.0.3"
resolved "https://registry.yarnpkg.com/expo-constants/-/expo-constants-17.0.3.tgz#a05b38e0417d59759ece1642b4d483889e04dbda"
integrity sha512-lnbcX2sAu8SucHXEXxSkhiEpqH+jGrf+TF+MO6sHWIESjwOUVVYlT8qYdjR9xbxWmqFtrI4KV44FkeJf2DaFjQ==
@@ -11173,25 +11212,25 @@ expo-constants@17.0.3, expo-constants@^13.0.2, expo-constants@~17.1.4, expo-cons
"@expo/config" "~10.0.4"
"@expo/env" "~0.4.0"
-expo-dev-client@~5.1.7:
- version "5.1.7"
- resolved "https://registry.yarnpkg.com/expo-dev-client/-/expo-dev-client-5.1.7.tgz#b75d5c4650a2b19e8d5c4666a798a4150a7fbd68"
- integrity sha512-/xcwNIeZIBA/y6Io7jv1ZbEG8XRUuAynIJyIGJvpMxf6hm7eEw8rEzhO9rZNk6H8bMjTjASs0Vf1bqIV6v3j6A==
+expo-dev-client@~5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/expo-dev-client/-/expo-dev-client-5.2.0.tgz#a3d4f8c79fafe747ea8d0bfc6e3918b02011025c"
+ integrity sha512-7GgO3BGlFM016Zkp3c9bUbi35pubqKh8Z/iHC1arIvckEjDrLER+92zfUTFr49XLk2o64arItRPJyQL49pA/hg==
dependencies:
- expo-dev-launcher "5.1.10"
- expo-dev-menu "6.1.9"
+ expo-dev-launcher "5.1.12"
+ expo-dev-menu "6.1.11"
expo-dev-menu-interface "1.10.0"
- expo-manifests "~0.16.4"
+ expo-manifests "~0.16.5"
expo-updates-interface "~1.1.0"
-expo-dev-launcher@5.1.10:
- version "5.1.10"
- resolved "https://registry.yarnpkg.com/expo-dev-launcher/-/expo-dev-launcher-5.1.10.tgz#eaa8a7a4edcab557e6623f176e60d964606651ff"
- integrity sha512-OW4k0efB6cWigYj1GlJGObMuMpg6DIwsAZkECsGqNU3U80zE7pBMPB0sy1xehFuTplO6F+dCTLg0hPPuqkSsTg==
+expo-dev-launcher@5.1.12:
+ version "5.1.12"
+ resolved "https://registry.yarnpkg.com/expo-dev-launcher/-/expo-dev-launcher-5.1.12.tgz#cad239327e258d84c4221a212ecd30a051f9097d"
+ integrity sha512-ALedYerjJtSiPa95l41zMAO/m1m1kgS39i2H0io+6Ix4OksYNhILNzMNB1qDht/oWt2yjLBvXfWULfs5+3vnaA==
dependencies:
ajv "8.11.0"
- expo-dev-menu "6.1.8"
- expo-manifests "~0.16.4"
+ expo-dev-menu "6.1.11"
+ expo-manifests "~0.16.5"
resolve-from "^5.0.0"
expo-dev-menu-interface@1.10.0:
@@ -11199,28 +11238,14 @@ expo-dev-menu-interface@1.10.0:
resolved "https://registry.yarnpkg.com/expo-dev-menu-interface/-/expo-dev-menu-interface-1.10.0.tgz#04671bda3c163d1d7b9438ce7095c3913a3f53f9"
integrity sha512-NxtM/qot5Rh2cY333iOE87dDg1S8CibW+Wu4WdLua3UMjy81pXYzAGCZGNOeY7k9GpNFqDPNDXWyBSlk9r2pBg==
-expo-dev-menu@6.1.8:
- version "6.1.8"
- resolved "https://registry.yarnpkg.com/expo-dev-menu/-/expo-dev-menu-6.1.8.tgz#cec53379b76f5cb53e2e87a8c62555610a26e6bb"
- integrity sha512-i8DW1OXvj4yxQuPP8p2AMGoYdnyhfTkoqWI/AiDYReh2viZv4kZlRloGAemV2bIQwswMq2GsvZehYrQPEK9QBw==
+expo-dev-menu@6.1.11:
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/expo-dev-menu/-/expo-dev-menu-6.1.11.tgz#829118326bcd618aec3941cfbb5b32fd3dd72379"
+ integrity sha512-yrlDXGcqlbQX3Pgw/iPLRea7+pHFC17MdtkNaXYQ5K5u64mn9l4KZ2ZYUeQ8cKDG5l8ZdC4F9R9vfCJYFi82AA==
dependencies:
expo-dev-menu-interface "1.10.0"
-expo-dev-menu@6.1.9:
- version "6.1.9"
- resolved "https://registry.yarnpkg.com/expo-dev-menu/-/expo-dev-menu-6.1.9.tgz#897dcb4c49aed9c1f871b13e1359079f23981050"
- integrity sha512-Uz02Bsc1xsYzjW4Ld+PxWLRNkbsoJYSbQtw/pZDSrJk5Hj869M4KQSOI8JpZ7WVlKEKkIRA8kBLepjhdFhq+Dg==
- dependencies:
- expo-dev-menu-interface "1.10.0"
-
-expo-device@7.0.1, expo-device@~4.1.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/expo-device/-/expo-device-7.0.1.tgz#3702fe8b4475eac63ed27f9d580ec8a78546e0d1"
- integrity sha512-/3lk0f9wvle+6svHqWSCBC1B5NYFmXp1D7hmIyecJJVYRLwzrwwTDyNs76oG/UDU5Appdu8QyDKycsx2hqv71w==
- dependencies:
- ua-parser-js "^0.7.33"
-
-expo-device@~7.1.4:
+expo-device@7.1.4, expo-device@~4.1.1, expo-device@~7.1.4:
version "7.1.4"
resolved "https://registry.yarnpkg.com/expo-device/-/expo-device-7.1.4.tgz#84ae7c2520cc45f15a9cb0433ae1226c33f7a8ef"
integrity sha512-HS04IiE1Fy0FRjBLurr9e5A6yj3kbmQB+2jCZvbSGpsjBnCLdSk/LCii4f5VFhPIBWJLyYuN5QqJyEAw6BcS4Q==
@@ -11232,15 +11257,15 @@ expo-eas-client@~0.14.3:
resolved "https://registry.yarnpkg.com/expo-eas-client/-/expo-eas-client-0.14.3.tgz#3fc22378cc454953ecba88f70c16c20a74e0aa27"
integrity sha512-BW2mSNEjFRFC8/CbkMQ3mfVhBdeZIjZhNfncw7PP80xEptLWhVjGTqwG8Usi0/yPpIu/YNYgop+XGMfhXyh9uA==
-expo-file-system@~18.1.8:
- version "18.1.8"
- resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-18.1.8.tgz#caa0831b9826f568be36deb25aed835978e957b3"
- integrity sha512-1HXpunpRMGnoIw0+f2urjUNaePAvac1X9wIwVRsGJTw7A2WHBFATRuFB7jUOhZac/qK1MDm0GZsggzoRi1oteQ==
+expo-file-system@~18.1.10:
+ version "18.1.10"
+ resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-18.1.10.tgz#22f3bcc2c9a7edcd6bba5ece3c90a8467fda47be"
+ integrity sha512-SyaWg+HitScLuyEeSG9gMSDT0hIxbM9jiZjSBP9l9zMnwZjmQwsusE6+7qGiddxJzdOhTP4YGUfvEzeeS0YL3Q==
-expo-font@~13.3.0:
- version "13.3.0"
- resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-13.3.0.tgz#139e6e1024e414afe1180ffed0add98aa8c8950b"
- integrity sha512-TdbHoxCfLWN9Uvnqsrcak+5EkDCbNIWfgtNWx3JZ6sD9WYB7gvbS+Eu5YlZ85NvCOSJ9Khmw4mFQxEi2LUPZfQ==
+expo-font@~13.3.1:
+ version "13.3.1"
+ resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-13.3.1.tgz#ed69ae14f263a4c447efb2615b60d9e045372e68"
+ integrity sha512-d+xrHYvSM9WB42wj8vP9OOFWyxed5R1evphfDb6zYBmC1dA9Hf89FpT7TNFtj2Bk3clTnpmVqQTCYbbA2P3CLg==
dependencies:
fontfaceobserver "^2.1.0"
@@ -11259,10 +11284,10 @@ expo-image-loader@~5.1.0:
resolved "https://registry.yarnpkg.com/expo-image-loader/-/expo-image-loader-5.1.0.tgz#f7d65f9b9a9714eaaf5d50a406cb34cb25262153"
integrity sha512-sEBx3zDQIODWbB5JwzE7ZL5FJD+DK3LVLWBVJy6VzsqIA6nDEnSFnsnWyCfCTSvbGigMATs1lgkC2nz3Jpve1Q==
-expo-image-manipulator@~13.1.5:
- version "13.1.5"
- resolved "https://registry.yarnpkg.com/expo-image-manipulator/-/expo-image-manipulator-13.1.5.tgz#d657dceeb8ce8da9345a1903f1327b0fedfd08c1"
- integrity sha512-V9cGJp0zVwAvAyL3w9JsLH8UEQjQZfFmwJM1l9/oXjlDrSDynQrPFwJq4VI8dCOJ+/nhYZK37yytFNG14Sqt4Q==
+expo-image-manipulator@~13.1.7:
+ version "13.1.7"
+ resolved "https://registry.yarnpkg.com/expo-image-manipulator/-/expo-image-manipulator-13.1.7.tgz#e891ce9b49d75962eafdf5b7d670116583379e76"
+ integrity sha512-DBy/Xdd0E/yFind14x36XmwfWuUxOHI/oH97/giKjjPaRc2dlyjQ3tuW3x699hX6gAs9Sixj5WEJ1qNf3c8sag==
dependencies:
expo-image-loader "~5.1.0"
@@ -11273,10 +11298,10 @@ expo-image-picker@~16.1.4:
dependencies:
expo-image-loader "~5.1.0"
-expo-image@~2.1.6:
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/expo-image/-/expo-image-2.1.6.tgz#f046fa631768e37326cc14c49de9113ceffa9e8b"
- integrity sha512-AFQxeAI1iTXFZ4dMxUB+SOACGMQxEk+t7PvT3j4mrvffRFoOLfHZ4uJc8SAdDFJak7ByqKhCIPIEhL+1Deq4Sg==
+expo-image@~2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/expo-image/-/expo-image-2.2.1.tgz#b4aa706a25f7e8902ac854a8da249caf4a90cd67"
+ integrity sha512-5ZSggMi0X2G9AN0aM+sdkCyyZ6YcWvGs9KYLYrRBVUN3ph6RBiu6mKGpaNN1TAscySRnH1eHbUE1H+Qeq7qm1g==
expo-json-utils@~0.15.0:
version "0.15.0"
@@ -11288,17 +11313,17 @@ expo-keep-awake@~14.1.4:
resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-14.1.4.tgz#80197728563e0e17523e5a606fbd6fbed9639503"
integrity sha512-wU9qOnosy4+U4z/o4h8W9PjPvcFMfZXrlUoKTMBW7F4pLqhkkP/5G4EviPZixv4XWFMjn1ExQ5rV6BX8GwJsWA==
-expo-linear-gradient@~14.1.4:
- version "14.1.4"
- resolved "https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-14.1.4.tgz#fcb2b586cfd21dd5f3076de467f92b55d9c47cb2"
- integrity sha512-bImj2qqIjnl+VHYGnIwan9LxmGvb8e4hFqHpxsPzUiK7Ady7uERrXPhJcyTKTxRf4RL2sQRDpoOKzBYNdQDmuw==
+expo-linear-gradient@~14.1.5:
+ version "14.1.5"
+ resolved "https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-14.1.5.tgz#414bf0c8145089087198d4dd5a419eb324af2a02"
+ integrity sha512-BSN3MkSGLZoHMduEnAgfhoj3xqcDWaoICgIr4cIYEx1GcHfKMhzA/O4mpZJ/WC27BP1rnAqoKfbclk1eA70ndQ==
-expo-linking@~7.1.4:
- version "7.1.4"
- resolved "https://registry.yarnpkg.com/expo-linking/-/expo-linking-7.1.4.tgz#7d398d99788d8d95b67d1ae463d24686cbeb1c1b"
- integrity sha512-zLAbUzTB3+KGjqqLeIdhhkXayyN0qulHGjRI24X7W/0Mq/4oPbPZklKtCP0k7XOn/k4553m8OgJ7GPC03PlV9g==
+expo-linking@~7.1.5:
+ version "7.1.5"
+ resolved "https://registry.yarnpkg.com/expo-linking/-/expo-linking-7.1.5.tgz#99633892712d5442ddb1c6c3857346eb7a67119b"
+ integrity sha512-8g20zOpROW78bF+bLI4a3ZWj4ntLgM0rCewKycPL0jk9WGvBrBtFtwwADJgOiV1EurNp3lcquerXGlWS+SOQyA==
dependencies:
- expo-constants "~17.1.4"
+ expo-constants "~17.1.6"
invariant "^2.2.4"
expo-localization@~16.1.5:
@@ -11308,23 +11333,23 @@ expo-localization@~16.1.5:
dependencies:
rtl-detect "^1.0.2"
-expo-manifests@~0.16.4:
- version "0.16.4"
- resolved "https://registry.yarnpkg.com/expo-manifests/-/expo-manifests-0.16.4.tgz#d1a648bab0068a2712cf49009a5f26377a585849"
- integrity sha512-zB6ohgnsNbJDaLI/KRZQXxEHadhMJt+gA4LCqbiZQNa3P4FJq4JFRXPV6QQjgjJ998g9vY7eDCTduxTJYBqUaA==
+expo-manifests@~0.16.5:
+ version "0.16.5"
+ resolved "https://registry.yarnpkg.com/expo-manifests/-/expo-manifests-0.16.5.tgz#bb57ceff3db4eb74679d4a155b2ca2050375ce10"
+ integrity sha512-zLUeJogn2C7qOE75Zz7jcmJorMfIbSRR35ctspN0OK/Hq/+PAAptA8p9jNVC8xp/91uP9uI8f3xPhh+A11eR2A==
dependencies:
- "@expo/config" "~11.0.6"
+ "@expo/config" "~11.0.10"
expo-json-utils "~0.15.0"
-expo-media-library@~17.1.6:
- version "17.1.6"
- resolved "https://registry.yarnpkg.com/expo-media-library/-/expo-media-library-17.1.6.tgz#118ada2d28139d540861b338acf1d088bc03d51f"
- integrity sha512-Py8Y9wJlNXBZkhtJYy9acj0oRoUV09WXsZnjcvy6xZjpniPQIq0wkIkgS2DLhlYmMdjBrSux2TGp7Omi2WHp1g==
+expo-media-library@~17.1.7:
+ version "17.1.7"
+ resolved "https://registry.yarnpkg.com/expo-media-library/-/expo-media-library-17.1.7.tgz#71ed3d2d246d33410d6aecc335098a23519bd890"
+ integrity sha512-hLCoMvlhjtt+iYxPe71P1F6t06mYGysuNOfjQzDbbf64PCkglCZJYmywPyUSV1V5Hu9DhRj//gEg+Ki+7VWXog==
-expo-modules-autolinking@2.1.9:
- version "2.1.9"
- resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-2.1.9.tgz#7bf8338d4b7a1b6e8eccab51634de9b339e90c04"
- integrity sha512-54InfnWy1BR54IDZoawqdFAaF2lyLHe9J+2dZ7y91/36jVpBtAval39ZKt2IISFJZ7TVglsojl4P5BDcDGcvjQ==
+expo-modules-autolinking@2.1.11:
+ version "2.1.11"
+ resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-2.1.11.tgz#efc2e756ccc8b9e0b927596ba074aefe31b5cbe4"
+ integrity sha512-KrWQo+cE4gWYNePBBhmHGVzf63gYV19ZLXe9EIH3GHTkViVzIX+Lp618H/7GxfawpN5kbhvilATH1QEKKnUUww==
dependencies:
"@expo/spawn-async" "^1.7.2"
chalk "^4.1.0"
@@ -11334,10 +11359,10 @@ expo-modules-autolinking@2.1.9:
require-from-string "^2.0.2"
resolve-from "^5.0.0"
-expo-modules-core@2.3.12:
- version "2.3.12"
- resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-2.3.12.tgz#1c06402564c02b32f192adfe6946e671d8a95e79"
- integrity sha512-bOm83mskw1S7xuDX50DlLdx68u0doQ6BZHSU2qTv8P1/5QYeAae3pCgFLq2hoptUNeMF7W+68ShJFTOHAe68BQ==
+expo-modules-core@2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-2.4.0.tgz#3081d62fadff913090cc5abfe46d9ec6b0e75789"
+ integrity sha512-Ko5eHBdvuMykjw9P9C9PF54/wBSsGOxaOjx92I5BwgKvEmUwN3UrXFV4CXzlLVbLfSYUQaLcB220xmPfgvT7Fg==
dependencies:
invariant "^2.2.4"
@@ -11348,10 +11373,10 @@ expo-modules-core@^2.1.1:
dependencies:
invariant "^2.2.4"
-expo-notifications@~0.31.1:
- version "0.31.1"
- resolved "https://registry.yarnpkg.com/expo-notifications/-/expo-notifications-0.31.1.tgz#3be669ab78c6099d82f4fc3607f77f7d9e1805b6"
- integrity sha512-g1CMi+3wUaMuX+tAU+Fhnfs5bJtJ3JVRXihO415aOInQkox+Mh79n38RlT6snLWCHjfSojQIxmydzUHt6ywTIQ==
+expo-notifications@~0.31.3:
+ version "0.31.3"
+ resolved "https://registry.yarnpkg.com/expo-notifications/-/expo-notifications-0.31.3.tgz#eb82c9975e26dcc4fa694b79970792c897ad8d16"
+ integrity sha512-AATxKoav5ZvwcRel2SKYNZc+EvOAKvAjxyBezC8y3J5fMNe/uKIhMzh3FN4fKdOi9ao/UBHkvLiUO2MqVnvBNg==
dependencies:
"@expo/image-utils" "^0.7.4"
"@ide/backoff" "^1.0.0"
@@ -11359,7 +11384,7 @@ expo-notifications@~0.31.1:
assert "^2.0.0"
badgin "^1.1.5"
expo-application "~6.1.4"
- expo-constants "~17.1.4"
+ expo-constants "~17.1.6"
expo-pwa@0.0.127:
version "0.0.127"
@@ -11371,34 +11396,34 @@ expo-pwa@0.0.127:
commander "2.20.0"
update-check "1.5.3"
-expo-screen-orientation@~8.1.5:
- version "8.1.5"
- resolved "https://registry.yarnpkg.com/expo-screen-orientation/-/expo-screen-orientation-8.1.5.tgz#447c19b8ad59d1d2cf0894900ee273836367ca0d"
- integrity sha512-t2ss7a52f1VNrugmIYj1wlnGICUgrkqu2+J3Csew8ixczI8s6r6EXT4E4EeyQ/9WvcEUOOyh8TWC9EbbswPhUw==
+expo-screen-orientation@~8.1.7:
+ version "8.1.7"
+ resolved "https://registry.yarnpkg.com/expo-screen-orientation/-/expo-screen-orientation-8.1.7.tgz#3751b441f2bfcbde798b1508c0ff9f099f4be911"
+ integrity sha512-nYwadYtdU6mMDk0MCHMPPPQtBoeFYJ2FspLRW+J35CMLqzE4nbpwGeiImfXzkvD94fpOCfI4KgLj5vGauC3pfA==
expo-sharing@~13.1.5:
version "13.1.5"
resolved "https://registry.yarnpkg.com/expo-sharing/-/expo-sharing-13.1.5.tgz#73d86cdcc037b46ddc82be224dfd3d6bceec497c"
integrity sha512-X/5sAEiWXL2kdoGE3NO5KmbfcmaCWuWVZXHu8OQef7Yig4ZgHFkGD11HKJ5KqDrDg+SRZe4ISd6MxE7vGUgm4w==
-expo-splash-screen@~0.30.8:
- version "0.30.8"
- resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.30.8.tgz#2e960ccff053bc8ace85eb56f7d6745e4ddfc6b6"
- integrity sha512-2eh+uA543brfeG5HILXmtNKA7E2/pfywKzNumzy3Ef6OtDjYy6zJUGNSbhnZRbVEjUZo3/QNRs0JRBfY80okZg==
+expo-splash-screen@~0.30.9:
+ version "0.30.9"
+ resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.30.9.tgz#8f2a86b3b802ea46065fc761ed60e77e81bdb84c"
+ integrity sha512-curHUaZxUTZ2dWvz32ao3xPv5mJr1LBqn5V8xm/IULAehB9RGCn8iKiROMN1PYebSG+56vPMuJmBm9P+ayvJpA==
dependencies:
- "@expo/prebuild-config" "^9.0.5"
+ "@expo/prebuild-config" "^9.0.6"
expo-structured-headers@~4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/expo-structured-headers/-/expo-structured-headers-4.1.0.tgz#5475fc3f9559701cc755fd2d50605f8817d42ad0"
integrity sha512-2X+aUNzC/qaw7/WyUhrVHNDB0uQ5rE12XA2H/rJXaAiYQSuOeU90ladaN0IJYV9I2XlhYrjXLktLXWbO7zgbag==
-expo-system-ui@~5.0.7:
- version "5.0.7"
- resolved "https://registry.yarnpkg.com/expo-system-ui/-/expo-system-ui-5.0.7.tgz#ccf047a689ab488d9bcda375afd063419578f494"
- integrity sha512-ijSnSFA4VfuQc84N6WyCUNsKKTIyQb6QuC8q2zGvYC/sBXTMrOtZg0zrisQGzCRW+WhritQTiVqHlp3Ix9xDmQ==
+expo-system-ui@~5.0.8:
+ version "5.0.8"
+ resolved "https://registry.yarnpkg.com/expo-system-ui/-/expo-system-ui-5.0.8.tgz#1eaaa95cfa8b5e20750e5fb30918635a58276199"
+ integrity sha512-2sI7ALq3W8sKKa3FRW7PmuNznk+48cb1VzFy96vYZLZgTDZViz+fEJNdp1RHgLui/mAl3f8md1LneygSJvZ1EQ==
dependencies:
- "@react-native/normalize-colors" "0.79.2"
+ "@react-native/normalize-colors" "0.79.3"
debug "^4.3.2"
expo-task-manager@~13.1.5:
@@ -11413,55 +11438,55 @@ expo-updates-interface@~1.1.0:
resolved "https://registry.yarnpkg.com/expo-updates-interface/-/expo-updates-interface-1.1.0.tgz#62497d4647b381da9fdb68868ed180203ae737ef"
integrity sha512-DeB+fRe0hUDPZhpJ4X4bFMAItatFBUPjw/TVSbJsaf3Exeami+2qbbJhWkcTMoYHOB73nOIcaYcWXYJnCJXO0w==
-expo-updates@~0.28.12:
- version "0.28.12"
- resolved "https://registry.yarnpkg.com/expo-updates/-/expo-updates-0.28.12.tgz#abf6e0c593837b20af64feee31aa018e1a85b332"
- integrity sha512-GUQNI7apaQa8mVLGyeUQZsSaY75lq3yIp2OO+gX0BZIeD5hr8ADZ0Gw2+9+uRSB70B7AWQklUCMBxvOsA2DVfg==
+expo-updates@~0.28.14:
+ version "0.28.14"
+ resolved "https://registry.yarnpkg.com/expo-updates/-/expo-updates-0.28.14.tgz#bc75b00c0744fec33ba36f8c96e7c86ed0d3c7f6"
+ integrity sha512-kxI428W7LGSdDWmN/ud5cIg8+SjmQ5XSaUrYauZ0DKsHm2qq1Lh+NYSUWLvYmps+Baalafe6mILmAX8ZnNg26Q==
dependencies:
"@expo/code-signing-certificates" "0.0.5"
- "@expo/config" "~11.0.7"
+ "@expo/config" "~11.0.10"
"@expo/config-plugins" "~10.0.2"
"@expo/spawn-async" "^1.7.2"
arg "4.1.0"
chalk "^4.1.2"
expo-eas-client "~0.14.3"
- expo-manifests "~0.16.4"
+ expo-manifests "~0.16.5"
expo-structured-headers "~4.1.0"
expo-updates-interface "~1.1.0"
glob "^10.4.2"
ignore "^5.3.1"
resolve-from "^5.0.0"
-expo-video@~2.1.8:
- version "2.1.8"
- resolved "https://registry.yarnpkg.com/expo-video/-/expo-video-2.1.8.tgz#507305ae2ea18f435a51ababd6b2dec21291d328"
- integrity sha512-OEToLVEGLvfTq7ypjgOf1DUNGHLGxUiL/1K6WHwdew5tgFxiLBZesGQhKToyrSVPVmWaxMBSP4sQuwtTjWUpHg==
+expo-video@~2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/expo-video/-/expo-video-2.2.1.tgz#d45357ee7a7da5a87c49177587183d1c7feabc57"
+ integrity sha512-dw3h0eMLK8WpY1Tnwsgrxx3sFqXiOujmurjGdr+RFG63ZurAze/H9uuKMVl3ps/ZNuK4q/2ifIiJudoFJfwKwA==
expo-web-browser@~14.1.6:
version "14.1.6"
resolved "https://registry.yarnpkg.com/expo-web-browser/-/expo-web-browser-14.1.6.tgz#26d66e641e6e96d155be6fa513e7e667a719a0b0"
integrity sha512-/4P8eWqRyfXIMZna3acg320LXNA+P2cwyEVbjDX8vHnWU+UnOtyRKWy3XaAIyMPQ9hVjBNUQTh4MPvtnPRzakw==
-expo@^53.0.5:
- version "53.0.5"
- resolved "https://registry.yarnpkg.com/expo/-/expo-53.0.5.tgz#f8c30643c4e45d769934415ea9196531612cb657"
- integrity sha512-A9nh7ojGcdsv05TCH39q/7RRQsTfgcQ3qD2CFzlADVW8jIIFNiIg80shE8DQiXHkeCKWT78Iy7iog2yIu4sq3Q==
+expo@53.0.11:
+ version "53.0.11"
+ resolved "https://registry.yarnpkg.com/expo/-/expo-53.0.11.tgz#66053862520ce2a6700d13346ebaf8210a68f24b"
+ integrity sha512-+QtvU+6VPd7/o4vmtwuRE/Li2rAiJtD25I6BOnoQSxphaWWaD0PdRQnIV3VQ0HESuJYRuKJ3DkAHNJ3jI6xwzA==
dependencies:
"@babel/runtime" "^7.20.0"
- "@expo/cli" "0.24.10"
- "@expo/config" "~11.0.7"
+ "@expo/cli" "0.24.14"
+ "@expo/config" "~11.0.10"
"@expo/config-plugins" "~10.0.2"
- "@expo/fingerprint" "0.12.4"
- "@expo/metro-config" "0.20.12"
+ "@expo/fingerprint" "0.13.0"
+ "@expo/metro-config" "0.20.14"
"@expo/vector-icons" "^14.0.0"
- babel-preset-expo "~13.1.11"
- expo-asset "~11.1.4"
- expo-constants "~17.1.5"
- expo-file-system "~18.1.8"
- expo-font "~13.3.0"
+ babel-preset-expo "~13.2.0"
+ expo-asset "~11.1.5"
+ expo-constants "~17.1.6"
+ expo-file-system "~18.1.10"
+ expo-font "~13.3.1"
expo-keep-awake "~14.1.4"
- expo-modules-autolinking "2.1.9"
- expo-modules-core "2.3.12"
+ expo-modules-autolinking "2.1.11"
+ expo-modules-core "2.4.0"
react-native-edge-to-edge "1.6.0"
whatwg-url-without-unicode "8.0.0-3"
@@ -12041,6 +12066,11 @@ getenv@^1.0.0:
resolved "https://registry.yarnpkg.com/getenv/-/getenv-1.0.0.tgz#874f2e7544fbca53c7a4738f37de8605c3fcfc31"
integrity sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==
+getenv@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/getenv/-/getenv-2.0.0.tgz#b1698c7b0f29588f4577d06c42c73a5b475c69e0"
+ integrity sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ==
+
github-from-package@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
@@ -12065,18 +12095,6 @@ glob-to-regexp@^0.4.1:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-glob@7.0.6:
- version "7.0.6"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
- integrity sha512-f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q==
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.0.2"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
glob@^10.3.10:
version "10.3.12"
resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
@@ -13455,12 +13473,12 @@ jest-environment-node@^29.7.0:
jest-mock "^29.7.0"
jest-util "^29.7.0"
-jest-expo@~53.0.3:
- version "53.0.3"
- resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-53.0.3.tgz#094da673d5b7953565c4cc6c41af4337465ddfc9"
- integrity sha512-aOJyy/i0wPAWrQpSVNTTFWjcNTbUE/0eXr2cpdM3WW57K3EB1sueuKj8j2tWlzeKz4bk3+DVRy8K44V/XMoy3Q==
+jest-expo@~53.0.7:
+ version "53.0.7"
+ resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-53.0.7.tgz#ab1c288940dcdf470c25b7b18e2ed99f03d26bc6"
+ integrity sha512-Uiu3ES0sWbsxpifQuBzXMI1/N9JygfJfwEby/Qw/OPndIQ1YeeIQqkbP52xn6UhdSM4qYQiteX3EjY8TfrZIoA==
dependencies:
- "@expo/config" "~11.0.7"
+ "@expo/config" "~11.0.10"
"@expo/json-file" "^9.1.4"
"@jest/create-cache-key-function" "^29.2.1"
"@jest/globals" "^29.2.1"
@@ -14047,10 +14065,10 @@ kysely@^0.23.4:
resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.23.5.tgz#60c63d94e1c42cc0411be8aaa688a0f27405f514"
integrity sha512-TH+b56pVXQq0tsyooYLeNfV11j6ih7D50dyN8tkM0e7ndiUH28Nziojiog3qRFlmEj9XePYdZUrNJ2079Qjdow==
-lan-network@^0.1.4:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/lan-network/-/lan-network-0.1.5.tgz#e781889b7bd4dbedd9126fff3ceddd809a83c3ff"
- integrity sha512-CV3k7l8jW0Z1b+G41tB7JInVyJEKQzh/YPl2v9uXpZMusp0aa+rh3OqG77xWuX7+eVBa8PsdTuMznTAssF4qwg==
+lan-network@^0.1.6:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/lan-network/-/lan-network-0.1.7.tgz#9fcb9967c6d951f10b2f9a9ffabe4a312d63f69d"
+ integrity sha512-mnIlAEMu4OyEvUNdzco9xpuB9YVcPkQec+QsgycBCtPZvEqWPCDPfbAE4OJMdBBWpZWtpCn1xw9jJYlwjWI5zQ==
lande@^1.0.10:
version "1.0.10"
@@ -14832,7 +14850,7 @@ minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
-minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -16756,7 +16774,7 @@ react-keyed-flatten-children@^5.0.0:
resolved "https://registry.yarnpkg.com/react-keyed-flatten-children/-/react-keyed-flatten-children-5.0.0.tgz#3024fc8819f7b60fc5039b527f133d9ac3a02a82"
integrity sha512-XA5ah02sZAeDrbz4Lusd4acqG5q5BtVwPHWierruVhrgX6CMCldbGcTZZM14cQZ+GWq+tzRzEpsCvnTtLODvjw==
-react-native-compressor@1.11.0:
+react-native-compressor@^1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/react-native-compressor/-/react-native-compressor-1.11.0.tgz#e297fa650b09cc754392153c38ae2ca510aee024"
integrity sha512-XaI0U2CtlW6ZYjwdQ4jdpnJa3C9CD1pc1a4jiUMtnUxWtCqgT7PNjOiEqlYLLwwGTvorXXNuby5In1yy7Vdmhg==
@@ -16773,20 +16791,13 @@ react-native-dotenv@^3.4.11:
dependencies:
dotenv "^16.4.5"
-react-native-drawer-layout@^4.1.10:
+react-native-drawer-layout@^4.1.10, react-native-drawer-layout@^4.1.8:
version "4.1.10"
resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.1.10.tgz#9007cb747767ca8e1c9c3337671ad35ed95ad4d9"
integrity sha512-wejQo0F+EffCkOkRh+DP6ENWMB+aWEHkXV8Pd564PmtoySZLUsV/ksYrh/mrufh7T7EuvGT8+fNHz7mMRYftWg==
dependencies:
use-latest-callback "^0.2.3"
-react-native-drawer-layout@^4.1.6:
- version "4.1.7"
- resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.1.7.tgz#1c741c9bf9c739d6672201692e4ba4839ca0c8ff"
- integrity sha512-KeTGZsNEDbOmgo8ICwr1vBmvWjRrRsvbLc2IAfQnW5h5UtxVZVRxY4QaN84BSBQPXm6tQ6AXfII8TCXCv3c0Ew==
- dependencies:
- use-latest-callback "^0.2.3"
-
react-native-edge-to-edge@1.6.0, react-native-edge-to-edge@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/react-native-edge-to-edge/-/react-native-edge-to-edge-1.6.0.tgz#2ba63b941704a7f713e298185c26cde4d9e4b973"
@@ -16832,10 +16843,10 @@ react-native-is-edge-to-edge@^1.1.6:
resolved "https://registry.yarnpkg.com/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.1.6.tgz#69ec13f70d76e9245e275eed4140d0873a78f902"
integrity sha512-1pHnFTlBahins6UAajXUqeCOHew9l9C2C8tErnpGC3IyLJzvxD+TpYAixnCbrVS52f7+NvMttbiSI290XfwN0w==
-react-native-keyboard-controller@^1.17.1:
- version "1.17.1"
- resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.17.1.tgz#46efe148c1bdd0ee22094dcb2660f70f81e6544e"
- integrity sha512-YM3GYvtkuWimCKkZFURn5hIb1WiKOQqi2DijdwZSF5QSSzGqfqwzEEC3bm1xCN8HGHAEIXAaWIBUsc3Xp5L+Ng==
+react-native-keyboard-controller@^1.17.5:
+ version "1.17.5"
+ resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.17.5.tgz#a517f0d42f73e69a03e768379934a3bb705595f5"
+ integrity sha512-2bZi4uH/beAcHiQ7nv6sxW03/UpNcnNAPpaSnQtg0cbU3ySThPRETMqr0ZupFLUSZovolyFhyFJLjxmQ7cavJg==
dependencies:
react-native-is-edge-to-edge "^1.1.6"
@@ -16844,10 +16855,10 @@ react-native-mmkv@^2.12.2:
resolved "https://registry.yarnpkg.com/react-native-mmkv/-/react-native-mmkv-2.12.2.tgz#4bba0f5f04e2cf222494cce3a9794ba6a4894dee"
integrity sha512-6058Aq0p57chPrUutLGe9fYoiDVDNMU2PKV+lLFUJ3GhoHvUrLdsS1PDSCLr00yqzL4WJQ7TTzH+V8cpyrNcfg==
-react-native-pager-view@6.7.1:
- version "6.7.1"
- resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-6.7.1.tgz#60d52dedbcc92ee7037a13287ebeed5f74e49df7"
- integrity sha512-cBSr6xw4g5N7Kd3VGWcf+kmaH7iBWb0DXAf2bVo3bXkzBcBbTOmYSvc0LVLHhUPW8nEq5WjT9LCIYAzgF++EXw==
+react-native-pager-view@^6.7.1:
+ version "6.8.1"
+ resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-6.8.1.tgz#fa0ec09ea7c44190c7c013d75dd09fdc17b96100"
+ integrity sha512-XIyVEMhwq7sZqM7GobOJZXxFCfdFgVNq/CFB2rZIRNRSVPJqE1k1fsc8xfQKfdzsp6Rpt6I7VOIvhmP7/YHdVg==
react-native-progress@bluesky-social/react-native-progress:
version "5.0.0"
@@ -16881,10 +16892,10 @@ react-native-reanimated@~3.17.5:
invariant "^2.2.4"
react-native-is-edge-to-edge "1.1.7"
-react-native-root-siblings@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/react-native-root-siblings/-/react-native-root-siblings-4.1.1.tgz#b7742db7634a87f507eb99a5fd699c4f10c46ab0"
- integrity sha512-sdmLElNs5PDWqmZmj4/aNH4anyxreaPm61c4ZkRiR8SO/GzLg6KjAbb0e17RmMdnBdD0AIQbS38h/l55YKN4ZA==
+react-native-root-siblings@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/react-native-root-siblings/-/react-native-root-siblings-5.0.1.tgz#97e050e5155228f65810fb1c466ff8e769c5272c"
+ integrity sha512-Ay3k/fBj6ReUkWX5WNS+oEAcgPLEGOK8n7K/L7D85mf3xvd8rm/b4spsv26E4HlFzluVx5HKbxEt9cl0wQ1u3g==
react-native-safe-area-context@5.4.0:
version "5.4.0"
@@ -16900,10 +16911,10 @@ react-native-screens@^4.11.1:
react-native-is-edge-to-edge "^1.1.7"
warn-once "^0.1.0"
-react-native-svg@15.11.2:
- version "15.11.2"
- resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.11.2.tgz#7540e8e1eabc4dcd3b1e35ada5a1d9f1b96d37c4"
- integrity sha512-+YfF72IbWQUKzCIydlijV1fLuBsQNGMT6Da2kFlo1sh+LE3BIm/2Q7AR1zAAR6L0BFLi1WaQPLfFUC9bNZpOmw==
+react-native-svg@15.12.0:
+ version "15.12.0"
+ resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.12.0.tgz#0e2d476961e8b07f8c549fe4489c99b5130dc150"
+ integrity sha512-iE25PxIJ6V0C6krReLquVw6R0QTsRTmEQc4K2Co3P6zsimU/jltcDBKYDy1h/5j9S/fqmMeXnpM+9LEWKJKI6A==
dependencies:
css-select "^5.1.0"
css-tree "^1.1.3"
@@ -16954,27 +16965,27 @@ react-native-web@~0.20.0:
postcss-value-parser "^4.2.0"
styleq "^0.1.3"
-react-native-webview@13.13.5:
- version "13.13.5"
- resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.13.5.tgz#4ef5f9310ddff5747f884a6655228ec9c7d52c73"
- integrity sha512-MfC2B+woL4Hlj2WCzcb1USySKk+SteXnUKmKktOk/H/AQy5+LuVdkPKm8SknJ0/RxaxhZ48WBoTRGaqgR137hw==
+react-native-webview@^13.13.5:
+ version "13.15.0"
+ resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.15.0.tgz#b6d2f8d8dd65897db76659ddd8198d2c74ec5a79"
+ integrity sha512-Vzjgy8mmxa/JO6l5KZrsTC7YemSdq+qB01diA0FqjUTaWGAGwuykpJ73MDj3+mzBSlaDxAEugHzTtkUQkQEQeQ==
dependencies:
escape-string-regexp "^4.0.0"
invariant "2.2.4"
-react-native@0.79.2:
- version "0.79.2"
- resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.79.2.tgz#f1a53099701c1736d09e441eb79f97cfc90dd202"
- integrity sha512-AnGzb56JvU5YCL7cAwg10+ewDquzvmgrMddiBM0GAWLwQM/6DJfGd2ZKrMuKKehHerpDDZgG+EY64gk3x3dEkw==
+react-native@^0.79.3:
+ version "0.79.3"
+ resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.79.3.tgz#16580ca202016c75e3c61116fcfe3b30f6d762fc"
+ integrity sha512-EzH1+9gzdyEo9zdP6u7Sh3Jtf5EOMwzy+TK65JysdlgAzfEVfq4mNeXcAZ6SmD+CW6M7ARJbvXLyTD0l2S5rpg==
dependencies:
"@jest/create-cache-key-function" "^29.7.0"
- "@react-native/assets-registry" "0.79.2"
- "@react-native/codegen" "0.79.2"
- "@react-native/community-cli-plugin" "0.79.2"
- "@react-native/gradle-plugin" "0.79.2"
- "@react-native/js-polyfills" "0.79.2"
- "@react-native/normalize-colors" "0.79.2"
- "@react-native/virtualized-lists" "0.79.2"
+ "@react-native/assets-registry" "0.79.3"
+ "@react-native/codegen" "0.79.3"
+ "@react-native/community-cli-plugin" "0.79.3"
+ "@react-native/gradle-plugin" "0.79.3"
+ "@react-native/js-polyfills" "0.79.3"
+ "@react-native/normalize-colors" "0.79.3"
+ "@react-native/virtualized-lists" "0.79.3"
abort-controller "^3.0.0"
anser "^1.4.9"
ansi-regex "^5.0.0"
@@ -17527,14 +17538,6 @@ rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
-rn-fetch-blob@^0.12.0:
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/rn-fetch-blob/-/rn-fetch-blob-0.12.0.tgz#ec610d2f9b3f1065556b58ab9c106eeb256f3cba"
- integrity sha512-+QnR7AsJ14zqpVVUbzbtAjq0iI8c9tCg49tIoKO2ezjzRunN7YL6zFSFSWZm6d+mE/l9r+OeDM3jmb2tBb2WbA==
- dependencies:
- base-64 "0.1.0"
- glob "7.0.6"
-
roarr@^7.0.4:
version "7.15.1"
resolved "https://registry.yarnpkg.com/roarr/-/roarr-7.15.1.tgz#e4d93105c37b5ea7dd1200d96a3500f757ddc39f"
@@ -17722,12 +17725,10 @@ semver-compare@^1.0.0:
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
-semver@7.6.0:
- version "7.6.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
- integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
- dependencies:
- lru-cache "^6.0.0"
+semver@7.6.3, semver@^7.1.3, semver@^7.6.3:
+ version "7.6.3"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+ integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
semver@^5.5.0, semver@^5.6.0:
version "5.7.2"
@@ -17739,11 +17740,6 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-semver@^7.1.3, semver@^7.6.3:
- version "7.6.3"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
- integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
-
semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@~7.5.4:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"