diff options
Diffstat (limited to 'src')
27 files changed, 1732 insertions, 768 deletions
diff --git a/src/App.native.tsx b/src/App.native.tsx index 18461fdd0..4c73d8752 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -24,6 +24,7 @@ import { import {s} from '#/lib/styles' import {ThemeProvider} from '#/lib/ThemeContext' import {logger} from '#/logger' +import {Provider as A11yProvider} from '#/state/a11y' import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes' import {Provider as DialogStateProvider} from '#/state/dialogs' import {Provider as InvitesStateProvider} from '#/state/invites' @@ -152,27 +153,29 @@ function App() { * that is set up in the InnerApp component above. */ return ( - <KeyboardProvider enabled={false} statusBarTranslucent={true}> - <SessionProvider> - <ShellStateProvider> - <PrefsStateProvider> - <InvitesStateProvider> - <ModalStateProvider> - <DialogStateProvider> - <LightboxStateProvider> - <I18nProvider> - <PortalProvider> - <InnerApp /> - </PortalProvider> - </I18nProvider> - </LightboxStateProvider> - </DialogStateProvider> - </ModalStateProvider> - </InvitesStateProvider> - </PrefsStateProvider> - </ShellStateProvider> - </SessionProvider> - </KeyboardProvider> + <A11yProvider> + <KeyboardProvider enabled={false} statusBarTranslucent={true}> + <SessionProvider> + <ShellStateProvider> + <PrefsStateProvider> + <InvitesStateProvider> + <ModalStateProvider> + <DialogStateProvider> + <LightboxStateProvider> + <I18nProvider> + <PortalProvider> + <InnerApp /> + </PortalProvider> + </I18nProvider> + </LightboxStateProvider> + </DialogStateProvider> + </ModalStateProvider> + </InvitesStateProvider> + </PrefsStateProvider> + </ShellStateProvider> + </SessionProvider> + </KeyboardProvider> + </A11yProvider> ) } diff --git a/src/App.web.tsx b/src/App.web.tsx index 6af3c7d6f..00939c9eb 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -13,6 +13,7 @@ import {QueryProvider} from '#/lib/react-query' import {Provider as StatsigProvider} from '#/lib/statsig/statsig' import {ThemeProvider} from '#/lib/ThemeContext' import {logger} from '#/logger' +import {Provider as A11yProvider} from '#/state/a11y' import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes' import {Provider as DialogStateProvider} from '#/state/dialogs' import {Provider as InvitesStateProvider} from '#/state/invites' @@ -135,25 +136,27 @@ function App() { * that is set up in the InnerApp component above. */ return ( - <SessionProvider> - <ShellStateProvider> - <PrefsStateProvider> - <InvitesStateProvider> - <ModalStateProvider> - <DialogStateProvider> - <LightboxStateProvider> - <I18nProvider> - <PortalProvider> - <InnerApp /> - </PortalProvider> - </I18nProvider> - </LightboxStateProvider> - </DialogStateProvider> - </ModalStateProvider> - </InvitesStateProvider> - </PrefsStateProvider> - </ShellStateProvider> - </SessionProvider> + <A11yProvider> + <SessionProvider> + <ShellStateProvider> + <PrefsStateProvider> + <InvitesStateProvider> + <ModalStateProvider> + <DialogStateProvider> + <LightboxStateProvider> + <I18nProvider> + <PortalProvider> + <InnerApp /> + </PortalProvider> + </I18nProvider> + </LightboxStateProvider> + </DialogStateProvider> + </ModalStateProvider> + </InvitesStateProvider> + </PrefsStateProvider> + </ShellStateProvider> + </SessionProvider> + </A11yProvider> ) } diff --git a/src/Navigation.tsx b/src/Navigation.tsx index 5d4ba0e3f..f2b7cd911 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -312,7 +312,11 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) { getComponent={() => MessagesSettingsScreen} options={{title: title(msg`Chat settings`), requireAuth: true}} /> - <Stack.Screen name="Feeds" getComponent={() => FeedsScreen} /> + <Stack.Screen + name="Feeds" + getComponent={() => FeedsScreen} + options={{title: title(msg`Feeds`)}} + /> </> ) } diff --git a/src/components/FeedCard.tsx b/src/components/FeedCard.tsx index 94d97cb62..7f3cb88ff 100644 --- a/src/components/FeedCard.tsx +++ b/src/components/FeedCard.tsx @@ -1,8 +1,14 @@ import React from 'react' import {GestureResponderEvent, View} from 'react-native' -import {AppBskyActorDefs, AppBskyFeedDefs, AtUri} from '@atproto/api' +import { + AppBskyActorDefs, + AppBskyFeedDefs, + AppBskyGraphDefs, + AtUri, +} from '@atproto/api' import {msg, plural, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' +import {useQueryClient} from '@tanstack/react-query' import {logger} from '#/logger' import { @@ -11,6 +17,7 @@ import { useRemoveFeedMutation, } from '#/state/queries/preferences' import {sanitizeHandle} from 'lib/strings/handles' +import {precacheFeedFromGeneratorView, precacheList} from 'state/queries/feed' import {useSession} from 'state/session' import {UserAvatar} from '#/view/com/util/UserAvatar' import * as Toast from 'view/com/util/Toast' @@ -20,41 +27,72 @@ import {Button, ButtonIcon} from '#/components/Button' import {useRichText} from '#/components/hooks/useRichText' import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus' import {Trash_Stroke2_Corner0_Rounded as Trash} from '#/components/icons/Trash' -import {Link as InternalLink} from '#/components/Link' +import {Link as InternalLink, LinkProps} from '#/components/Link' import {Loader} from '#/components/Loader' import * as Prompt from '#/components/Prompt' import {RichText} from '#/components/RichText' import {Text} from '#/components/Typography' -export function Default({feed}: {feed: AppBskyFeedDefs.GeneratorView}) { +type Props = + | { + type: 'feed' + view: AppBskyFeedDefs.GeneratorView + } + | { + type: 'list' + view: AppBskyGraphDefs.ListView + } + +export function Default(props: Props) { + const {type, view} = props + const displayName = type === 'feed' ? view.displayName : view.name + const purpose = type === 'list' ? view.purpose : undefined return ( - <Link feed={feed}> + <Link label={displayName} {...props}> <Outer> <Header> - <Avatar src={feed.avatar} /> - <TitleAndByline title={feed.displayName} creator={feed.creator} /> - <Action uri={feed.uri} pin /> + <Avatar src={view.avatar} /> + <TitleAndByline + title={displayName} + creator={view.creator} + type={type} + purpose={purpose} + /> + <Action uri={view.uri} pin type={type} purpose={purpose} /> </Header> - <Description description={feed.description} /> - <Likes count={feed.likeCount || 0} /> + <Description description={view.description} /> + {type === 'feed' && <Likes count={view.likeCount || 0} />} </Outer> </Link> ) } export function Link({ + type, + view, + label, children, - feed, -}: { - children: React.ReactElement - feed: AppBskyFeedDefs.GeneratorView -}) { +}: Props & Omit<LinkProps, 'to'>) { + const queryClient = useQueryClient() + const href = React.useMemo(() => { - const urip = new AtUri(feed.uri) - const handleOrDid = feed.creator.handle || feed.creator.did - return `/profile/${handleOrDid}/feed/${urip.rkey}` - }, [feed]) - return <InternalLink to={href}>{children}</InternalLink> + return createProfileFeedHref({feed: view}) + }, [view]) + + return ( + <InternalLink + to={href} + label={label} + onPress={() => { + if (type === 'feed') { + precacheFeedFromGeneratorView(queryClient, view) + } else { + precacheList(queryClient, view) + } + }}> + {children} + </InternalLink> + ) } export function Outer({children}: {children: React.ReactNode}) { @@ -62,34 +100,100 @@ export function Outer({children}: {children: React.ReactNode}) { } export function Header({children}: {children: React.ReactNode}) { - return <View style={[a.flex_row, a.align_center, a.gap_md]}>{children}</View> + return ( + <View style={[a.flex_1, a.flex_row, a.align_center, a.gap_md]}> + {children} + </View> + ) +} + +export type AvatarProps = {src: string | undefined; size?: number} + +export function Avatar({src, size = 40}: AvatarProps) { + return <UserAvatar type="algo" size={size} avatar={src} /> } -export function Avatar({src}: {src: string | undefined}) { - return <UserAvatar type="algo" size={40} avatar={src} /> +export function AvatarPlaceholder({size = 40}: Omit<AvatarProps, 'src'>) { + const t = useTheme() + return ( + <View + style={[ + t.atoms.bg_contrast_25, + { + width: size, + height: size, + borderRadius: 8, + }, + ]} + /> + ) } export function TitleAndByline({ title, creator, + type, + purpose, }: { title: string - creator: AppBskyActorDefs.ProfileViewBasic + creator?: AppBskyActorDefs.ProfileViewBasic + type: 'feed' | 'list' + purpose?: AppBskyGraphDefs.ListView['purpose'] }) { const t = useTheme() return ( <View style={[a.flex_1]}> - <Text - style={[a.text_md, a.font_bold, a.flex_1, a.leading_snug]} - numberOfLines={1}> + <Text style={[a.text_md, a.font_bold, a.leading_snug]} numberOfLines={1}> {title} </Text> - <Text - style={[a.flex_1, a.leading_snug, t.atoms.text_contrast_medium]} - numberOfLines={1}> - <Trans>Feed by {sanitizeHandle(creator.handle, '@')}</Trans> - </Text> + {creator && ( + <Text + style={[a.leading_snug, t.atoms.text_contrast_medium]} + numberOfLines={1}> + {type === 'list' && purpose === 'app.bsky.graph.defs#curatelist' ? ( + <Trans>List by {sanitizeHandle(creator.handle, '@')}</Trans> + ) : type === 'list' && purpose === 'app.bsky.graph.defs#modlist' ? ( + <Trans> + Moderation list by {sanitizeHandle(creator.handle, '@')} + </Trans> + ) : ( + <Trans>Feed by {sanitizeHandle(creator.handle, '@')}</Trans> + )} + </Text> + )} + </View> + ) +} + +export function TitleAndBylinePlaceholder({creator}: {creator?: boolean}) { + const t = useTheme() + + return ( + <View style={[a.flex_1, a.gap_xs]}> + <View + style={[ + a.rounded_xs, + t.atoms.bg_contrast_50, + { + width: '60%', + height: 14, + }, + ]} + /> + + {creator && ( + <View + style={[ + a.rounded_xs, + t.atoms.bg_contrast_25, + { + width: '40%', + height: 10, + }, + ]} + /> + )} </View> ) } @@ -116,13 +220,31 @@ export function Likes({count}: {count: number}) { ) } -export function Action({uri, pin}: {uri: string; pin?: boolean}) { +export function Action({ + uri, + pin, + type, + purpose, +}: { + uri: string + pin?: boolean + type: 'feed' | 'list' + purpose?: AppBskyGraphDefs.ListView['purpose'] +}) { const {hasSession} = useSession() - if (!hasSession) return null - return <ActionInner uri={uri} pin={pin} /> + if (!hasSession || purpose !== 'app.bsky.graph.defs#curatelist') return null + return <ActionInner uri={uri} pin={pin} type={type} /> } -function ActionInner({uri, pin}: {uri: string; pin?: boolean}) { +function ActionInner({ + uri, + pin, + type, +}: { + uri: string + pin?: boolean + type: 'feed' | 'list' +}) { const {_} = useLingui() const {data: preferences} = usePreferencesQuery() const {isPending: isAddSavedFeedPending, mutateAsync: saveFeeds} = @@ -130,9 +252,7 @@ function ActionInner({uri, pin}: {uri: string; pin?: boolean}) { const {isPending: isRemovePending, mutateAsync: removeFeed} = useRemoveFeedMutation() const savedFeedConfig = React.useMemo(() => { - return preferences?.savedFeeds?.find( - feed => feed.type === 'feed' && feed.value === uri, - ) + return preferences?.savedFeeds?.find(feed => feed.value === uri) }, [preferences?.savedFeeds, uri]) const removePromptControl = Prompt.usePromptControl() const isPending = isAddSavedFeedPending || isRemovePending @@ -148,7 +268,7 @@ function ActionInner({uri, pin}: {uri: string; pin?: boolean}) { } else { await saveFeeds([ { - type: 'feed', + type, value: uri, pinned: pin || false, }, @@ -160,7 +280,7 @@ function ActionInner({uri, pin}: {uri: string; pin?: boolean}) { Toast.show(_(msg`Failed to update feeds`)) } }, - [_, pin, saveFeeds, removeFeed, uri, savedFeedConfig], + [_, pin, saveFeeds, removeFeed, uri, savedFeedConfig, type], ) const onPrompRemoveFeed = React.useCallback( @@ -203,3 +323,16 @@ function ActionInner({uri, pin}: {uri: string; pin?: boolean}) { </> ) } + +export function createProfileFeedHref({ + feed, +}: { + feed: AppBskyFeedDefs.GeneratorView | AppBskyGraphDefs.ListView +}) { + const urip = new AtUri(feed.uri) + const type = urip.collection === 'app.bsky.feed.generator' ? 'feed' : 'list' + const handleOrDid = feed.creator.handle || feed.creator.did + return `/profile/${handleOrDid}/${type === 'feed' ? 'feed' : 'lists'}/${ + urip.rkey + }` +} diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx index 319eccfa4..4db9c4f8e 100644 --- a/src/components/ProfileHoverCard/index.web.tsx +++ b/src/components/ProfileHoverCard/index.web.tsx @@ -64,7 +64,7 @@ export function ProfileHoverCard(props: ProfileHoverCardProps) { return props.children } else { return ( - <View onPointerMove={onPointerMove}> + <View onPointerMove={onPointerMove} style={[a.flex_shrink]}> <ProfileHoverCardInner {...props} /> </View> ) diff --git a/src/lib/statsig/events.ts b/src/lib/statsig/events.ts index 0d77ec8a3..2e8cedb54 100644 --- a/src/lib/statsig/events.ts +++ b/src/lib/statsig/events.ts @@ -73,6 +73,22 @@ export type LogEvents = { feedType: string reason: 'pull-to-refresh' | 'soft-reset' | 'load-latest' } + 'discover:showMore': { + feedContext: string + } + 'discover:showLess': { + feedContext: string + } + 'discover:clickthrough:sampled': { + count: number + } + 'discover:engaged:sampled': { + count: number + } + 'discover:seen:sampled': { + count: number + } + 'composer:gif:open': {} 'composer:gif:select': {} diff --git a/src/lib/statsig/gates.ts b/src/lib/statsig/gates.ts index 6e460dc60..46ef934ef 100644 --- a/src/lib/statsig/gates.ts +++ b/src/lib/statsig/gates.ts @@ -1,5 +1,6 @@ export type Gate = // Keep this alphabetic please. + | 'debug_show_feedcontext' | 'native_pwi_disabled' | 'request_notifications_permission_after_onboarding_v2' | 'show_avi_follow_button' diff --git a/src/lib/statsig/statsig.tsx b/src/lib/statsig/statsig.tsx index b5a239c3a..94a1e63d0 100644 --- a/src/lib/statsig/statsig.tsx +++ b/src/lib/statsig/statsig.tsx @@ -115,6 +115,9 @@ const DOWNSAMPLED_EVENTS: Set<keyof LogEvents> = new Set([ 'home:feedDisplayed:sampled', 'feed:endReached:sampled', 'feed:refresh:sampled', + 'discover:clickthrough:sampled', + 'discover:engaged:sampled', + 'discover:seen:sampled', ]) const isDownsampledSession = Math.random() < 0.9 // 90% likely diff --git a/src/locale/locales/it/messages.po b/src/locale/locales/it/messages.po index e2c2bdb3a..59660ca2e 100644 --- a/src/locale/locales/it/messages.po +++ b/src/locale/locales/it/messages.po @@ -165,7 +165,7 @@ msgstr "" #~ msgstr "<0>{following} </0><1>following</1>" #~ msgid "<0>Choose your</0><1>Recommended</1><2>Feeds</2>" -#~ msgstr "<0>Scegli i tuoi</0><1>feeds</1><2>consigliati</2>" +#~ msgstr "<0>Scegli i tuoi</0><1>feed/1><2>consigliati</2>" #~ msgid "<0>Follow some</0><1>Recommended</1><2>Users</2>" #~ msgstr "<0>Segui alcuni</0><1>utenti</1><2>consigliati</2>" @@ -356,7 +356,7 @@ msgstr "Aggiunto alla lista" #: src/view/com/feeds/FeedSourceCard.tsx:126 msgid "Added to my feeds" -msgstr "Aggiunto ai miei feeds" +msgstr "Aggiunto ai miei feed" #: src/view/screens/PreferencesFollowingFeed.tsx:172 msgid "Adjust the number of likes a reply must have to be shown in your feed." @@ -395,7 +395,7 @@ msgstr "" #: src/screens/Messages/Settings.tsx:62 #: src/screens/Messages/Settings.tsx:65 msgid "Allow new messages from" -msgstr "" +msgstr "Consenti nuovi messaggi da" #: src/screens/Login/ForgotPasswordForm.tsx:178 #: src/view/com/modals/ChangePassword.tsx:171 @@ -936,12 +936,12 @@ msgstr "Conversazione silenziata" #: src/screens/Messages/List/index.tsx:88 #: src/view/screens/Settings/index.tsx:638 msgid "Chat settings" -msgstr "" +msgstr "Impostazioni messaggi" #: src/screens/Messages/Settings.tsx:59 #: src/view/screens/Settings/index.tsx:647 msgid "Chat Settings" -msgstr "" +msgstr "Impostazioni messaggi" #: src/components/dms/ConvoMenu.tsx:84 msgid "Chat unmuted" @@ -1043,7 +1043,7 @@ msgstr "" #: src/screens/Feeds/NoFollowingFeed.tsx:46 #~ msgid "Click here to add one." -#~ msgstr "" +#~ msgstr "Clicca qui per aggiungerne uno." #: src/components/TagMenu/index.web.tsx:138 msgid "Click here to open tag menu for {tag}" @@ -1665,14 +1665,14 @@ msgstr "Scoraggia le app dal mostrare il mio account agli utenti disconnessi" #: src/view/com/posts/FollowingEmptyState.tsx:70 #: src/view/com/posts/FollowingEndOfFeed.tsx:71 msgid "Discover new custom feeds" -msgstr "Scopri nuovi feeds personalizzati" +msgstr "Scopri nuovi feed personalizzati" #~ msgid "Discover new feeds" -#~ msgstr "Scopri nuovi feeds" +#~ msgstr "Scopri nuovi feed" #: src/view/screens/Feeds.tsx:794 msgid "Discover New Feeds" -msgstr "Scopri nuovi feeds" +msgstr "Scopri nuovi feed" #: src/view/com/modals/EditProfile.tsx:193 msgid "Display name" @@ -1831,7 +1831,7 @@ msgstr "Modifica l'elenco di moderazione" #: src/view/screens/Feeds.tsx:469 #: src/view/screens/SavedFeeds.tsx:93 msgid "Edit My Feeds" -msgstr "Modifica i miei feeds" +msgstr "Modifica i miei feed" #: src/view/com/modals/EditProfile.tsx:153 msgid "Edit my profile" @@ -1850,7 +1850,7 @@ msgstr "Modifica il Profilo" #: src/view/com/home/HomeHeaderLayout.web.tsx:76 #: src/view/screens/Feeds.tsx:416 #~ msgid "Edit Saved Feeds" -#~ msgstr "Modifica i feeds memorizzati" +#~ msgstr "Modifica i feed memorizzati" #: src/view/com/modals/CreateOrEditList.tsx:234 msgid "Edit User List" @@ -1927,7 +1927,7 @@ msgstr "Attiva il contenuto per adulti" #: src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx:78 #: src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx:79 #~ msgid "Enable adult content in your feeds" -#~ msgstr "Abilita i contenuti per adulti nei tuoi feeds" +#~ msgstr "Abilita i contenuti per adulti nei tuoi feed" #: src/components/dialogs/EmbedConsent.tsx:82 #: src/components/dialogs/EmbedConsent.tsx:89 @@ -2202,7 +2202,7 @@ msgstr "Commenti" #: src/view/shell/Drawer.tsx:493 #: src/view/shell/Drawer.tsx:494 msgid "Feeds" -msgstr "Feeds" +msgstr "Feed" #~ msgid "Feeds are created by users to curate content. Choose some feeds that you find interesting." #~ msgstr "I feed vengono creati dagli utenti per curare i contenuti. Scegli alcuni feed che ritieni interessanti." @@ -2213,7 +2213,7 @@ msgstr "I feed sono algoritmi personalizzati che gli utenti creano con un minimo #: src/screens/Onboarding/StepTopicalFeeds.tsx:80 #~ msgid "Feeds can be topical as well!" -#~ msgstr "I feeds possono anche avere tematiche!" +#~ msgstr "I feed possono anche avere tematiche!" #: src/view/com/modals/ChangeHandle.tsx:475 msgid "File Contents" @@ -3214,7 +3214,7 @@ msgstr "Il messaggio è troppo lungo" #: src/screens/Messages/List/index.tsx:321 msgid "Message settings" -msgstr "Impostazione messaggio" +msgstr "Impostazioni messaggio" #: src/Navigation.tsx:504 #: src/screens/Messages/List/index.tsx:164 @@ -3412,7 +3412,7 @@ msgstr "Il mio Compleanno" #: src/view/screens/Feeds.tsx:768 msgid "My Feeds" -msgstr "I miei Feeds" +msgstr "I miei Feed" #: src/view/shell/desktop/LeftNav.tsx:84 msgid "My Profile" @@ -3424,7 +3424,7 @@ msgstr "I miei feed salvati" #: src/view/screens/Settings/index.tsx:622 msgid "My Saved Feeds" -msgstr "I miei Feeds Salvati" +msgstr "I miei Feed Salvati" #~ msgid "my-server.com" #~ msgstr "my-server.com" @@ -3862,7 +3862,7 @@ msgstr "Apre la fotocamera sul dispositivo" #: src/view/screens/Settings/index.tsx:639 msgid "Opens chat settings" -msgstr "" +msgstr "Apre impostazioni messaggi" #: src/view/com/composer/Prompt.tsx:27 msgid "Opens composer" @@ -4112,7 +4112,7 @@ msgstr "Fissa su Home" #: src/view/screens/SavedFeeds.tsx:103 msgid "Pinned Feeds" -msgstr "Feeds Fissi" +msgstr "Feed Fissi" #: src/view/screens/ProfileList.tsx:289 msgid "Pinned to your feeds" @@ -4380,7 +4380,7 @@ msgstr "Elenchi pubblici e condivisibili di utenti da disattivare o bloccare in #: src/view/screens/Lists.tsx:66 msgid "Public, shareable lists which can drive feeds." -msgstr "Liste pubbliche e condivisibili che possono impulsare i feeds." +msgstr "Liste pubbliche e condivisibili che possono impulsare i feed." #: src/view/com/composer/Composer.tsx:462 msgid "Publish post" @@ -4431,7 +4431,7 @@ msgid "Recent Searches" msgstr "Ricerche recenti" #~ msgid "Recommended Feeds" -#~ msgstr "Feeds consigliati" +#~ msgstr "Feed consigliati" #~ msgid "Recommended Users" #~ msgstr "Utenti consigliati" @@ -4454,7 +4454,7 @@ msgid "Remove" msgstr "Rimuovi" #~ msgid "Remove {0} from my feeds?" -#~ msgstr "Rimuovere {0} dai miei feeds?" +#~ msgstr "Rimuovere {0} dai miei feed?" #: src/view/com/util/AccountDropdownBtn.tsx:22 msgid "Remove account" @@ -4524,14 +4524,14 @@ msgid "Remove repost" msgstr "Rimuovi la ripubblicazione" #~ msgid "Remove this feed from my feeds?" -#~ msgstr "Rimuovere questo feed dai miei feeds?" +#~ msgstr "Rimuovere questo feed dai miei feed?" #: src/view/com/posts/FeedErrorMessage.tsx:210 msgid "Remove this feed from your saved feeds" msgstr "Rimuovi questo feed dai feed salvati" #~ msgid "Remove this feed from your saved feeds?" -#~ msgstr "Elimina questo feed dai feeds salvati?" +#~ msgstr "Elimina questo feed dai feed salvati?" #: src/view/com/modals/ListAddRemoveUsers.tsx:199 #: src/view/com/modals/UserAddRemoveLists.tsx:165 @@ -4540,7 +4540,7 @@ msgstr "Elimina dalla lista" #: src/view/com/feeds/FeedSourceCard.tsx:139 msgid "Removed from my feeds" -msgstr "Rimuovere dai miei feeds" +msgstr "Rimuovere dai miei feed" #: src/view/com/posts/FeedShutdownMsg.tsx:44 #: src/view/screens/ProfileFeed.tsx:191 @@ -5047,7 +5047,7 @@ msgstr "Seleziona il servizio che ospita i tuoi dati." #: src/screens/Onboarding/StepTopicalFeeds.tsx:100 #~ msgid "Select topical feeds to follow from the list below" -#~ msgstr "Seleziona i feeds con temi da seguire dal seguente elenco" +#~ msgstr "Seleziona i feed con temi da seguire dal seguente elenco" #: src/screens/Onboarding/StepModeration/index.tsx:63 #~ msgid "Select what you want to see (or not see), and we’ll handle the rest." @@ -6154,7 +6154,7 @@ msgid "This will delete {0} from your muted words. You can always add it back la msgstr "Questo eliminerà {0} dalle parole disattivate. Puoi sempre aggiungerla nuovamente in seguito." #~ msgid "This will hide this post from your feeds." -#~ msgstr "Questo nasconderà il post dai tuoi feeds." +#~ msgstr "Questo nasconderà il post dai tuoi feed." #: src/view/screens/Settings/index.tsx:594 msgid "Thread preferences" @@ -6783,7 +6783,7 @@ msgstr "Che lingue sono utilizzate in questo post?" #: src/view/com/modals/lang-settings/ContentLanguagesSettings.tsx:77 msgid "Which languages would you like to see in your algorithmic feeds?" -msgstr "Quali lingue vorresti vedere negli algoritmi dei tuoi feeds?" +msgstr "Quali lingue vorresti vedere negli algoritmi dei tuoi feed?" #: src/components/dms/MessagesNUX.tsx:110 #: src/components/dms/MessagesNUX.tsx:124 @@ -6901,7 +6901,7 @@ msgstr "Puoi modificarlo in qualsiasi momento." #: src/screens/Messages/Settings.tsx:111 msgid "You can continue ongoing conversations regardless of which setting you choose." -msgstr "" +msgstr "Puoi proseguire le conversazioni in corso indipendentemente da quale settaggio scegli." #: src/screens/Login/index.tsx:158 #: src/screens/Login/PasswordUpdatedForm.tsx:33 @@ -6982,7 +6982,7 @@ msgstr "Non hai ancora nessuna conversazione. Avviane una!" #: src/view/com/feeds/ProfileFeedgens.tsx:141 msgid "You have no feeds." -msgstr "Non hai feeds." +msgstr "Non hai feed." #: src/view/com/lists/MyLists.tsx:90 #: src/view/com/lists/ProfileLists.tsx:145 diff --git a/src/locale/locales/ja/messages.po b/src/locale/locales/ja/messages.po index e8dc12ce2..bb41c6331 100644 --- a/src/locale/locales/ja/messages.po +++ b/src/locale/locales/ja/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: ja\n" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2024-06-05 11:06+0900\n" +"PO-Revision-Date: 2024-06-19 11:10+0900\n" "Last-Translator: tkusano\n" "Language-Team: Hima-Zinn, tkusano, dolciss, oboenikui, noritada, middlingphys, hibiki, reindex-ot, haoyayoi, vyv03354\n" "Plural-Forms: \n" @@ -37,10 +37,6 @@ msgstr "{0, plural, other {#個のラベルがこのコンテンツに適用さ msgid "{0, plural, one {# repost} other {# reposts}}" msgstr "{0, plural, other {#回のリポスト}}" -#: src/components/KnownFollowers.tsx:179 -msgid "{0, plural, one {and # other} other {and # others}}" -msgstr "" - #: src/components/ProfileHoverCard/index.web.tsx:376 #: src/screens/Profile/Header/Metrics.tsx:23 msgid "{0, plural, one {follower} other {followers}}" @@ -87,6 +83,26 @@ msgstr "{0}のアバター" msgid "{count, plural, one {Liked by # user} other {Liked by # users}}" msgstr "{count, plural, other {#人のユーザーがいいね}}" +#: src/lib/hooks/useTimeAgo.ts:69 +msgid "{diff, plural, one {day} other {days}}" +msgstr "{diff, plural, other {日}}" + +#: src/lib/hooks/useTimeAgo.ts:64 +msgid "{diff, plural, one {hour} other {hours}}" +msgstr "{diff, plural, other {時間}}" + +#: src/lib/hooks/useTimeAgo.ts:59 +msgid "{diff, plural, one {minute} other {minutes}}" +msgstr "{diff, plural, other {分}}" + +#: src/lib/hooks/useTimeAgo.ts:75 +msgid "{diff, plural, one {month} other {months}}" +msgstr "{diff, plural, other {ヶ月}}" + +#: src/lib/hooks/useTimeAgo.ts:54 +msgid "{diffSeconds, plural, one {second} other {seconds}}" +msgstr "{diffSeconds, plural, other {秒}}" + #: src/screens/SignupQueued.tsx:207 msgid "{estimatedTimeHrs, plural, one {hour} other {hours}}" msgstr "{estimatedTimeHrs, plural, other {時間}}" @@ -114,6 +130,10 @@ msgstr "{likeCount, plural, other {#人のユーザーがいいね}}" msgid "{numUnreadNotifications} unread" msgstr "{numUnreadNotifications}件の未読" +#: src/components/NewskieDialog.tsx:75 +msgid "{profileName} joined Bluesky {0} ago" +msgstr "{profileName}はBlueskyに{0}前に参加しました" + #: src/view/screens/PreferencesFollowingFeed.tsx:67 msgid "{value, plural, =0 {Show all replies} one {Show replies with at least # like} other {Show replies with at least # likes}}" msgstr "{value, plural, =0 {すべての返信を表示} other {#個以上のいいねがついた返信を表示}}" @@ -270,6 +290,10 @@ msgstr "フォローしているユーザーのみのデフォルトのフィー msgid "Add the following DNS record to your domain:" msgstr "次のDNSレコードをドメインに追加してください：" +#: src/components/FeedCard.tsx:173 +msgid "Add this feed to your feeds" +msgstr "このフィードをあなたのフィードに追加する" + #: src/view/com/profile/ProfileMenu.tsx:265 #: src/view/com/profile/ProfileMenu.tsx:268 msgid "Add to Lists" @@ -469,6 +493,10 @@ msgstr "この会話から退出しますか？あなたのメッセージはあ msgid "Are you sure you want to remove {0} from your feeds?" msgstr "あなたのフィードから{0}を削除してもよろしいですか？" +#: src/components/FeedCard.tsx:190 +msgid "Are you sure you want to remove this from your feeds?" +msgstr "本当にこのフィードをあなたのフィードから削除したいですか？" + #: src/view/com/composer/Composer.tsx:630 msgid "Are you sure you'd like to discard this draft?" msgstr "本当にこの下書きを破棄しますか？" @@ -1092,7 +1120,7 @@ msgstr "{0}として続行（現在サインイン中）" #: src/view/com/post-thread/PostThreadLoadMore.tsx:52 msgid "Continue thread..." -msgstr "" +msgstr "スレッドの続き…" #: src/screens/Onboarding/StepInterests/index.tsx:250 #: src/screens/Onboarding/StepProfile/index.tsx:266 @@ -1419,6 +1447,10 @@ msgstr "アプリがログアウトしたユーザーに自分のアカウント msgid "Discover new custom feeds" msgstr "新しいカスタムフィードを見つける" +#: src/view/screens/Search/Explore.tsx:378 +msgid "Discover new feeds" +msgstr "新しいフィードを探す" + #: src/view/screens/Feeds.tsx:794 msgid "Discover New Feeds" msgstr "新しいフィードを探す" @@ -1534,16 +1566,16 @@ msgstr "例：返信として広告を繰り返し送ってくるユーザー。 msgid "Each code works once. You'll receive more invite codes periodically." msgstr "それぞれのコードは一回限り有効です。定期的に追加の招待コードをお送りします。" -#: src/view/screens/Feeds.tsx:400 -#: src/view/screens/Feeds.tsx:471 -msgid "Edit" -msgstr "" - #: src/view/com/lists/ListMembers.tsx:149 msgctxt "action" msgid "Edit" msgstr "編集" +#: src/view/screens/Feeds.tsx:400 +#: src/view/screens/Feeds.tsx:471 +msgid "Edit" +msgstr "編集" + #: src/view/com/util/UserAvatar.tsx:312 #: src/view/com/util/UserBanner.tsx:92 msgid "Edit avatar" @@ -1583,11 +1615,6 @@ msgstr "プロフィールを編集" msgid "Edit Profile" msgstr "プロフィールを編集" -#: src/view/com/home/HomeHeaderLayout.web.tsx:76 -#: src/view/screens/Feeds.tsx:416 -#~ msgid "Edit Saved Feeds" -#~ msgstr "保存されたフィードを編集" - #: src/view/com/modals/CreateOrEditList.tsx:234 msgid "Edit User List" msgstr "ユーザーリストを編集" @@ -1754,6 +1781,10 @@ msgstr "全員" msgid "Everybody can reply" msgstr "誰でも返信可能" +#: src/view/com/threadgate/WhoCanReply.tsx:129 +msgid "Everybody can reply." +msgstr "誰でも返信可能です。" + #: src/components/dms/MessagesNUX.tsx:131 #: src/components/dms/MessagesNUX.tsx:134 #: src/screens/Messages/Settings.tsx:75 @@ -1857,6 +1888,11 @@ msgstr "メッセージの削除に失敗しました" msgid "Failed to delete post, please try again" msgstr "投稿の削除に失敗しました。もう一度お試しください。" +#: src/view/screens/Search/Explore.tsx:414 +#: src/view/screens/Search/Explore.tsx:438 +msgid "Failed to load feeds preferences" +msgstr "フィードの設定の読み込みに失敗しました" + #: src/components/dialogs/GifSelect.ios.tsx:196 #: src/components/dialogs/GifSelect.tsx:212 msgid "Failed to load GIFs" @@ -1866,6 +1902,15 @@ msgstr "GIFの読み込みに失敗しました" msgid "Failed to load past messages" msgstr "過去のメッセージの読み込みに失敗しました" +#: src/view/screens/Search/Explore.tsx:407 +#: src/view/screens/Search/Explore.tsx:431 +msgid "Failed to load suggested feeds" +msgstr "おすすめのフィードの読み込みに失敗しました" + +#: src/view/screens/Search/Explore.tsx:367 +msgid "Failed to load suggested follows" +msgstr "おすすめのフォローの読み込みに失敗しました" + #: src/view/com/lightbox/Lightbox.tsx:84 msgid "Failed to save image: {0}" msgstr "画像の保存に失敗しました：{0}" @@ -1879,6 +1924,14 @@ msgstr "送信に失敗" msgid "Failed to submit appeal, please try again." msgstr "異議申し立ての送信に失敗しました。再度試してください。" +#: src/view/com/util/forms/PostDropdownBtn.tsx:180 +msgid "Failed to toggle thread mute, please try again" +msgstr "スレッドのミュートの切り替えに失敗しました。再度試してください" + +#: src/components/FeedCard.tsx:153 +msgid "Failed to update feeds" +msgstr "フィードの更新に失敗しました" + #: src/components/dms/MessagesNUX.tsx:60 #: src/screens/Messages/Settings.tsx:35 msgid "Failed to update settings" @@ -1914,6 +1967,10 @@ msgstr "フィード" msgid "Feeds are custom algorithms that users build with a little coding expertise. <0/> for more information." msgstr "フィードはユーザーがプログラミングの専門知識を持って構築するカスタムアルゴリズムです。詳細については、<0/>を参照してください。" +#: src/components/FeedCard.tsx:150 +msgid "Feeds updated!" +msgstr "フィードを更新しました！" + #: src/view/com/modals/ChangeHandle.tsx:475 msgid "File Contents" msgstr "ファイルのコンテンツ" @@ -1996,14 +2053,30 @@ msgstr "アカウントをフォロー" msgid "Follow Back" msgstr "フォローバック" -#: src/components/KnownFollowers.tsx:169 -msgid "Followed by" -msgstr "" +#: src/view/screens/Search/Explore.tsx:332 +msgid "Follow more accounts to get connected to your interests and build your network." +msgstr "もっとたくさんのアカウントをフォローして、興味あることにつながり、ネットワークを広げましょう。" #: src/view/com/profile/ProfileCard.tsx:227 msgid "Followed by {0}" msgstr "{0}がフォロー中" +#: src/components/KnownFollowers.tsx:192 +msgid "Followed by <0>{0}</0>" +msgstr "<0>{0}</0>がフォロー中" + +#: src/components/KnownFollowers.tsx:209 +msgid "Followed by <0>{0}</0> and {1, plural, one {# other} other {# others}}" +msgstr "<0>{0}</0>および{1, plural, other {他#人}}がフォロー中" + +#: src/components/KnownFollowers.tsx:181 +msgid "Followed by <0>{0}</0> and <1>{1}</1>" +msgstr "<0>{0}</0>と<1>{1}</1>がフォロー中" + +#: src/components/KnownFollowers.tsx:168 +msgid "Followed by <0>{0}</0>, <1>{1}</1>, and {2, plural, one {# other} other {# others}}" +msgstr "<0>{0}</0>、<1>{1}</1>および{2, plural, other {他#人}}がフォロー中" + #: src/view/com/modals/Threadgate.tsx:99 msgid "Followed users" msgstr "自分がフォローしているユーザー" @@ -2023,12 +2096,12 @@ msgstr "フォロワー" #: src/Navigation.tsx:177 msgid "Followers of @{0} that you know" -msgstr "" +msgstr "あなたが知っている@{0}のフォロワー" #: src/screens/Profile/KnownFollowers.tsx:108 #: src/screens/Profile/KnownFollowers.tsx:118 msgid "Followers you know" -msgstr "" +msgstr "あなたが知っているフォロワー" #: src/components/ProfileHoverCard/index.web.tsx:411 #: src/components/ProfileHoverCard/index.web.tsx:422 @@ -2118,6 +2191,10 @@ msgstr "始める" msgid "Get Started" msgstr "開始" +#: src/view/com/util/images/ImageHorzList.tsx:35 +msgid "GIF" +msgstr "GIF" + #: src/screens/Onboarding/StepProfile/index.tsx:225 msgid "Give your profile a face" msgstr "プロフィールに顔をつける" @@ -2658,6 +2735,18 @@ msgstr "リスト" msgid "Lists blocking this user:" msgstr "このユーザーをブロックしているリスト：" +#: src/view/screens/Search/Explore.tsx:128 +msgid "Load more" +msgstr "さらに読み込む" + +#: src/view/screens/Search/Explore.tsx:216 +msgid "Load more suggested feeds" +msgstr "おすすめのフィードをさらに読み込む" + +#: src/view/screens/Search/Explore.tsx:214 +msgid "Load more suggested follows" +msgstr "おすすめのフォローをさらに読み込む" + #: src/view/screens/Notifications.tsx:184 msgid "Load new notifications" msgstr "最新の通知を読み込む" @@ -3062,6 +3151,10 @@ msgctxt "action" msgid "New Post" msgstr "新しい投稿" +#: src/components/NewskieDialog.tsx:68 +msgid "New user info dialog" +msgstr "新しいユーザー情報ダイアログ" + #: src/view/com/modals/CreateOrEditList.tsx:236 msgid "New User List" msgstr "新しいユーザーリスト" @@ -3142,7 +3235,7 @@ msgstr "誰からも受け取らない" #: src/screens/Profile/Sections/Feed.tsx:59 msgid "No posts yet." -msgstr "" +msgstr "まだ投稿がありません。" #: src/view/com/composer/text-input/mobile/Autocomplete.tsx:101 #: src/view/com/composer/text-input/web/Autocomplete.tsx:195 @@ -3236,6 +3329,10 @@ msgstr "通知音" msgid "Notifications" msgstr "通知" +#: src/lib/hooks/useTimeAgo.ts:51 +msgid "now" +msgstr "今" + #: src/components/dms/MessageItem.tsx:175 msgid "Now" msgstr "今" @@ -3274,6 +3371,10 @@ msgstr "OK" msgid "Oldest replies first" msgstr "古い順に返信を表示" +#: src/lib/hooks/useTimeAgo.ts:81 +msgid "on {str}" +msgstr "{str}" + #: src/view/screens/Settings/index.tsx:256 msgid "Onboarding reset" msgstr "オンボーディングのリセット" @@ -3449,11 +3550,6 @@ msgstr "モデレーションの設定を開く" msgid "Opens password reset form" msgstr "パスワードリセットのフォームを開く" -#: src/view/com/home/HomeHeaderLayout.web.tsx:77 -#: src/view/screens/Feeds.tsx:417 -#~ msgid "Opens screen to edit Saved Feeds" -#~ msgstr "保存されたフィードの編集画面を開く" - #: src/view/screens/Settings/index.tsx:617 msgid "Opens screen with all saved feeds" msgstr "保存されたすべてのフィードで画面を開く" @@ -3777,7 +3873,7 @@ msgstr "再実行する" #: src/components/KnownFollowers.tsx:111 msgid "Press to view followers of this account that you also follow" -msgstr "" +msgstr "あなたもフォローしているこのアカウントのフォロワーを見る" #: src/view/com/lightbox/Lightbox.web.tsx:150 msgid "Previous image" @@ -3975,7 +4071,7 @@ msgstr "リストから削除されました" #: src/view/com/feeds/FeedSourceCard.tsx:139 msgid "Removed from my feeds" -msgstr "フィードから削除しました" +msgstr "マイフィードから削除しました" #: src/view/com/posts/FeedShutdownMsg.tsx:44 #: src/view/screens/ProfileFeed.tsx:191 @@ -4000,9 +4096,9 @@ msgstr "Discoverで置き換える" msgid "Replies" msgstr "返信" -#: src/view/com/threadgate/WhoCanReply.tsx:98 -msgid "Replies to this thread are disabled" -msgstr "このスレッドへの返信はできません" +#: src/view/com/threadgate/WhoCanReply.tsx:131 +msgid "Replies to this thread are disabled." +msgstr "このスレッドへの返信はできません。" #: src/view/com/composer/Composer.tsx:475 msgctxt "action" @@ -4019,6 +4115,11 @@ msgctxt "description" msgid "Reply to <0><1/></0>" msgstr "<0><1/></0>に返信" +#: src/view/com/posts/FeedItem.tsx:437 +msgctxt "description" +msgid "Reply to a blocked post" +msgstr "ブロックした投稿への返信" + #: src/components/dms/MessageMenu.tsx:132 #: src/components/dms/MessagesListBlockedFooter.tsx:77 #: src/components/dms/MessagesListBlockedFooter.tsx:84 @@ -4926,9 +5027,9 @@ msgstr "このラベラーを登録" msgid "Subscribe to this list" msgstr "このリストに登録" -#: src/view/screens/Search/Search.tsx:425 -msgid "Suggested Follows" -msgstr "おすすめのフォロー" +#: src/view/screens/Search/Explore.tsx:330 +msgid "Suggested accounts" +msgstr "おすすめのアカウント" #: src/view/com/profile/ProfileHeaderSuggestedFollows.tsx:65 msgid "Suggested for you" @@ -5077,7 +5178,7 @@ msgstr "サービス規約は移動しました" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:86 msgid "There is no time limit for account deactivation, come back any time." -msgstr "アカウントの無効化に期限はありません。いつでも戻ってこれます。" +msgstr "アカウントの無効化に期限はありません。いつでも戻ってこられます。" #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:115 #: src/view/screens/ProfileFeed.tsx:541 @@ -5217,7 +5318,7 @@ msgstr "このコンテンツはBlueskyのアカウントがないと閲覧で #: src/screens/Messages/List/ChatListItem.tsx:213 msgid "This conversation is with a deleted or a deactivated account. Press for options." -msgstr "" +msgstr "削除あるいは無効化されたアカウントとの会話です。押すと選択肢が表示されます。" #: src/view/screens/Settings/ExportCarDialog.tsx:93 msgid "This feature is in beta. You can read more about repository exports in <0>this blogpost</0>." @@ -5227,12 +5328,6 @@ msgstr "この機能はベータ版です。リポジトリのエクスポート msgid "This feed is currently receiving high traffic and is temporarily unavailable. Please try again later." msgstr "現在このフィードにはアクセスが集中しており、一時的にご利用いただけません。時間をおいてもう一度お試しください。" -#: src/screens/Profile/Sections/Feed.tsx:59 -#: src/view/screens/ProfileFeed.tsx:471 -#: src/view/screens/ProfileList.tsx:729 -#~ msgid "This feed is empty!" -#~ msgstr "このフィードは空です！" - #: src/view/com/posts/CustomFeedEmptyState.tsx:37 msgid "This feed is empty! You may need to follow more users or tune your language settings." msgstr "このフィードは空です！もっと多くのユーザーをフォローするか、言語の設定を調整する必要があるかもしれません。" @@ -5240,7 +5335,7 @@ msgstr "このフィードは空です！もっと多くのユーザーをフォ #: src/view/screens/ProfileFeed.tsx:471 #: src/view/screens/ProfileList.tsx:729 msgid "This feed is empty." -msgstr "" +msgstr "このフィードは空です。" #: src/view/com/posts/FeedShutdownMsg.tsx:97 msgid "This feed is no longer online. We are showing <0>Discover</0> instead." @@ -5336,6 +5431,10 @@ msgstr "このユーザーはブロックした<0>{0}</0>リストに含まれ msgid "This user is included in the <0>{0}</0> list which you have muted." msgstr "このユーザーはミュートした<0>{0}</0>リストに含まれています。" +#: src/components/NewskieDialog.tsx:50 +msgid "This user is new here. Press for more info about when they joined." +msgstr "新しいユーザーです。ここを押すといつ参加したかの情報が表示されます。" + #: src/view/com/profile/ProfileFollows.tsx:87 msgid "This user isn't following anyone." msgstr "このユーザーは誰もフォローしていません。" @@ -5762,6 +5861,10 @@ msgstr "{0}のアバターを表示" msgid "View {0}'s profile" msgstr "{0}のプロフィールを表示" +#: src/components/ProfileHoverCard/index.web.tsx:417 +msgid "View blocked user's profile" +msgstr "ブロック中のユーザーのプロフィールを表示" + #: src/view/screens/Log.tsx:52 msgid "View debug entry" msgstr "デバッグエントリーを表示" @@ -5804,7 +5907,7 @@ msgstr "このフィードにいいねしたユーザーを見る" #: src/view/com/home/HomeHeaderLayout.web.tsx:78 #: src/view/com/home/HomeHeaderLayoutMobile.tsx:84 msgid "View your feeds and explore more" -msgstr "" +msgstr "フィードを表示し、さらにフィードを探す" #: src/view/com/modals/LinkWarning.tsx:89 #: src/view/com/modals/LinkWarning.tsx:95 @@ -5891,7 +5994,7 @@ msgstr "大変申し訳ありませんが、検索を完了できませんでし #: src/view/com/composer/Composer.tsx:318 msgid "We're sorry! The post you are replying to has been deleted." -msgstr "" +msgstr "大変申し訳ありません！返信しようとしている投稿は削除されました。" #: src/components/Lists.tsx:212 #: src/view/screens/NotFound.tsx:48 @@ -5899,8 +6002,8 @@ msgid "We're sorry! We can't find the page you were looking for." msgstr "大変申し訳ありません！お探しのページは見つかりません。" #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:330 -msgid "We're sorry! You can only subscribe to ten labelers, and you've reached your limit of ten." -msgstr "大変申し訳ありません！ラベラーは10までしか登録できず、すでに上限に達しています。" +msgid "We're sorry! You can only subscribe to twenty labelers, and you've reached your limit of twenty." +msgstr "大変申し訳ありません！ラベラーは20までしか登録できず、すでに上限に達しています。" #: src/screens/Deactivated.tsx:128 msgid "Welcome back!" @@ -6047,7 +6150,7 @@ msgstr "あなたはまだだれもフォロワーがいません。" #: src/screens/Profile/KnownFollowers.tsx:99 msgid "You don't follow any users who follow @{name}." -msgstr "" +msgstr "@{name}をフォローしているユーザーを誰もフォローしていません。" #: src/view/com/modals/InviteCodes.tsx:67 msgid "You don't have any invite codes yet! We'll send you some when you've been on Bluesky for a little longer." diff --git a/src/locale/locales/ko/messages.po b/src/locale/locales/ko/messages.po index ea3088188..5f36a7eb7 100644 --- a/src/locale/locales/ko/messages.po +++ b/src/locale/locales/ko/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: ko\n" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2024-06-08 15:32+0900\n" +"PO-Revision-Date: 2024-06-19 10:55+0900\n" "Last-Translator: quiple\n" "Language-Team: quiple, lens0021, HaruChanHeart, hazzzi, heartade\n" "Plural-Forms: \n" @@ -21,7 +21,7 @@ msgstr "(임베드 콘텐츠 포함)" msgid "(no email)" msgstr "(이메일 없음)" -#: src/view/com/notifications/FeedItem.tsx:261 +#: src/view/com/notifications/FeedItem.tsx:263 msgid "{0, plural, one {{formattedCount} other} other {{formattedCount} others}}" msgstr "외 {0, plural, other {{formattedCount}}}명" @@ -33,32 +33,29 @@ msgstr "이 계정에 {0, plural, other {#}}개의 라벨이 지정됨" msgid "{0, plural, one {# label has been placed on this content} other {# labels have been placed on this content}}" msgstr "이 콘텐츠에 {0, plural, other {#}}개의 라벨이 지정됨" -#: src/view/com/util/post-ctrls/RepostButton.tsx:65 +#: src/view/com/util/post-ctrls/RepostButton.tsx:66 msgid "{0, plural, one {# repost} other {# reposts}}" msgstr "{0, plural, other {#}}개" -#: src/components/KnownFollowers.tsx:179 -msgid "{0, plural, one {and # other} other {and # others}}" -msgstr "" - -#: src/components/ProfileHoverCard/index.web.tsx:376 +#: src/components/ProfileHoverCard/index.web.tsx:398 #: src/screens/Profile/Header/Metrics.tsx:23 msgid "{0, plural, one {follower} other {followers}}" msgstr "팔로워" -#: src/components/ProfileHoverCard/index.web.tsx:380 +#: src/components/ProfileHoverCard/index.web.tsx:402 #: src/screens/Profile/Header/Metrics.tsx:27 msgid "{0, plural, one {following} other {following}}" msgstr "팔로우 중" -#: src/view/com/util/post-ctrls/PostCtrls.tsx:252 +#: src/view/com/util/post-ctrls/PostCtrls.tsx:255 msgid "{0, plural, one {Like (# like)} other {Like (# likes)}}" msgstr "좋아요 ({0, plural, other {#}}개)" -#: src/view/com/post-thread/PostThreadItem.tsx:380 +#: src/view/com/post-thread/PostThreadItem.tsx:382 msgid "{0, plural, one {like} other {likes}}" msgstr "좋아요" +#: src/components/FeedCard.tsx:111 #: src/view/com/feeds/FeedSourceCard.tsx:301 msgid "{0, plural, one {Liked by # user} other {Liked by # users}}" msgstr "{0, plural, other {#}}명의 사용자가 좋아함" @@ -67,19 +64,19 @@ msgstr "{0, plural, other {#}}명의 사용자가 좋아함" msgid "{0, plural, one {post} other {posts}}" msgstr "게시물" -#: src/view/com/util/post-ctrls/PostCtrls.tsx:210 +#: src/view/com/util/post-ctrls/PostCtrls.tsx:213 msgid "{0, plural, one {Reply (# reply)} other {Reply (# replies)}}" msgstr "답글 ({0, plural, other {#}}개)" -#: src/view/com/post-thread/PostThreadItem.tsx:360 +#: src/view/com/post-thread/PostThreadItem.tsx:362 msgid "{0, plural, one {repost} other {reposts}}" msgstr "재게시" -#: src/view/com/util/post-ctrls/PostCtrls.tsx:248 +#: src/view/com/util/post-ctrls/PostCtrls.tsx:251 msgid "{0, plural, one {Unlike (# like)} other {Unlike (# likes)}}" msgstr "좋아요 취소 ({0, plural, other {#}}개)" -#: src/view/com/util/UserAvatar.tsx:406 +#: src/view/com/util/UserAvatar.tsx:419 msgid "{0}'s avatar" msgstr "{0} 님의 아바타" @@ -87,6 +84,26 @@ msgstr "{0} 님의 아바타" msgid "{count, plural, one {Liked by # user} other {Liked by # users}}" msgstr "{count, plural, other {#}}명의 사용자가 좋아함" +#: src/lib/hooks/useTimeAgo.ts:69 +msgid "{diff, plural, one {day} other {days}}" +msgstr "일" + +#: src/lib/hooks/useTimeAgo.ts:64 +msgid "{diff, plural, one {hour} other {hours}}" +msgstr "시간" + +#: src/lib/hooks/useTimeAgo.ts:59 +msgid "{diff, plural, one {minute} other {minutes}}" +msgstr "분" + +#: src/lib/hooks/useTimeAgo.ts:75 +msgid "{diff, plural, one {month} other {months}}" +msgstr "개월" + +#: src/lib/hooks/useTimeAgo.ts:54 +msgid "{diffSeconds, plural, one {second} other {seconds}}" +msgstr "초" + #: src/screens/SignupQueued.tsx:207 msgid "{estimatedTimeHrs, plural, one {hour} other {hours}}" msgstr "시간" @@ -95,7 +112,7 @@ msgstr "시간" msgid "{estimatedTimeMins, plural, one {minute} other {minutes}}" msgstr "분" -#: src/components/ProfileHoverCard/index.web.tsx:457 +#: src/components/ProfileHoverCard/index.web.tsx:503 #: src/screens/Profile/Header/Metrics.tsx:50 msgid "{following} following" msgstr "{following} 팔로우 중" @@ -114,11 +131,15 @@ msgstr "{likeCount, plural, other {#}}명의 사용자가 좋아함" msgid "{numUnreadNotifications} unread" msgstr "{numUnreadNotifications}개 읽지 않음" +#: src/components/NewskieDialog.tsx:75 +msgid "{profileName} joined Bluesky {0} ago" +msgstr "{profileName} 님은 {0} 전에 Bluesky에 가입했습니다." + #: src/view/screens/PreferencesFollowingFeed.tsx:67 msgid "{value, plural, =0 {Show all replies} one {Show replies with at least # like} other {Show replies with at least # likes}}" msgstr "{value, plural, =0 {모든 답글 표시} other {좋아요가 #개 이상인 답글 표시}}" -#: src/view/com/threadgate/WhoCanReply.tsx:159 +#: src/view/com/threadgate/WhoCanReply.tsx:290 msgid "<0/> members" msgstr "<0/>의 멤버" @@ -134,7 +155,7 @@ msgstr "<0>{0}</0> 팔로우 중" msgid "<0>Not Applicable.</0> This warning is only available for posts with media attached." msgstr "<0>해당 없음.</0> 이 경고는 미디어가 첨부된 게시물에만 사용할 수 있습니다." -#: src/screens/Profile/Header/Handle.tsx:43 +#: src/screens/Profile/Header/Handle.tsx:50 msgid "⚠Invalid Handle" msgstr "⚠잘못된 핸들" @@ -143,7 +164,7 @@ msgid "2FA Confirmation" msgstr "2단계 인증" #: src/view/com/util/ViewHeader.tsx:93 -#: src/view/screens/Search/Search.tsx:715 +#: src/view/screens/Search/Search.tsx:684 msgid "Access navigation links and settings" msgstr "탐색 링크 및 설정으로 이동합니다" @@ -161,7 +182,7 @@ msgid "Accessibility settings" msgstr "접근성 설정" #: src/Navigation.tsx:296 -#: src/view/screens/AccessibilitySettings.tsx:63 +#: src/view/screens/AccessibilitySettings.tsx:69 msgid "Accessibility Settings" msgstr "접근성 설정" @@ -171,15 +192,15 @@ msgstr "접근성 설정" msgid "Account" msgstr "계정" -#: src/view/com/profile/ProfileMenu.tsx:142 +#: src/view/com/profile/ProfileMenu.tsx:145 msgid "Account blocked" msgstr "계정 차단됨" -#: src/view/com/profile/ProfileMenu.tsx:156 +#: src/view/com/profile/ProfileMenu.tsx:159 msgid "Account followed" msgstr "계정 팔로우함" -#: src/view/com/profile/ProfileMenu.tsx:116 +#: src/view/com/profile/ProfileMenu.tsx:119 msgid "Account muted" msgstr "계정 뮤트됨" @@ -200,16 +221,16 @@ msgstr "계정 옵션" msgid "Account removed from quick access" msgstr "빠른 액세스에서 계정 제거" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:135 -#: src/view/com/profile/ProfileMenu.tsx:131 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:139 +#: src/view/com/profile/ProfileMenu.tsx:134 msgid "Account unblocked" msgstr "계정 차단 해제됨" -#: src/view/com/profile/ProfileMenu.tsx:169 +#: src/view/com/profile/ProfileMenu.tsx:172 msgid "Account unfollowed" msgstr "계정 언팔로우함" -#: src/view/com/profile/ProfileMenu.tsx:105 +#: src/view/com/profile/ProfileMenu.tsx:108 msgid "Account unmuted" msgstr "계정 언뮤트됨" @@ -270,8 +291,12 @@ msgstr "내가 팔로우하는 사람의 기본 피드만 추가하기" msgid "Add the following DNS record to your domain:" msgstr "도메인에 다음 DNS 레코드를 추가하세요:" -#: src/view/com/profile/ProfileMenu.tsx:265 +#: src/components/FeedCard.tsx:180 +msgid "Add this feed to your feeds" +msgstr "이 피드를 내 피드에 추가하기" + #: src/view/com/profile/ProfileMenu.tsx:268 +#: src/view/com/profile/ProfileMenu.tsx:271 msgid "Add to Lists" msgstr "리스트에 추가" @@ -306,7 +331,7 @@ msgstr "성인 콘텐츠가 비활성화되어 있습니다." msgid "Advanced" msgstr "고급" -#: src/view/screens/Feeds.tsx:771 +#: src/view/screens/Feeds.tsx:737 msgid "All the feeds you've saved, right in one place." msgstr "저장한 모든 피드를 한 곳에서 확인하세요." @@ -331,17 +356,17 @@ msgstr "이미 @{0}(으)로 로그인했습니다" #: src/view/com/composer/GifAltText.tsx:93 #: src/view/com/composer/photos/Gallery.tsx:144 -#: src/view/com/util/post-embeds/GifEmbed.tsx:173 +#: src/view/com/util/post-embeds/GifEmbed.tsx:177 msgid "ALT" msgstr "ALT" #: src/view/com/composer/GifAltText.tsx:144 #: src/view/com/modals/EditImage.tsx:316 -#: src/view/screens/AccessibilitySettings.tsx:77 +#: src/view/screens/AccessibilitySettings.tsx:83 msgid "Alt text" msgstr "대체 텍스트" -#: src/view/com/util/post-embeds/GifEmbed.tsx:179 +#: src/view/com/util/post-embeds/GifEmbed.tsx:183 msgid "Alt Text" msgstr "대체 텍스트" @@ -379,9 +404,8 @@ msgstr "문제가 발생했습니다. 다시 시도해 주세요." msgid "an unknown error occurred" msgstr "알 수 없는 오류가 발생했습니다" -#: src/components/KnownFollowers.tsx:187 -#: src/view/com/notifications/FeedItem.tsx:258 -#: src/view/com/threadgate/WhoCanReply.tsx:180 +#: src/view/com/notifications/FeedItem.tsx:260 +#: src/view/com/threadgate/WhoCanReply.tsx:311 msgid "and" msgstr "및" @@ -389,7 +413,7 @@ msgstr "및" msgid "Animals" msgstr "동물" -#: src/view/com/util/post-embeds/GifEmbed.tsx:148 +#: src/view/com/util/post-embeds/GifEmbed.tsx:149 msgid "Animated GIF" msgstr "움직이는 GIF" @@ -469,7 +493,11 @@ msgstr "정말 이 대화에서 나가시겠습니까? 나에게 보이는 메 msgid "Are you sure you want to remove {0} from your feeds?" msgstr "피드에서 {0}을(를) 제거하시겠습니까?" -#: src/view/com/composer/Composer.tsx:630 +#: src/components/FeedCard.tsx:197 +msgid "Are you sure you want to remove this from your feeds?" +msgstr "내 피드에서 이 피드를 삭제하시겠습니까?" + +#: src/view/com/composer/Composer.tsx:632 msgid "Are you sure you'd like to discard this draft?" msgstr "이 초안을 삭제하시겠습니까?" @@ -524,8 +552,8 @@ msgstr "생년월일" msgid "Birthday:" msgstr "생년월일:" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:309 -#: src/view/com/profile/ProfileMenu.tsx:363 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:314 +#: src/view/com/profile/ProfileMenu.tsx:366 msgid "Block" msgstr "차단" @@ -534,12 +562,12 @@ msgstr "차단" msgid "Block account" msgstr "계정 차단" -#: src/view/com/profile/ProfileMenu.tsx:302 -#: src/view/com/profile/ProfileMenu.tsx:309 +#: src/view/com/profile/ProfileMenu.tsx:305 +#: src/view/com/profile/ProfileMenu.tsx:312 msgid "Block Account" msgstr "계정 차단" -#: src/view/com/profile/ProfileMenu.tsx:346 +#: src/view/com/profile/ProfileMenu.tsx:349 msgid "Block Account?" msgstr "계정을 차단하시겠습니까?" @@ -569,7 +597,7 @@ msgstr "차단한 계정" msgid "Blocked Accounts" msgstr "차단한 계정" -#: src/view/com/profile/ProfileMenu.tsx:358 +#: src/view/com/profile/ProfileMenu.tsx:361 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you." msgstr "차단한 계정은 내 스레드에 답글을 달거나 나를 멘션하거나 기타 다른 방식으로 나와 상호작용할 수 없습니다." @@ -577,7 +605,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:363 +#: src/view/com/post-thread/PostThread.tsx:367 msgid "Blocked post." msgstr "차단된 게시물." @@ -589,7 +617,7 @@ msgstr "차단하더라도 이 라벨러가 내 계정에 라벨을 붙이는 msgid "Blocking is public. Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you." msgstr "차단 목록은 공개됩니다. 차단한 계정은 내 스레드에 답글을 달거나 나를 멘션하거나 기타 다른 방식으로 나와 상호작용할 수 없습니다." -#: src/view/com/profile/ProfileMenu.tsx:355 +#: src/view/com/profile/ProfileMenu.tsx:358 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." msgstr "차단하더라도 내 계정에 라벨이 붙는 것은 막지 못하지만, 이 계정이 내 스레드에 답글을 달거나 나와 상호작용하는 것은 중지됩니다." @@ -664,8 +692,8 @@ msgstr "글자, 숫자, 공백, 대시, 밑줄만 포함할 수 있습니다. #: src/components/Prompt.tsx:121 #: src/components/TagMenu/index.tsx:268 #: src/screens/Deactivated.tsx:161 -#: src/view/com/composer/Composer.tsx:432 -#: src/view/com/composer/Composer.tsx:438 +#: src/view/com/composer/Composer.tsx:434 +#: src/view/com/composer/Composer.tsx:440 #: src/view/com/modals/ChangeEmail.tsx:213 #: src/view/com/modals/ChangeEmail.tsx:215 #: src/view/com/modals/ChangeHandle.tsx:148 @@ -681,8 +709,8 @@ msgstr "글자, 숫자, 공백, 대시, 밑줄만 포함할 수 있습니다. #: src/view/com/modals/LinkWarning.tsx:107 #: src/view/com/modals/VerifyEmail.tsx:255 #: src/view/com/modals/VerifyEmail.tsx:261 -#: src/view/com/util/post-ctrls/RepostButton.tsx:138 -#: src/view/screens/Search/Search.tsx:735 +#: src/view/com/util/post-ctrls/RepostButton.tsx:139 +#: src/view/screens/Search/Search.tsx:704 #: src/view/shell/desktop/Search.tsx:218 msgid "Cancel" msgstr "취소" @@ -711,7 +739,7 @@ msgstr "이미지 자르기 취소" msgid "Cancel profile editing" msgstr "프로필 편집 취소" -#: src/view/com/util/post-ctrls/RepostButton.tsx:132 +#: src/view/com/util/post-ctrls/RepostButton.tsx:133 msgid "Cancel quote post" msgstr "게시물 인용 취소" @@ -807,7 +835,7 @@ msgstr "이메일에서 로그인 코드를 확인한 후 여기에 입력하세 msgid "Check your inbox for an email with the confirmation code to enter below:" msgstr "받은 편지함에서 아래에 입력하는 인증 코드가 포함된 이메일이 있는지 확인하세요:" -#: src/view/com/modals/Threadgate.tsx:73 +#: src/view/com/modals/Threadgate.tsx:75 msgid "Choose \"Everybody\" or \"Nobody\"" msgstr "\"모두\" 또는 \"없음\"을 선택하세요." @@ -844,7 +872,7 @@ msgid "Clear all storage data (restart after this)" msgstr "모든 스토리지 데이터 지우기 (이후 다시 시작)" #: src/view/com/util/forms/SearchInput.tsx:88 -#: src/view/screens/Search/Search.tsx:861 +#: src/view/screens/Search/Search.tsx:824 msgid "Clear search query" msgstr "검색어 지우기" @@ -889,7 +917,7 @@ msgstr "다그닥 🐴 다그닥 🐴" #: src/components/dms/dialogs/SearchablePeopleList.tsx:261 #: src/view/com/modals/ChangePassword.tsx:268 #: src/view/com/modals/ChangePassword.tsx:271 -#: src/view/com/util/post-embeds/GifEmbed.tsx:185 +#: src/view/com/util/post-embeds/GifEmbed.tsx:189 msgid "Close" msgstr "닫기" @@ -944,7 +972,7 @@ msgstr "하단 탐색 막대를 닫습니다" msgid "Closes password update alert" msgstr "비밀번호 변경 알림을 닫습니다" -#: src/view/com/composer/Composer.tsx:434 +#: src/view/com/composer/Composer.tsx:436 msgid "Closes post composer and discards post draft" msgstr "게시물 작성 상자를 닫고 게시물 초안을 삭제합니다" @@ -952,11 +980,11 @@ msgstr "게시물 작성 상자를 닫고 게시물 초안을 삭제합니다" msgid "Closes viewer for header image" msgstr "헤더 이미지 뷰어를 닫습니다" -#: src/view/com/notifications/FeedItem.tsx:205 +#: src/view/com/notifications/FeedItem.tsx:207 msgid "Collapse list of users" msgstr "사용자 목록 접기" -#: src/view/com/notifications/FeedItem.tsx:341 +#: src/view/com/notifications/FeedItem.tsx:343 msgid "Collapses list of users for a given notification" msgstr "이 알림에 대한 사용자 목록을 축소합니다" @@ -981,7 +1009,7 @@ msgstr "온보딩 완료 후 계정 사용 시작" msgid "Complete the challenge" msgstr "챌린지 완료하기" -#: src/view/com/composer/Composer.tsx:551 +#: src/view/com/composer/Composer.tsx:553 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length" msgstr "최대 {MAX_GRAPHEME_LENGTH}자 길이까지 글을 작성할 수 있습니다" @@ -997,8 +1025,8 @@ msgstr "{name} 카테고리에 대한 콘텐츠 필터링 설정을 구성합니 msgid "Configured in <0>moderation settings</0>." msgstr "<0>검토 설정</0>에서 설정합니다." -#: src/components/Prompt.tsx:159 #: src/components/Prompt.tsx:162 +#: src/components/Prompt.tsx:165 #: src/view/com/modals/SelfLabel.tsx:155 #: src/view/com/modals/VerifyEmail.tsx:239 #: src/view/com/modals/VerifyEmail.tsx:241 @@ -1092,7 +1120,7 @@ msgstr "{0}(으)로 계속하기 (현재 로그인)" #: src/view/com/post-thread/PostThreadLoadMore.tsx:52 msgid "Continue thread..." -msgstr "" +msgstr "스레드 더 보기..." #: src/screens/Onboarding/StepInterests/index.tsx:250 #: src/screens/Onboarding/StepProfile/index.tsx:266 @@ -1121,7 +1149,7 @@ msgstr "빌드 버전 클립보드에 복사됨" #: src/view/com/modals/AddAppPasswords.tsx:80 #: src/view/com/modals/ChangeHandle.tsx:320 #: src/view/com/modals/InviteCodes.tsx:153 -#: src/view/com/util/forms/PostDropdownBtn.tsx:182 +#: src/view/com/util/forms/PostDropdownBtn.tsx:189 msgid "Copied to clipboard" msgstr "클립보드에 복사됨" @@ -1150,8 +1178,8 @@ msgstr "코드 복사" msgid "Copy link to list" msgstr "리스트 링크 복사" -#: src/view/com/util/forms/PostDropdownBtn.tsx:297 -#: src/view/com/util/forms/PostDropdownBtn.tsx:306 +#: src/view/com/util/forms/PostDropdownBtn.tsx:307 +#: src/view/com/util/forms/PostDropdownBtn.tsx:316 msgid "Copy link to post" msgstr "게시물 링크 복사" @@ -1160,8 +1188,8 @@ msgstr "게시물 링크 복사" msgid "Copy message text" msgstr "메시지 텍스트 복사" -#: src/view/com/util/forms/PostDropdownBtn.tsx:275 -#: src/view/com/util/forms/PostDropdownBtn.tsx:277 +#: src/view/com/util/forms/PostDropdownBtn.tsx:285 +#: src/view/com/util/forms/PostDropdownBtn.tsx:287 msgid "Copy post text" msgstr "게시물 텍스트 복사" @@ -1238,7 +1266,8 @@ msgstr "사용자 지정" msgid "Custom domain" msgstr "사용자 지정 도메인" -#: src/view/screens/Feeds.tsx:797 +#: src/view/screens/Feeds.tsx:763 +#: src/view/screens/Search/Explore.tsx:383 msgid "Custom feeds built by the community bring you new experiences and help you find the content you love." msgstr "커뮤니티에서 구축한 맞춤 피드는 새로운 경험을 제공하고 좋아하는 콘텐츠를 찾을 수 있도록 도와줍니다." @@ -1281,7 +1310,7 @@ msgid "Debug panel" msgstr "디버그 패널" #: src/components/dms/MessageMenu.tsx:151 -#: src/view/com/util/forms/PostDropdownBtn.tsx:423 +#: src/view/com/util/forms/PostDropdownBtn.tsx:433 #: src/view/screens/AppPasswords.tsx:285 #: src/view/screens/ProfileList.tsx:667 msgid "Delete" @@ -1332,8 +1361,8 @@ msgstr "내 계정 삭제" msgid "Delete My Account…" msgstr "내 계정 삭제…" -#: src/view/com/util/forms/PostDropdownBtn.tsx:404 -#: src/view/com/util/forms/PostDropdownBtn.tsx:406 +#: src/view/com/util/forms/PostDropdownBtn.tsx:414 +#: src/view/com/util/forms/PostDropdownBtn.tsx:416 msgid "Delete post" msgstr "게시물 삭제" @@ -1341,7 +1370,7 @@ msgstr "게시물 삭제" msgid "Delete this list?" msgstr "이 리스트를 삭제하시겠습니까?" -#: src/view/com/util/forms/PostDropdownBtn.tsx:418 +#: src/view/com/util/forms/PostDropdownBtn.tsx:428 msgid "Delete this post?" msgstr "이 게시물을 삭제하시겠습니까?" @@ -1349,7 +1378,7 @@ msgstr "이 게시물을 삭제하시겠습니까?" msgid "Deleted" msgstr "삭제됨" -#: src/view/com/post-thread/PostThread.tsx:349 +#: src/view/com/post-thread/PostThread.tsx:353 msgid "Deleted post." msgstr "삭제된 게시물." @@ -1380,7 +1409,7 @@ msgstr "어둑함" msgid "Direct messages are here!" msgstr "다이렉트 메시지가 생겼습니다!" -#: src/view/screens/AccessibilitySettings.tsx:94 +#: src/view/screens/AccessibilitySettings.tsx:107 msgid "Disable autoplay for GIFs" msgstr "GIF 자동 재생 끄기" @@ -1388,7 +1417,7 @@ msgstr "GIF 자동 재생 끄기" msgid "Disable Email 2FA" msgstr "이메일 2단계 인증 끄기" -#: src/view/screens/AccessibilitySettings.tsx:108 +#: src/view/screens/AccessibilitySettings.tsx:121 msgid "Disable haptic feedback" msgstr "햅틱 피드백 끄기" @@ -1401,11 +1430,11 @@ msgstr "햅틱 피드백 끄기" msgid "Disabled" msgstr "사용 안 함" -#: src/view/com/composer/Composer.tsx:632 +#: src/view/com/composer/Composer.tsx:634 msgid "Discard" msgstr "삭제" -#: src/view/com/composer/Composer.tsx:629 +#: src/view/com/composer/Composer.tsx:631 msgid "Discard draft?" msgstr "초안 삭제" @@ -1419,10 +1448,18 @@ msgstr "앱이 로그아웃한 사용자에게 내 계정을 표시하지 않도 msgid "Discover new custom feeds" msgstr "새로운 맞춤 피드 찾아보기" -#: src/view/screens/Feeds.tsx:794 +#: src/view/screens/Search/Explore.tsx:381 +msgid "Discover new feeds" +msgstr "새 피드 발견하기" + +#: src/view/screens/Feeds.tsx:760 msgid "Discover New Feeds" msgstr "새 피드 발견하기" +#: src/view/screens/AccessibilitySettings.tsx:95 +msgid "Display larger alt text badges" +msgstr "더 큰 대체 텍스트 배지 표시" + #: src/view/com/modals/EditProfile.tsx:193 msgid "Display name" msgstr "표시 이름" @@ -1453,8 +1490,8 @@ msgstr "도메인을 확인했습니다." #: src/components/dialogs/BirthDateSettings.tsx:119 #: src/components/dialogs/BirthDateSettings.tsx:125 -#: src/components/forms/DateField/index.tsx:74 -#: src/components/forms/DateField/index.tsx:80 +#: src/components/forms/DateField/index.tsx:77 +#: src/components/forms/DateField/index.tsx:83 #: src/screens/Onboarding/StepProfile/index.tsx:322 #: src/screens/Onboarding/StepProfile/index.tsx:325 #: src/view/com/auth/server-input/index.tsx:169 @@ -1472,8 +1509,8 @@ msgstr "완료" #: src/view/com/modals/EditImage.tsx:334 #: src/view/com/modals/ListAddRemoveUsers.tsx:144 #: src/view/com/modals/SelfLabel.tsx:158 -#: src/view/com/modals/Threadgate.tsx:130 #: src/view/com/modals/Threadgate.tsx:133 +#: src/view/com/modals/Threadgate.tsx:136 #: src/view/com/modals/UserAddRemoveLists.tsx:108 #: src/view/com/modals/UserAddRemoveLists.tsx:111 #: src/view/screens/PreferencesThreads.tsx:162 @@ -1490,7 +1527,7 @@ msgstr "완료{extraText}" msgid "Download CAR file" msgstr "CAR 파일 다운로드" -#: src/view/com/composer/text-input/TextInput.web.tsx:261 +#: src/view/com/composer/text-input/TextInput.web.tsx:272 msgid "Drop to add images" msgstr "드롭하여 이미지 추가" @@ -1534,17 +1571,17 @@ msgstr "예: 반복적으로 광고 답글을 다는 계정." msgid "Each code works once. You'll receive more invite codes periodically." msgstr "각 코드는 한 번만 사용할 수 있습니다. 주기적으로 더 많은 초대 코드를 받게 됩니다." -#: src/view/screens/Feeds.tsx:400 -#: src/view/screens/Feeds.tsx:471 -msgid "Edit" -msgstr "" - #: src/view/com/lists/ListMembers.tsx:149 msgctxt "action" msgid "Edit" msgstr "편집" -#: src/view/com/util/UserAvatar.tsx:312 +#: src/view/screens/Feeds.tsx:370 +#: src/view/screens/Feeds.tsx:441 +msgid "Edit" +msgstr "편집" + +#: src/view/com/util/UserAvatar.tsx:325 #: src/view/com/util/UserBanner.tsx:92 msgid "Edit avatar" msgstr "아바타 편집" @@ -1563,8 +1600,8 @@ msgid "Edit Moderation List" msgstr "검토 리스트 편집" #: src/Navigation.tsx:269 -#: src/view/screens/Feeds.tsx:398 -#: src/view/screens/Feeds.tsx:469 +#: src/view/screens/Feeds.tsx:368 +#: src/view/screens/Feeds.tsx:439 #: src/view/screens/SavedFeeds.tsx:93 msgid "Edit My Feeds" msgstr "내 피드 편집" @@ -1574,24 +1611,24 @@ msgid "Edit my profile" msgstr "내 프로필 편집" #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:181 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:175 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:179 msgid "Edit profile" msgstr "프로필 편집" #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:184 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:178 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:182 msgid "Edit Profile" msgstr "프로필 편집" -#: src/view/com/home/HomeHeaderLayout.web.tsx:76 -#: src/view/screens/Feeds.tsx:416 -#~ msgid "Edit Saved Feeds" -#~ msgstr "저장한 피드 편집" - #: src/view/com/modals/CreateOrEditList.tsx:234 msgid "Edit User List" msgstr "사용자 리스트 편집" +#: src/view/com/threadgate/WhoCanReply.tsx:73 +#: src/view/com/threadgate/WhoCanReply.tsx:130 +msgid "Edit who can reply" +msgstr "답글을 달 수 있는 사람 편집" + #: src/view/com/modals/EditProfile.tsx:194 msgid "Edit your display name" msgstr "내 표시 이름 편집" @@ -1639,8 +1676,8 @@ msgid "Embed HTML code" msgstr "임베드 HTML 코드" #: src/components/dialogs/Embed.tsx:97 -#: src/view/com/util/forms/PostDropdownBtn.tsx:314 -#: src/view/com/util/forms/PostDropdownBtn.tsx:316 +#: src/view/com/util/forms/PostDropdownBtn.tsx:324 +#: src/view/com/util/forms/PostDropdownBtn.tsx:326 msgid "Embed post" msgstr "게시물 임베드" @@ -1746,11 +1783,14 @@ msgstr "캡차 응답을 수신하는 동안 오류가 발생했습니다." msgid "Error:" msgstr "오류:" -#: src/view/com/modals/Threadgate.tsx:77 +#: src/view/com/modals/Threadgate.tsx:79 msgid "Everybody" msgstr "모두" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:46 +#: src/view/com/threadgate/WhoCanReply.tsx:64 +#: src/view/com/threadgate/WhoCanReply.tsx:121 +#: src/view/com/threadgate/WhoCanReply.tsx:235 msgid "Everybody can reply" msgstr "누구나 답글을 달 수 있음" @@ -1794,7 +1834,7 @@ msgstr "검색어 입력을 종료합니다" msgid "Expand alt text" msgstr "대체 텍스트 확장" -#: src/view/com/notifications/FeedItem.tsx:206 +#: src/view/com/notifications/FeedItem.tsx:208 msgid "Expand list of users" msgstr "사용자 목록 펼치기" @@ -1853,10 +1893,15 @@ msgstr "리스트를 만들지 못했습니다. 인터넷 연결을 확인한 msgid "Failed to delete message" msgstr "메시지를 삭제하지 못했습니다" -#: src/view/com/util/forms/PostDropdownBtn.tsx:149 +#: src/view/com/util/forms/PostDropdownBtn.tsx:152 msgid "Failed to delete post, please try again" msgstr "게시물을 삭제하지 못했습니다. 다시 시도해 주세요" +#: src/view/screens/Search/Explore.tsx:417 +#: src/view/screens/Search/Explore.tsx:441 +msgid "Failed to load feeds preferences" +msgstr "피드 환경설정을 불러오지 못했습니다" + #: src/components/dialogs/GifSelect.ios.tsx:196 #: src/components/dialogs/GifSelect.tsx:212 msgid "Failed to load GIFs" @@ -1866,6 +1911,15 @@ msgstr "GIF를 불러오지 못했습니다" msgid "Failed to load past messages" msgstr "지난 메시지를 불러오지 못했습니다" +#: src/view/screens/Search/Explore.tsx:410 +#: src/view/screens/Search/Explore.tsx:434 +msgid "Failed to load suggested feeds" +msgstr "추천 피드를 불러오지 못했습니다" + +#: src/view/screens/Search/Explore.tsx:370 +msgid "Failed to load suggested follows" +msgstr "추천 팔로우를 불러오지 못했습니다" + #: src/view/com/lightbox/Lightbox.tsx:84 msgid "Failed to save image: {0}" msgstr "이미지를 저장하지 못함: {0}" @@ -1877,7 +1931,15 @@ msgstr "전송 실패" #: src/components/moderation/LabelsOnMeDialog.tsx:223 #: src/screens/Messages/Conversation/ChatDisabled.tsx:87 msgid "Failed to submit appeal, please try again." -msgstr "이의신청을 제출하지 못했습니다. 다시 시도하세요." +msgstr "이의신청을 제출하지 못했습니다. 다시 시도해 주세요." + +#: src/view/com/util/forms/PostDropdownBtn.tsx:180 +msgid "Failed to toggle thread mute, please try again" +msgstr "스레드 뮤트를 전환하지 못했습니다. 다시 시도해 주세요" + +#: src/components/FeedCard.tsx:160 +msgid "Failed to update feeds" +msgstr "피드를 업데이트하지 못했습니다" #: src/components/dms/MessagesNUX.tsx:60 #: src/screens/Messages/Settings.tsx:35 @@ -1888,11 +1950,12 @@ msgstr "설정을 업데이트하지 못했습니다" msgid "Feed" msgstr "피드" +#: src/components/FeedCard.tsx:91 #: src/view/com/feeds/FeedSourceCard.tsx:251 msgid "Feed by {0}" msgstr "{0} 님의 피드" -#: src/view/screens/Feeds.tsx:709 +#: src/view/screens/Feeds.tsx:675 msgid "Feed offline" msgstr "피드 오프라인" @@ -1901,9 +1964,10 @@ msgstr "피드 오프라인" msgid "Feedback" msgstr "피드백" -#: src/view/screens/Feeds.tsx:463 -#: src/view/screens/Feeds.tsx:570 +#: src/view/screens/Feeds.tsx:433 +#: src/view/screens/Feeds.tsx:536 #: src/view/screens/Profile.tsx:197 +#: src/view/screens/Search/Search.tsx:375 #: src/view/shell/desktop/LeftNav.tsx:367 #: src/view/shell/Drawer.tsx:493 #: src/view/shell/Drawer.tsx:494 @@ -1914,6 +1978,10 @@ msgstr "피드" msgid "Feeds are custom algorithms that users build with a little coding expertise. <0/> for more information." msgstr "피드는 사용자가 약간의 코딩 전문 지식만으로 구축할 수 있는 맞춤 알고리즘입니다. <0/>에서 자세한 내용을 확인하세요." +#: src/components/FeedCard.tsx:157 +msgid "Feeds updated!" +msgstr "피드 업데이트됨" + #: src/view/com/modals/ChangeHandle.tsx:475 msgid "File Contents" msgstr "파일 콘텐츠" @@ -1936,7 +2004,7 @@ msgstr "마무리 중" msgid "Find accounts to follow" msgstr "팔로우할 계정 찾아보기" -#: src/view/screens/Search/Search.tsx:470 +#: src/view/screens/Search/Search.tsx:439 msgid "Find posts and users on Bluesky" msgstr "Bluesky에서 게시물 및 사용자 찾기" @@ -1965,9 +2033,9 @@ msgstr "가로로 뒤집기" msgid "Flip vertically" msgstr "세로로 뒤집기" -#: src/components/ProfileHoverCard/index.web.tsx:412 -#: src/components/ProfileHoverCard/index.web.tsx:423 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:248 +#: src/components/ProfileHoverCard/index.web.tsx:446 +#: src/components/ProfileHoverCard/index.web.tsx:457 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:252 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:146 #: src/view/com/profile/ProfileHeaderSuggestedFollows.tsx:247 msgid "Follow" @@ -1978,7 +2046,7 @@ msgctxt "action" msgid "Follow" msgstr "팔로우" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:234 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:238 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:128 msgid "Follow {0}" msgstr "{0} 님을 팔로우" @@ -1987,8 +2055,8 @@ msgstr "{0} 님을 팔로우" msgid "Follow {name}" msgstr "{name} 님을 팔로우" -#: src/view/com/profile/ProfileMenu.tsx:244 -#: src/view/com/profile/ProfileMenu.tsx:255 +#: src/view/com/profile/ProfileMenu.tsx:247 +#: src/view/com/profile/ProfileMenu.tsx:258 msgid "Follow Account" msgstr "계정 팔로우" @@ -1996,15 +2064,31 @@ msgstr "계정 팔로우" msgid "Follow Back" msgstr "맞팔로우" -#: src/components/KnownFollowers.tsx:169 -msgid "Followed by" -msgstr "" +#: src/view/screens/Search/Explore.tsx:333 +msgid "Follow more accounts to get connected to your interests and build your network." +msgstr "더 많은 계정을 팔로우하고 관심 분야를 연결하여 네트워크를 구축하세요." #: src/view/com/profile/ProfileCard.tsx:227 msgid "Followed by {0}" msgstr "{0} 님이 팔로우함" -#: src/view/com/modals/Threadgate.tsx:99 +#: src/components/KnownFollowers.tsx:223 +msgid "Followed by <0>{0}</0>" +msgstr "<0>{0}</0> 님이 팔로우함" + +#: src/components/KnownFollowers.tsx:209 +msgid "Followed by <0>{0}</0> and {1, plural, one {# other} other {# others}}" +msgstr "<0>{0}</0> 님 외 {1, plural, other {#}}명이 팔로우함" + +#: src/components/KnownFollowers.tsx:196 +msgid "Followed by <0>{0}</0> and <1>{1}</1>" +msgstr "<0>{0}</0> 님과 <1>{1}</1> 님이 팔로우함" + +#: src/components/KnownFollowers.tsx:178 +msgid "Followed by <0>{0}</0>, <1>{1}</1>, and {2, plural, one {# other} other {# others}}" +msgstr "<0>{0}</0> 님, <1>{1}</1> 님 외 {2, plural, other {#}}명이 팔로우함" + +#: src/view/com/modals/Threadgate.tsx:101 msgid "Followed users" msgstr "팔로우한 사용자" @@ -2012,7 +2096,7 @@ msgstr "팔로우한 사용자" msgid "Followed users only" msgstr "팔로우한 사용자만" -#: src/view/com/notifications/FeedItem.tsx:173 +#: src/view/com/notifications/FeedItem.tsx:175 msgid "followed you" msgstr "이(가) 나를 팔로우했습니다" @@ -2023,25 +2107,25 @@ msgstr "팔로워" #: src/Navigation.tsx:177 msgid "Followers of @{0} that you know" -msgstr "" +msgstr "내가 아는 @{0} 님의 팔로워" #: src/screens/Profile/KnownFollowers.tsx:108 #: src/screens/Profile/KnownFollowers.tsx:118 msgid "Followers you know" -msgstr "" +msgstr "내가 아는 팔로워" -#: src/components/ProfileHoverCard/index.web.tsx:411 -#: src/components/ProfileHoverCard/index.web.tsx:422 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:246 +#: src/components/ProfileHoverCard/index.web.tsx:445 +#: src/components/ProfileHoverCard/index.web.tsx:456 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:250 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:149 #: src/view/com/profile/ProfileFollows.tsx:104 -#: src/view/screens/Feeds.tsx:656 +#: src/view/screens/Feeds.tsx:622 #: src/view/screens/ProfileFollows.tsx:25 #: src/view/screens/SavedFeeds.tsx:415 msgid "Following" msgstr "팔로우 중" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:94 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:98 msgid "Following {0}" msgstr "{0} 님을 팔로우했습니다" @@ -2059,7 +2143,7 @@ msgstr "팔로우 중 피드 설정" msgid "Following Feed Preferences" msgstr "팔로우 중 피드 설정" -#: src/screens/Profile/Header/Handle.tsx:24 +#: src/screens/Profile/Header/Handle.tsx:31 msgid "Follows you" msgstr "나를 팔로우함" @@ -2100,7 +2184,7 @@ msgstr "잦은 원치 않는 콘텐츠 게시" msgid "From @{sanitizedAuthor}" msgstr "@{sanitizedAuthor} 님의 태그" -#: src/view/com/posts/FeedItem.tsx:232 +#: src/view/com/posts/FeedItem.tsx:236 msgctxt "from-feed" msgid "From <0/>" msgstr "<0/>에서" @@ -2118,6 +2202,10 @@ msgstr "시작하기" msgid "Get Started" msgstr "시작하기" +#: src/view/com/util/images/ImageHorzList.tsx:35 +msgid "GIF" +msgstr "GIF" + #: src/screens/Onboarding/StepProfile/index.tsx:225 msgid "Give your profile a face" msgstr "프로필에 얼굴 달기" @@ -2188,7 +2276,7 @@ msgstr "그래픽 미디어" msgid "Handle" msgstr "핸들" -#: src/view/screens/AccessibilitySettings.tsx:103 +#: src/view/screens/AccessibilitySettings.tsx:116 msgid "Haptics" msgstr "햅틱" @@ -2223,35 +2311,35 @@ msgstr "앱 비밀번호입니다." #: src/components/moderation/ContentHider.tsx:116 #: src/components/moderation/LabelPreference.tsx:134 -#: src/components/moderation/PostHider.tsx:121 +#: src/components/moderation/PostHider.tsx:122 #: src/lib/moderation/useLabelBehaviorDescription.ts:15 #: src/lib/moderation/useLabelBehaviorDescription.ts:20 #: src/lib/moderation/useLabelBehaviorDescription.ts:25 #: src/lib/moderation/useLabelBehaviorDescription.ts:30 -#: src/view/com/util/forms/PostDropdownBtn.tsx:432 +#: src/view/com/util/forms/PostDropdownBtn.tsx:442 msgid "Hide" msgstr "숨기기" -#: src/view/com/notifications/FeedItem.tsx:348 +#: src/view/com/notifications/FeedItem.tsx:350 msgctxt "action" msgid "Hide" msgstr "숨기기" -#: src/view/com/util/forms/PostDropdownBtn.tsx:377 -#: src/view/com/util/forms/PostDropdownBtn.tsx:379 +#: src/view/com/util/forms/PostDropdownBtn.tsx:387 +#: src/view/com/util/forms/PostDropdownBtn.tsx:389 msgid "Hide post" msgstr "게시물 숨기기" #: src/components/moderation/ContentHider.tsx:68 -#: src/components/moderation/PostHider.tsx:78 +#: src/components/moderation/PostHider.tsx:79 msgid "Hide the content" msgstr "콘텐츠 숨기기" -#: src/view/com/util/forms/PostDropdownBtn.tsx:429 +#: src/view/com/util/forms/PostDropdownBtn.tsx:439 msgid "Hide this post?" msgstr "이 게시물을 숨기시겠습니까?" -#: src/view/com/notifications/FeedItem.tsx:339 +#: src/view/com/notifications/FeedItem.tsx:341 msgid "Hide user list" msgstr "사용자 리스트 숨기기" @@ -2341,7 +2429,7 @@ msgstr "해당 국가의 법률에 따라 아직 성인이 아닌 경우, 부모 msgid "If you delete this list, you won't be able to recover it." msgstr "이 리스트를 삭제하면 다시 복구할 수 없습니다." -#: src/view/com/util/forms/PostDropdownBtn.tsx:420 +#: src/view/com/util/forms/PostDropdownBtn.tsx:430 msgid "If you remove this post, you won't be able to recover it." msgstr "이 게시물을 삭제하면 다시 복구할 수 없습니다." @@ -2357,7 +2445,7 @@ msgstr "핸들이나 이메일을 변경하려는 경우 비활성화하기 전 msgid "Illegal and Urgent" msgstr "불법 및 긴급 사항" -#: src/view/com/util/images/Gallery.tsx:39 +#: src/view/com/util/images/Gallery.tsx:42 msgid "Image" msgstr "이미지" @@ -2426,7 +2514,7 @@ msgstr "다이렉트 메시지 소개" msgid "Invalid 2FA confirmation code." msgstr "잘못된 2단계 인증 코드입니다." -#: src/view/com/post-thread/PostThreadItem.tsx:235 +#: src/view/com/post-thread/PostThreadItem.tsx:236 msgid "Invalid or unsupported post record" msgstr "유효하지 않거나 지원되지 않는 게시물 기록" @@ -2442,7 +2530,7 @@ msgstr "친구 초대하기" msgid "Invite code" msgstr "초대 코드" -#: src/screens/Signup/state.ts:272 +#: src/screens/Signup/state.ts:275 msgid "Invite code not accepted. Check that you input it correctly and try again." msgstr "초대 코드가 올바르지 않습니다. 코드를 올바르게 입력했는지 확인한 후 다시 시도하세요." @@ -2504,7 +2592,7 @@ msgid "Languages" msgstr "언어" #: src/screens/Hashtag.tsx:99 -#: src/view/screens/Search/Search.tsx:377 +#: src/view/screens/Search/Search.tsx:359 msgid "Latest" msgstr "최신" @@ -2517,7 +2605,7 @@ msgstr "더 알아보기" msgid "Learn more about the moderation applied to this content." msgstr "이 콘텐츠에 적용된 검토 설정에 대해 자세히 알아보세요." -#: src/components/moderation/PostHider.tsx:99 +#: src/components/moderation/PostHider.tsx:100 #: src/components/moderation/ScreenHider.tsx:125 msgid "Learn more about this warning" msgstr "이 경고에 대해 더 알아보기" @@ -2593,11 +2681,11 @@ msgstr "좋아요 표시한 사용자" msgid "Liked By" msgstr "좋아요 표시한 사용자" -#: src/view/com/notifications/FeedItem.tsx:176 +#: src/view/com/notifications/FeedItem.tsx:178 msgid "liked your custom feed" msgstr "이(가) 내 맞춤 피드를 좋아합니다" -#: src/view/com/notifications/FeedItem.tsx:168 +#: src/view/com/notifications/FeedItem.tsx:170 msgid "liked your post" msgstr "이(가) 내 게시물을 좋아합니다" @@ -2605,7 +2693,7 @@ msgstr "이(가) 내 게시물을 좋아합니다" msgid "Likes" msgstr "좋아요" -#: src/view/com/post-thread/PostThreadItem.tsx:196 +#: src/view/com/post-thread/PostThreadItem.tsx:197 msgid "Likes on this post" msgstr "이 게시물을 좋아요 표시합니다" @@ -2658,6 +2746,18 @@ msgstr "리스트" msgid "Lists blocking this user:" msgstr "이 사용자를 차단한 리스트:" +#: src/view/screens/Search/Explore.tsx:130 +msgid "Load more" +msgstr "더 불러오기" + +#: src/view/screens/Search/Explore.tsx:218 +msgid "Load more suggested feeds" +msgstr "추천 피드 더 불러오기" + +#: src/view/screens/Search/Explore.tsx:216 +msgid "Load more suggested follows" +msgstr "추천 팔로우 더 불러오기" + #: src/view/screens/Notifications.tsx:184 msgid "Load new notifications" msgstr "새 알림 불러오기" @@ -2730,21 +2830,21 @@ msgstr "뮤트한 단어 및 태그 관리" msgid "Mark as read" msgstr "읽음으로 표시" -#: src/view/screens/AccessibilitySettings.tsx:89 +#: src/view/screens/AccessibilitySettings.tsx:102 #: src/view/screens/Profile.tsx:195 msgid "Media" msgstr "미디어" -#: src/view/com/threadgate/WhoCanReply.tsx:139 +#: src/view/com/threadgate/WhoCanReply.tsx:270 msgid "mentioned users" msgstr "멘션한 사용자" -#: src/view/com/modals/Threadgate.tsx:94 +#: src/view/com/modals/Threadgate.tsx:96 msgid "Mentioned users" msgstr "멘션한 사용자" #: src/view/com/util/ViewHeader.tsx:91 -#: src/view/screens/Search/Search.tsx:714 +#: src/view/screens/Search/Search.tsx:683 msgid "Menu" msgstr "메뉴" @@ -2844,7 +2944,7 @@ msgstr "검토 도구" msgid "Moderator has chosen to set a general warning on the content." msgstr "검토자가 콘텐츠에 일반 경고를 설정했습니다." -#: src/view/com/post-thread/PostThreadItem.tsx:566 +#: src/view/com/post-thread/PostThreadItem.tsx:567 msgid "More" msgstr "더 보기" @@ -2868,8 +2968,8 @@ msgstr "뮤트" msgid "Mute {truncatedTag}" msgstr "{truncatedTag} 뮤트" -#: src/view/com/profile/ProfileMenu.tsx:281 -#: src/view/com/profile/ProfileMenu.tsx:288 +#: src/view/com/profile/ProfileMenu.tsx:284 +#: src/view/com/profile/ProfileMenu.tsx:291 msgid "Mute Account" msgstr "계정 뮤트" @@ -2910,13 +3010,13 @@ msgstr "게시물 글 및 태그에서 이 단어 뮤트하기" msgid "Mute this word in tags only" msgstr "태그에서만 이 단어 뮤트하기" -#: src/view/com/util/forms/PostDropdownBtn.tsx:352 -#: src/view/com/util/forms/PostDropdownBtn.tsx:358 +#: src/view/com/util/forms/PostDropdownBtn.tsx:362 +#: src/view/com/util/forms/PostDropdownBtn.tsx:368 msgid "Mute thread" msgstr "스레드 뮤트" -#: src/view/com/util/forms/PostDropdownBtn.tsx:368 -#: src/view/com/util/forms/PostDropdownBtn.tsx:370 +#: src/view/com/util/forms/PostDropdownBtn.tsx:378 +#: src/view/com/util/forms/PostDropdownBtn.tsx:380 msgid "Mute words & tags" msgstr "단어 및 태그 뮤트" @@ -2954,7 +3054,7 @@ msgstr "뮤트 목록은 비공개입니다. 뮤트한 계정은 나와 상호 msgid "My Birthday" msgstr "내 생년월일" -#: src/view/screens/Feeds.tsx:768 +#: src/view/screens/Feeds.tsx:734 msgid "My Feeds" msgstr "내 피드" @@ -3047,7 +3147,7 @@ msgctxt "action" msgid "New post" msgstr "새 게시물" -#: src/view/screens/Feeds.tsx:600 +#: src/view/screens/Feeds.tsx:566 #: src/view/screens/Notifications.tsx:193 #: src/view/screens/Profile.tsx:464 #: src/view/screens/ProfileFeed.tsx:426 @@ -3062,6 +3162,10 @@ msgctxt "action" msgid "New Post" msgstr "새 게시물" +#: src/components/NewskieDialog.tsx:68 +msgid "New user info dialog" +msgstr "새 사용자 정보 대화 상자" + #: src/view/com/modals/CreateOrEditList.tsx:236 msgid "New User List" msgstr "새 사용자 리스트" @@ -3113,7 +3217,7 @@ msgstr "DNS 패널 없음" msgid "No featured GIFs found. There may be an issue with Tenor." msgstr "인기 GIF를 찾을 수 없습니다. Tenor에 문제가 있을 수 있습니다." -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:116 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:120 msgid "No longer following {0}" msgstr "더 이상 {0} 님을 팔로우하지 않음" @@ -3157,13 +3261,14 @@ msgstr "결과 없음" msgid "No results found" msgstr "결과를 찾을 수 없음" -#: src/view/screens/Feeds.tsx:530 +#: src/view/screens/Feeds.tsx:497 msgid "No results found for \"{query}\"" msgstr "\"{query}\"에 대한 결과를 찾을 수 없습니다" #: src/view/com/modals/ListAddRemoveUsers.tsx:127 -#: src/view/screens/Search/Search.tsx:297 -#: src/view/screens/Search/Search.tsx:336 +#: src/view/screens/Search/Search.tsx:233 +#: src/view/screens/Search/Search.tsx:272 +#: src/view/screens/Search/Search.tsx:318 msgid "No results found for {query}" msgstr "{query}에 대한 결과를 찾을 수 없습니다" @@ -3177,7 +3282,7 @@ msgstr "\"{search}\"에 대한 검색 결과를 찾을 수 없습니다." msgid "No thanks" msgstr "사용하지 않음" -#: src/view/com/modals/Threadgate.tsx:83 +#: src/view/com/modals/Threadgate.tsx:85 msgid "Nobody" msgstr "없음" @@ -3204,9 +3309,9 @@ msgstr "찾을 수 없음" msgid "Not right now" msgstr "나중에 하기" -#: src/view/com/profile/ProfileMenu.tsx:370 -#: src/view/com/util/forms/PostDropdownBtn.tsx:446 -#: src/view/com/util/post-ctrls/PostCtrls.tsx:308 +#: src/view/com/profile/ProfileMenu.tsx:373 +#: src/view/com/util/forms/PostDropdownBtn.tsx:456 +#: src/view/com/util/post-ctrls/PostCtrls.tsx:311 msgid "Note about sharing" msgstr "공유 관련 참고 사항" @@ -3236,6 +3341,10 @@ msgstr "알림음" msgid "Notifications" msgstr "알림" +#: src/lib/hooks/useTimeAgo.ts:51 +msgid "now" +msgstr "지금" + #: src/components/dms/MessageItem.tsx:175 msgid "Now" msgstr "지금" @@ -3274,11 +3383,15 @@ msgstr "확인" msgid "Oldest replies first" msgstr "오래된 순" +#: src/lib/hooks/useTimeAgo.ts:81 +msgid "on {str}" +msgstr "" + #: src/view/screens/Settings/index.tsx:256 msgid "Onboarding reset" msgstr "온보딩 재설정" -#: src/view/com/composer/Composer.tsx:503 +#: src/view/com/composer/Composer.tsx:505 msgid "One or more images is missing alt text." msgstr "하나 이상의 이미지에 대체 텍스트가 누락되었습니다." @@ -3286,9 +3399,9 @@ msgstr "하나 이상의 이미지에 대체 텍스트가 누락되었습니다. msgid "Only .jpg and .png files are supported" msgstr ".jpg 및 .png 파일만 지원합니다" -#: src/view/com/threadgate/WhoCanReply.tsx:100 -msgid "Only {0} can reply." -msgstr "{0}만 답글을 달 수 있습니다." +#: src/view/com/threadgate/WhoCanReply.tsx:239 +msgid "Only {0} can reply" +msgstr "{0}만 답글을 달 수 있음" #: src/screens/Signup/StepHandle.tsx:98 msgid "Only contains letters, numbers, and hyphens" @@ -3321,8 +3434,8 @@ msgstr "아바타 생성기 열기" msgid "Open conversation options" msgstr "대화 옵션 열기" -#: src/view/com/composer/Composer.tsx:613 -#: src/view/com/composer/Composer.tsx:614 +#: src/view/com/composer/Composer.tsx:615 +#: src/view/com/composer/Composer.tsx:616 msgid "Open emoji picker" msgstr "이모티콘 선택기 열기" @@ -3346,7 +3459,7 @@ msgstr "뮤트한 단어 및 태그 설정 열기" msgid "Open navigation" msgstr "내비게이션 열기" -#: src/view/com/util/forms/PostDropdownBtn.tsx:237 +#: src/view/com/util/forms/PostDropdownBtn.tsx:247 msgid "Open post options menu" msgstr "게시물 옵션 메뉴 열기" @@ -3367,7 +3480,7 @@ msgstr "{numItems}번째 옵션을 엽니다" msgid "Opens accessibility settings" msgstr "접근성 설정을 엽니다" -#: src/view/screens/Log.tsx:54 +#: src/view/screens/Log.tsx:58 msgid "Opens additional details for a debug entry" msgstr "디버그 항목에 대한 추가 세부 정보를 엽니다" @@ -3449,11 +3562,6 @@ msgstr "검토 설정을 엽니다" msgid "Opens password reset form" msgstr "비밀번호 재설정 양식을 엽니다" -#: src/view/com/home/HomeHeaderLayout.web.tsx:77 -#: src/view/screens/Feeds.tsx:417 -#~ msgid "Opens screen to edit Saved Feeds" -#~ msgstr "저장한 피드를 편집할 수 있는 화면을 엽니다" - #: src/view/screens/Settings/index.tsx:617 msgid "Opens screen with all saved feeds" msgstr "모든 저장한 피드 화면을 엽니다" @@ -3483,8 +3591,8 @@ msgstr "시스템 로그 페이지를 엽니다" msgid "Opens the threads preferences" msgstr "스레드 설정을 엽니다" -#: src/view/com/notifications/FeedItem.tsx:427 -#: src/view/com/util/UserAvatar.tsx:409 +#: src/view/com/notifications/FeedItem.tsx:429 +#: src/view/com/util/UserAvatar.tsx:422 msgid "Opens this profile" msgstr "이 프로필을 엽니다" @@ -3497,7 +3605,7 @@ msgstr "{numItems}개 중 {0}번째 옵션" msgid "Optionally provide additional information below:" msgstr "선택 사항으로 아래에 추가 정보를 입력하세요:" -#: src/view/com/modals/Threadgate.tsx:90 +#: src/view/com/modals/Threadgate.tsx:92 msgid "Or combine these options:" msgstr "또는 다음 옵션을 결합하세요:" @@ -3553,11 +3661,11 @@ msgstr "비밀번호 변경됨" msgid "Password updated!" msgstr "비밀번호 변경됨" -#: src/view/com/util/post-embeds/GifEmbed.tsx:36 +#: src/view/com/util/post-embeds/GifEmbed.tsx:37 msgid "Pause" msgstr "일시 정지" -#: src/view/screens/Search/Search.tsx:387 +#: src/view/screens/Search/Search.tsx:369 msgid "People" msgstr "사람들" @@ -3602,7 +3710,7 @@ msgstr "고정한 피드" msgid "Pinned to your feeds" msgstr "내 피드에 고정됨" -#: src/view/com/util/post-embeds/GifEmbed.tsx:36 +#: src/view/com/util/post-embeds/GifEmbed.tsx:37 msgid "Play" msgstr "재생" @@ -3610,7 +3718,7 @@ msgstr "재생" msgid "Play {0}" msgstr "{0} 재생" -#: src/view/com/util/post-embeds/GifEmbed.tsx:35 +#: src/view/com/util/post-embeds/GifEmbed.tsx:36 msgid "Play or pause the GIF" msgstr "GIP를 재생하거나 일시 정지합니다" @@ -3688,13 +3796,13 @@ msgstr "정치" msgid "Porn" msgstr "음란물" -#: src/view/com/composer/Composer.tsx:477 -#: src/view/com/composer/Composer.tsx:485 +#: src/view/com/composer/Composer.tsx:479 +#: src/view/com/composer/Composer.tsx:487 msgctxt "action" msgid "Post" msgstr "게시하기" -#: src/view/com/post-thread/PostThread.tsx:430 +#: src/view/com/post-thread/PostThread.tsx:434 msgctxt "description" msgid "Post" msgstr "게시물" @@ -3709,7 +3817,7 @@ msgstr "{0} 님의 게시물" msgid "Post by @{0}" msgstr "@{0} 님의 게시물" -#: src/view/com/util/forms/PostDropdownBtn.tsx:129 +#: src/view/com/util/forms/PostDropdownBtn.tsx:132 msgid "Post deleted" msgstr "게시물 삭제됨" @@ -3775,9 +3883,9 @@ msgstr "호스팅 제공자를 변경하려면 누릅니다" msgid "Press to retry" msgstr "다시 시도하려면 누르기" -#: src/components/KnownFollowers.tsx:111 +#: src/components/KnownFollowers.tsx:116 msgid "Press to view followers of this account that you also follow" -msgstr "" +msgstr "내가 팔로우하는 이 계정의 팔로워를 보려면 누르세요" #: src/view/com/lightbox/Lightbox.web.tsx:150 msgid "Previous image" @@ -3845,18 +3953,18 @@ msgstr "일괄 뮤트하거나 차단할 수 있는 공개적이고 공유 가 msgid "Public, shareable lists which can drive feeds." msgstr "피드를 탐색할 수 있는 공개적이고 공유 가능한 목록입니다." -#: src/view/com/composer/Composer.tsx:462 +#: src/view/com/composer/Composer.tsx:464 msgid "Publish post" msgstr "게시물 게시하기" -#: src/view/com/composer/Composer.tsx:462 +#: src/view/com/composer/Composer.tsx:464 msgid "Publish reply" msgstr "답글 게시하기" -#: src/view/com/util/post-ctrls/RepostButton.tsx:115 -#: src/view/com/util/post-ctrls/RepostButton.tsx:127 -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:78 -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:81 +#: src/view/com/util/post-ctrls/RepostButton.tsx:116 +#: src/view/com/util/post-ctrls/RepostButton.tsx:128 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:79 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:82 msgid "Quote post" msgstr "게시물 인용" @@ -3876,7 +3984,7 @@ msgstr "계정 재활성화" msgid "Reason:" msgstr "이유:" -#: src/view/screens/Search/Search.tsx:970 +#: src/view/screens/Search/Search.tsx:933 msgid "Recent Searches" msgstr "최근 검색" @@ -3889,6 +3997,7 @@ msgid "Reload conversations" msgstr "대화 다시 불러오기" #: src/components/dialogs/MutedWords.tsx:286 +#: src/components/FeedCard.tsx:200 #: src/view/com/feeds/FeedSourceCard.tsx:317 #: src/view/com/modals/ListAddRemoveUsers.tsx:268 #: src/view/com/modals/SelfLabel.tsx:84 @@ -3901,7 +4010,7 @@ msgstr "제거" msgid "Remove account" msgstr "계정 제거" -#: src/view/com/util/UserAvatar.tsx:371 +#: src/view/com/util/UserAvatar.tsx:384 msgid "Remove Avatar" msgstr "아바타 제거" @@ -3931,6 +4040,7 @@ msgstr "피드를 제거하시겠습니까?" msgid "Remove from my feeds" msgstr "내 피드에서 제거" +#: src/components/FeedCard.tsx:195 #: src/view/com/feeds/FeedSourceCard.tsx:312 msgid "Remove from my feeds?" msgstr "내 피드에서 제거하시겠습니까?" @@ -3947,11 +4057,11 @@ msgstr "이미지 미리보기 제거" msgid "Remove mute word from your list" msgstr "목록에서 뮤트한 단어 제거" -#: src/view/screens/Search/Search.tsx:1011 +#: src/view/screens/Search/Search.tsx:974 msgid "Remove profile" msgstr "프로필 제거" -#: src/view/screens/Search/Search.tsx:1013 +#: src/view/screens/Search/Search.tsx:976 msgid "Remove profile from search history" msgstr "검색 기록에서 프로필을 제거합니다" @@ -3959,8 +4069,8 @@ msgstr "검색 기록에서 프로필을 제거합니다" msgid "Remove quote" msgstr "인용 제거" -#: src/view/com/util/post-ctrls/RepostButton.tsx:92 -#: src/view/com/util/post-ctrls/RepostButton.tsx:108 +#: src/view/com/util/post-ctrls/RepostButton.tsx:93 +#: src/view/com/util/post-ctrls/RepostButton.tsx:109 msgid "Remove repost" msgstr "재게시를 취소합니다" @@ -4000,11 +4110,19 @@ msgstr "Discover로 교체" msgid "Replies" msgstr "답글" -#: src/view/com/threadgate/WhoCanReply.tsx:98 +#: src/view/com/threadgate/WhoCanReply.tsx:66 +msgid "Replies disabled" +msgstr "답글 비활성화됨" + +#: src/view/com/threadgate/WhoCanReply.tsx:123 +msgid "Replies on this thread are disabled" +msgstr "이 스레드에 대한 답글이 비활성화됨" + +#: src/view/com/threadgate/WhoCanReply.tsx:237 msgid "Replies to this thread are disabled" -msgstr "이 스레드에 대한 답글이 비활성화됩니다." +msgstr "이 스레드에 대한 답글이 비활성화됨" -#: src/view/com/composer/Composer.tsx:475 +#: src/view/com/composer/Composer.tsx:477 msgctxt "action" msgid "Reply" msgstr "답글" @@ -4014,19 +4132,24 @@ msgid "Reply Filters" msgstr "답글 필터" #: src/view/com/post/Post.tsx:190 -#: src/view/com/posts/FeedItem.tsx:427 +#: src/view/com/posts/FeedItem.tsx:439 msgctxt "description" msgid "Reply to <0><1/></0>" msgstr "<0><1/></0> 님에게 보내는 답글" +#: src/view/com/posts/FeedItem.tsx:437 +msgctxt "description" +msgid "Reply to a blocked post" +msgstr "차단된 게시물에 보내는 답글" + #: src/components/dms/MessageMenu.tsx:132 #: src/components/dms/MessagesListBlockedFooter.tsx:77 #: src/components/dms/MessagesListBlockedFooter.tsx:84 msgid "Report" msgstr "신고" -#: src/view/com/profile/ProfileMenu.tsx:321 #: src/view/com/profile/ProfileMenu.tsx:324 +#: src/view/com/profile/ProfileMenu.tsx:327 msgid "Report Account" msgstr "계정 신고" @@ -4053,8 +4176,8 @@ msgstr "리스트 신고" msgid "Report message" msgstr "메시지 신고" -#: src/view/com/util/forms/PostDropdownBtn.tsx:394 -#: src/view/com/util/forms/PostDropdownBtn.tsx:396 +#: src/view/com/util/forms/PostDropdownBtn.tsx:404 +#: src/view/com/util/forms/PostDropdownBtn.tsx:406 msgid "Report post" msgstr "게시물 신고" @@ -4084,21 +4207,21 @@ msgstr "이 게시물 신고하기" msgid "Report this user" msgstr "이 사용자 신고하기" -#: src/view/com/util/post-ctrls/RepostButton.tsx:64 -#: src/view/com/util/post-ctrls/RepostButton.tsx:93 -#: src/view/com/util/post-ctrls/RepostButton.tsx:109 +#: src/view/com/util/post-ctrls/RepostButton.tsx:65 +#: src/view/com/util/post-ctrls/RepostButton.tsx:94 +#: src/view/com/util/post-ctrls/RepostButton.tsx:110 msgctxt "action" msgid "Repost" msgstr "재게시" -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:69 -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:73 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:70 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:74 msgid "Repost" msgstr "재게시" -#: src/view/com/util/post-ctrls/RepostButton.tsx:85 -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:46 -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:92 +#: src/view/com/util/post-ctrls/RepostButton.tsx:86 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:47 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:93 msgid "Repost or quote post" msgstr "재게시 또는 게시물 인용" @@ -4106,19 +4229,19 @@ msgstr "재게시 또는 게시물 인용" msgid "Reposted By" msgstr "재게시한 사용자" -#: src/view/com/posts/FeedItem.tsx:250 +#: src/view/com/posts/FeedItem.tsx:254 msgid "Reposted by {0}" msgstr "{0} 님이 재게시함" -#: src/view/com/posts/FeedItem.tsx:265 +#: src/view/com/posts/FeedItem.tsx:269 msgid "Reposted by <0><1/></0>" msgstr "<0><1/></0> 님이 재게시함" -#: src/view/com/notifications/FeedItem.tsx:170 +#: src/view/com/notifications/FeedItem.tsx:172 msgid "reposted your post" msgstr "이(가) 내 게시물을 재게시했습니다" -#: src/view/com/post-thread/PostThreadItem.tsx:201 +#: src/view/com/post-thread/PostThreadItem.tsx:202 msgid "Reposts of this post" msgstr "이 게시물의 재게시" @@ -4132,7 +4255,7 @@ msgstr "변경 요청" msgid "Request Code" msgstr "코드 요청" -#: src/view/screens/AccessibilitySettings.tsx:82 +#: src/view/screens/AccessibilitySettings.tsx:88 msgid "Require alt text before posting" msgstr "게시하기 전 대체 텍스트 필수" @@ -4282,6 +4405,7 @@ msgid "Saves image crop settings" msgstr "이미지 자르기 설정을 저장합니다" #: src/components/dms/ChatEmptyPill.tsx:33 +#: src/components/NewskieDialog.tsx:72 msgid "Say hello!" msgstr "인사해 보세요!" @@ -4299,9 +4423,9 @@ msgstr "맨 위로 스크롤" #: src/view/com/modals/ListAddRemoveUsers.tsx:75 #: src/view/com/util/forms/SearchInput.tsx:67 #: src/view/com/util/forms/SearchInput.tsx:79 -#: src/view/screens/Search/Search.tsx:452 -#: src/view/screens/Search/Search.tsx:822 -#: src/view/screens/Search/Search.tsx:850 +#: src/view/screens/Search/Search.tsx:421 +#: src/view/screens/Search/Search.tsx:791 +#: src/view/screens/Search/Search.tsx:813 #: src/view/shell/bottom-bar/BottomBar.tsx:179 #: src/view/shell/desktop/LeftNav.tsx:343 #: src/view/shell/desktop/Search.tsx:194 @@ -4315,7 +4439,7 @@ msgstr "검색" msgid "Search for \"{query}\"" msgstr "\"{query}\"에 대한 검색 결과" -#: src/view/screens/Search/Search.tsx:906 +#: src/view/screens/Search/Search.tsx:869 msgid "Search for \"{searchText}\"" msgstr "\"{searchText}\"에 대한 검색 결과" @@ -4496,8 +4620,8 @@ msgstr "{0} 님에게 신고 보내기" msgid "Send verification email" msgstr "인증 이메일 보내기" -#: src/view/com/util/forms/PostDropdownBtn.tsx:286 -#: src/view/com/util/forms/PostDropdownBtn.tsx:289 +#: src/view/com/util/forms/PostDropdownBtn.tsx:296 +#: src/view/com/util/forms/PostDropdownBtn.tsx:299 msgid "Send via direct message" msgstr "다이렉트 메시지로 보내기" @@ -4602,11 +4726,11 @@ msgctxt "action" msgid "Share" msgstr "공유" -#: src/view/com/profile/ProfileMenu.tsx:217 -#: src/view/com/profile/ProfileMenu.tsx:226 -#: src/view/com/util/forms/PostDropdownBtn.tsx:297 -#: src/view/com/util/forms/PostDropdownBtn.tsx:306 -#: src/view/com/util/post-ctrls/PostCtrls.tsx:297 +#: src/view/com/profile/ProfileMenu.tsx:220 +#: src/view/com/profile/ProfileMenu.tsx:229 +#: src/view/com/util/forms/PostDropdownBtn.tsx:307 +#: src/view/com/util/forms/PostDropdownBtn.tsx:316 +#: src/view/com/util/post-ctrls/PostCtrls.tsx:300 #: src/view/screens/ProfileList.tsx:428 msgid "Share" msgstr "공유" @@ -4619,9 +4743,9 @@ msgstr "멋진 이야기를 전하세요!" msgid "Share a fun fact!" msgstr "재미있는 사실을 전하세요!" -#: src/view/com/profile/ProfileMenu.tsx:375 -#: src/view/com/util/forms/PostDropdownBtn.tsx:451 -#: src/view/com/util/post-ctrls/PostCtrls.tsx:313 +#: src/view/com/profile/ProfileMenu.tsx:378 +#: src/view/com/util/forms/PostDropdownBtn.tsx:461 +#: src/view/com/util/post-ctrls/PostCtrls.tsx:316 msgid "Share anyway" msgstr "무시하고 공유" @@ -4645,12 +4769,12 @@ msgstr "연결된 웹사이트를 공유합니다" #: src/components/moderation/ContentHider.tsx:116 #: src/components/moderation/LabelPreference.tsx:136 -#: src/components/moderation/PostHider.tsx:121 +#: src/components/moderation/PostHider.tsx:122 #: src/view/screens/Settings/index.tsx:381 msgid "Show" msgstr "표시" -#: src/view/com/util/post-embeds/GifEmbed.tsx:167 +#: src/view/com/util/post-embeds/GifEmbed.tsx:169 msgid "Show alt text" msgstr "대체 텍스트 표시" @@ -4668,7 +4792,7 @@ msgstr "배지 표시" msgid "Show badge and filter from feeds" msgstr "배지 표시 및 피드에서 필터링" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:211 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:215 msgid "Show follows similar to {0}" msgstr "{0} 님과 비슷한 팔로우 표시" @@ -4676,19 +4800,19 @@ msgstr "{0} 님과 비슷한 팔로우 표시" msgid "Show hidden replies" msgstr "숨겨진 답글 표시" -#: src/view/com/util/forms/PostDropdownBtn.tsx:336 -#: src/view/com/util/forms/PostDropdownBtn.tsx:338 +#: src/view/com/util/forms/PostDropdownBtn.tsx:346 +#: src/view/com/util/forms/PostDropdownBtn.tsx:348 msgid "Show less like this" msgstr "이런 항목 덜 보기" -#: src/view/com/post-thread/PostThreadItem.tsx:532 +#: src/view/com/post-thread/PostThreadItem.tsx:533 #: src/view/com/post/Post.tsx:227 -#: src/view/com/posts/FeedItem.tsx:392 +#: src/view/com/posts/FeedItem.tsx:396 msgid "Show More" msgstr "더 보기" -#: src/view/com/util/forms/PostDropdownBtn.tsx:328 -#: src/view/com/util/forms/PostDropdownBtn.tsx:330 +#: src/view/com/util/forms/PostDropdownBtn.tsx:338 +#: src/view/com/util/forms/PostDropdownBtn.tsx:340 msgid "Show more like this" msgstr "이런 항목 더 보기" @@ -4717,7 +4841,7 @@ msgid "Show Reposts" msgstr "재게시 표시" #: src/components/moderation/ContentHider.tsx:69 -#: src/components/moderation/PostHider.tsx:78 +#: src/components/moderation/PostHider.tsx:79 msgid "Show the content" msgstr "콘텐츠 표시" @@ -4818,8 +4942,10 @@ msgid "Software Dev" msgstr "소프트웨어 개발" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 +#: src/view/com/threadgate/WhoCanReply.tsx:67 +#: src/view/com/threadgate/WhoCanReply.tsx:124 msgid "Some people can reply" -msgstr "몇몇 사람들이 답글을 달 수 있음" +msgstr "일부 사람들이 답글을 달 수 있음" #: src/screens/Messages/Conversation/index.tsx:106 msgid "Something went wrong" @@ -4836,7 +4962,7 @@ msgstr "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요" msgid "Something went wrong, please try again." msgstr "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." -#: src/App.native.tsx:85 +#: src/App.native.tsx:92 #: src/App.web.tsx:74 msgid "Sorry! Your session expired. Please log in again." msgstr "죄송합니다. 세션이 만료되었습니다. 다시 로그인해 주세요." @@ -4926,9 +5052,9 @@ msgstr "이 라벨러 구독하기" msgid "Subscribe to this list" msgstr "이 리스트 구독하기" -#: src/view/screens/Search/Search.tsx:425 -msgid "Suggested Follows" -msgstr "팔로우 추천" +#: src/view/screens/Search/Explore.tsx:331 +msgid "Suggested accounts" +msgstr "추천 계정" #: src/view/com/profile/ProfileHeaderSuggestedFollows.tsx:65 msgid "Suggested for you" @@ -5029,8 +5155,8 @@ msgstr "텍스트 파일 내용:" msgid "That handle is already taken." msgstr "이 핸들은 이미 사용 중입니다." -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:305 -#: src/view/com/profile/ProfileMenu.tsx:351 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:310 +#: src/view/com/profile/ProfileMenu.tsx:354 msgid "The account will be able to interact with you after unblocking." msgstr "차단을 해제하면 이 계정이 나와 상호작용할 수 있게 됩니다." @@ -5139,17 +5265,17 @@ msgstr "신고를 전송하는 동안 문제가 발생했습니다. 인터넷 msgid "There was an issue with fetching your app passwords" msgstr "앱 비밀번호를 가져오는 동안 문제가 발생했습니다" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:103 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:125 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:139 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:107 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:129 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:143 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:99 #: src/view/com/post-thread/PostThreadFollowBtn.tsx:111 -#: src/view/com/profile/ProfileMenu.tsx:109 -#: src/view/com/profile/ProfileMenu.tsx:120 -#: src/view/com/profile/ProfileMenu.tsx:135 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:173 +#: src/view/com/profile/ProfileMenu.tsx:112 +#: src/view/com/profile/ProfileMenu.tsx:123 +#: src/view/com/profile/ProfileMenu.tsx:138 +#: src/view/com/profile/ProfileMenu.tsx:149 +#: src/view/com/profile/ProfileMenu.tsx:163 +#: src/view/com/profile/ProfileMenu.tsx:176 msgid "There was an issue! {0}" msgstr "문제가 발생했습니다! {0}" @@ -5284,16 +5410,16 @@ msgstr "이 이름은 이미 사용 중입니다" msgid "This post has been deleted." msgstr "이 게시물은 삭제되었습니다." -#: src/view/com/util/forms/PostDropdownBtn.tsx:448 -#: src/view/com/util/post-ctrls/PostCtrls.tsx:310 +#: src/view/com/util/forms/PostDropdownBtn.tsx:458 +#: src/view/com/util/post-ctrls/PostCtrls.tsx:313 msgid "This post is only visible to logged-in users. It won't be visible to people who aren't logged in." msgstr "이 게시물은 로그인한 사용자에게만 표시됩니다. 로그인하지 않은 사용자에게는 표시되지 않습니다." -#: src/view/com/util/forms/PostDropdownBtn.tsx:430 +#: src/view/com/util/forms/PostDropdownBtn.tsx:440 msgid "This post will be hidden from feeds." msgstr "이 게시물을 피드에서 숨깁니다." -#: src/view/com/profile/ProfileMenu.tsx:372 +#: src/view/com/profile/ProfileMenu.tsx:375 msgid "This profile is only visible to logged-in users. It won't be visible to people who aren't logged in." msgstr "이 프로필은 로그인한 사용자에게만 표시됩니다. 로그인하지 않은 사용자에게는 표시되지 않습니다." @@ -5330,6 +5456,10 @@ msgstr "이 사용자는 내가 차단한 <0>{0}</0> 리스트에 포함되어 msgid "This user is included in the <0>{0}</0> list which you have muted." msgstr "이 사용자는 내가 뮤트한 <0>{0}</0> 리스트에 포함되어 있습니다." +#: src/components/NewskieDialog.tsx:50 +msgid "This user is new here. Press for more info about when they joined." +msgstr "이 사용자는 새로 가입했습니다. 언제 가입했는지 자세한 정보를 보려면 누르세요." + #: src/view/com/profile/ProfileFollows.tsx:87 msgid "This user isn't following anyone." msgstr "이 사용자는 아무도 팔로우하지 않았습니다." @@ -5380,7 +5510,7 @@ msgid "Toggle to enable or disable adult content" msgstr "성인 콘텐츠 활성화 또는 비활성화 전환" #: src/screens/Hashtag.tsx:88 -#: src/view/screens/Search/Search.tsx:367 +#: src/view/screens/Search/Search.tsx:349 msgid "Top" msgstr "인기" @@ -5390,10 +5520,10 @@ msgstr "변형" #: src/components/dms/MessageMenu.tsx:103 #: src/components/dms/MessageMenu.tsx:105 -#: src/view/com/post-thread/PostThreadItem.tsx:674 -#: src/view/com/post-thread/PostThreadItem.tsx:676 -#: src/view/com/util/forms/PostDropdownBtn.tsx:267 -#: src/view/com/util/forms/PostDropdownBtn.tsx:269 +#: src/view/com/post-thread/PostThreadItem.tsx:681 +#: src/view/com/post-thread/PostThreadItem.tsx:683 +#: src/view/com/util/forms/PostDropdownBtn.tsx:277 +#: src/view/com/util/forms/PostDropdownBtn.tsx:279 msgid "Translate" msgstr "번역" @@ -5435,14 +5565,14 @@ msgstr "서비스에 연결할 수 없습니다. 인터넷 연결을 확인하 #: src/components/dms/MessagesListBlockedFooter.tsx:96 #: src/components/dms/MessagesListBlockedFooter.tsx:104 #: src/components/dms/MessagesListBlockedFooter.tsx:111 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:188 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:309 -#: src/view/com/profile/ProfileMenu.tsx:363 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:192 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:314 +#: src/view/com/profile/ProfileMenu.tsx:366 #: src/view/screens/ProfileList.tsx:626 msgid "Unblock" msgstr "차단 해제" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:193 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:197 msgctxt "action" msgid "Unblock" msgstr "차단 해제" @@ -5452,19 +5582,19 @@ msgstr "차단 해제" msgid "Unblock account" msgstr "계정 차단 해제" -#: src/view/com/profile/ProfileMenu.tsx:301 -#: src/view/com/profile/ProfileMenu.tsx:307 +#: src/view/com/profile/ProfileMenu.tsx:304 +#: src/view/com/profile/ProfileMenu.tsx:310 msgid "Unblock Account" msgstr "계정 차단 해제" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:303 -#: src/view/com/profile/ProfileMenu.tsx:345 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:308 +#: src/view/com/profile/ProfileMenu.tsx:348 msgid "Unblock Account?" msgstr "계정을 차단 해제하시겠습니까?" -#: src/view/com/util/post-ctrls/RepostButton.tsx:63 -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:69 -#: src/view/com/util/post-ctrls/RepostButton.web.tsx:73 +#: src/view/com/util/post-ctrls/RepostButton.tsx:64 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:70 +#: src/view/com/util/post-ctrls/RepostButton.web.tsx:74 msgid "Undo repost" msgstr "재게시 취소" @@ -5477,12 +5607,12 @@ msgstr "언팔로우" msgid "Unfollow" msgstr "언팔로우" -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:233 +#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:237 msgid "Unfollow {0}" msgstr "{0} 님을 언팔로우" -#: src/view/com/profile/ProfileMenu.tsx:243 -#: src/view/com/profile/ProfileMenu.tsx:253 +#: src/view/com/profile/ProfileMenu.tsx:246 +#: src/view/com/profile/ProfileMenu.tsx:256 msgid "Unfollow Account" msgstr "계정 언팔로우" @@ -5499,8 +5629,8 @@ msgstr "언뮤트" msgid "Unmute {truncatedTag}" msgstr "{truncatedTag} 언뮤트" -#: src/view/com/profile/ProfileMenu.tsx:280 -#: src/view/com/profile/ProfileMenu.tsx:286 +#: src/view/com/profile/ProfileMenu.tsx:283 +#: src/view/com/profile/ProfileMenu.tsx:289 msgid "Unmute Account" msgstr "계정 언뮤트" @@ -5512,8 +5642,8 @@ msgstr "모든 {tag} 게시물 언뮤트" msgid "Unmute conversation" msgstr "알림 언뮤트" -#: src/view/com/util/forms/PostDropdownBtn.tsx:352 -#: src/view/com/util/forms/PostDropdownBtn.tsx:357 +#: src/view/com/util/forms/PostDropdownBtn.tsx:362 +#: src/view/com/util/forms/PostDropdownBtn.tsx:367 msgid "Unmute thread" msgstr "스레드 언뮤트" @@ -5567,20 +5697,20 @@ msgstr "대신 사진 업로드하기" msgid "Upload a text file to:" msgstr "텍스트 파일 업로드 경로:" -#: src/view/com/util/UserAvatar.tsx:339 -#: src/view/com/util/UserAvatar.tsx:342 +#: src/view/com/util/UserAvatar.tsx:352 +#: src/view/com/util/UserAvatar.tsx:355 #: src/view/com/util/UserBanner.tsx:123 #: src/view/com/util/UserBanner.tsx:126 msgid "Upload from Camera" msgstr "카메라에서 업로드" -#: src/view/com/util/UserAvatar.tsx:356 +#: src/view/com/util/UserAvatar.tsx:369 #: src/view/com/util/UserBanner.tsx:140 msgid "Upload from Files" msgstr "파일에서 업로드" -#: src/view/com/util/UserAvatar.tsx:350 -#: src/view/com/util/UserAvatar.tsx:354 +#: src/view/com/util/UserAvatar.tsx:363 +#: src/view/com/util/UserAvatar.tsx:367 #: src/view/com/util/UserBanner.tsx:134 #: src/view/com/util/UserBanner.tsx:138 msgid "Upload from Library" @@ -5688,7 +5818,7 @@ msgstr "사용자 이름 또는 이메일 주소" msgid "Users" msgstr "사용자" -#: src/view/com/threadgate/WhoCanReply.tsx:143 +#: src/view/com/threadgate/WhoCanReply.tsx:274 msgid "users followed by <0/>" msgstr "<0/> 님이 팔로우한 사용자" @@ -5699,7 +5829,7 @@ msgstr "<0/> 님이 팔로우한 사용자" msgid "Users I follow" msgstr "내가 팔로우하는 사용자" -#: src/view/com/modals/Threadgate.tsx:107 +#: src/view/com/modals/Threadgate.tsx:109 msgid "Users in \"{0}\"" msgstr "\"{0}\"에 있는 사용자" @@ -5752,11 +5882,15 @@ msgstr "비디오 게임" msgid "View {0}'s avatar" msgstr "{0} 님의 아바타를 봅니다" -#: src/view/com/notifications/FeedItem.tsx:213 +#: src/view/com/notifications/FeedItem.tsx:215 msgid "View {0}'s profile" msgstr "{0} 님의 프로필 보기" -#: src/view/screens/Log.tsx:52 +#: src/components/ProfileHoverCard/index.web.tsx:430 +msgid "View blocked user's profile" +msgstr "차단한 사용자의 프로필 보기" + +#: src/view/screens/Log.tsx:56 msgid "View debug entry" msgstr "디버그 항목 보기" @@ -5768,7 +5902,7 @@ msgstr "세부 정보 보기" msgid "View details for reporting a copyright violation" msgstr "저작권 위반 신고에 대한 세부 정보 보기" -#: src/view/com/posts/FeedSlice.tsx:120 +#: src/view/com/posts/FeedSlice.tsx:124 msgid "View full thread" msgstr "전체 스레드 보기" @@ -5776,8 +5910,9 @@ msgstr "전체 스레드 보기" msgid "View information about these labels" msgstr "이 라벨에 대한 정보 보기" -#: src/components/ProfileHoverCard/index.web.tsx:396 -#: src/components/ProfileHoverCard/index.web.tsx:429 +#: src/components/ProfileHoverCard/index.web.tsx:418 +#: src/components/ProfileHoverCard/index.web.tsx:436 +#: src/components/ProfileHoverCard/index.web.tsx:463 #: src/view/com/posts/AviFollowButton.tsx:58 #: src/view/com/posts/FeedErrorMessage.tsx:174 msgid "View profile" @@ -5795,10 +5930,10 @@ msgstr "{0} 님이 제공하는 라벨링 서비스 보기" msgid "View users who like this feed" msgstr "이 피드를 좋아하는 사용자 보기" -#: src/view/com/home/HomeHeaderLayout.web.tsx:78 +#: src/view/com/home/HomeHeaderLayout.web.tsx:79 #: src/view/com/home/HomeHeaderLayoutMobile.tsx:84 msgid "View your feeds and explore more" -msgstr "" +msgstr "내 피드를 보거나 새 피드를 탐색합니다" #: src/view/com/modals/LinkWarning.tsx:89 #: src/view/com/modals/LinkWarning.tsx:95 @@ -5879,7 +6014,7 @@ msgstr "죄송하지만 이 리스트를 불러올 수 없습니다. 이 문제 msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "죄송하지만 현재 뮤트한 단어를 불러올 수 없습니다. 다시 시도해 주세요." -#: src/view/screens/Search/Search.tsx:270 +#: src/view/screens/Search/Search.tsx:206 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "죄송하지만 검색을 완료할 수 없습니다. 몇 분 후에 다시 시도해 주세요." @@ -5893,8 +6028,8 @@ msgid "We're sorry! We can't find the page you were looking for." msgstr "죄송합니다. 페이지를 찾을 수 없습니다." #: src/screens/Profile/Header/ProfileHeaderLabeler.tsx:330 -msgid "We're sorry! You can only subscribe to ten labelers, and you've reached your limit of ten." -msgstr "죄송합니다. 라벨러는 10개까지만 구독할 수 있으며 10개에 도달했습니다." +msgid "We're sorry! You can only subscribe to twenty labelers, and you've reached your limit of twenty." +msgstr "죄송합니다. 라벨러는 20개까지만 구독할 수 있으며 20개에 도달했습니다." #: src/screens/Deactivated.tsx:128 msgid "Welcome back!" @@ -5923,10 +6058,20 @@ msgstr "알고리즘 피드에 어떤 언어를 표시하시겠습니까?" msgid "Who can message you?" msgstr "누구의 메시지를 허용하시겠습니까?" -#: src/view/com/modals/Threadgate.tsx:67 +#: src/view/com/modals/Threadgate.tsx:69 +#: src/view/com/threadgate/WhoCanReply.tsx:73 +#: src/view/com/threadgate/WhoCanReply.tsx:130 msgid "Who can reply" msgstr "답글을 달 수 있는 사람" +#: src/view/com/threadgate/WhoCanReply.tsx:206 +msgid "Who can reply dialog" +msgstr "답글을 달 수 있는 사람 대화 상자" + +#: src/view/com/threadgate/WhoCanReply.tsx:210 +msgid "Who can reply?" +msgstr "누가 답글을 달 수 있나요?" + #: src/screens/Home/NoFeedsPinned.tsx:79 #: src/screens/Messages/List/index.tsx:185 msgid "Whoops!" @@ -5965,7 +6110,7 @@ msgstr "가로" msgid "Write a message" msgstr "메시지를 입력하세요" -#: src/view/com/composer/Composer.tsx:549 +#: src/view/com/composer/Composer.tsx:551 msgid "Write post" msgstr "게시물 작성" @@ -6041,7 +6186,7 @@ msgstr "팔로워가 없습니다." #: src/screens/Profile/KnownFollowers.tsx:99 msgid "You don't follow any users who follow @{name}." -msgstr "" +msgstr "@{name} 님을 팔로우하는 사용자를 팔로우하고 있지 않습니다." #: src/view/com/modals/InviteCodes.tsx:67 msgid "You don't have any invite codes yet! We'll send you some when you've been on Bluesky for a little longer." @@ -6146,11 +6291,11 @@ msgstr "신고하려면 하나 이상의 라벨을 선택해야 합니다." msgid "You previously deactivated @{0}." msgstr "이전에 @{0}을(를) 비활성화했습니다." -#: src/view/com/util/forms/PostDropdownBtn.tsx:168 +#: src/view/com/util/forms/PostDropdownBtn.tsx:174 msgid "You will no longer receive notifications for this thread" msgstr "이 스레드에 대한 알림을 더 이상 받지 않습니다" -#: src/view/com/util/forms/PostDropdownBtn.tsx:171 +#: src/view/com/util/forms/PostDropdownBtn.tsx:170 msgid "You will now receive notifications for this thread" msgstr "이제 이 스레드에 대한 알림을 받습니다" diff --git a/src/state/a11y.tsx b/src/state/a11y.tsx new file mode 100644 index 000000000..aefcfd1ec --- /dev/null +++ b/src/state/a11y.tsx @@ -0,0 +1,65 @@ +import React from 'react' +import {AccessibilityInfo} from 'react-native' +import {isReducedMotion} from 'react-native-reanimated' + +import {isWeb} from '#/platform/detection' + +const Context = React.createContext({ + reduceMotionEnabled: false, + screenReaderEnabled: false, +}) + +export function useA11y() { + return React.useContext(Context) +} + +export function Provider({children}: React.PropsWithChildren<{}>) { + const [reduceMotionEnabled, setReduceMotionEnabled] = React.useState(() => + isReducedMotion(), + ) + const [screenReaderEnabled, setScreenReaderEnabled] = React.useState(false) + + React.useEffect(() => { + const reduceMotionChangedSubscription = AccessibilityInfo.addEventListener( + 'reduceMotionChanged', + enabled => { + setReduceMotionEnabled(enabled) + }, + ) + const screenReaderChangedSubscription = AccessibilityInfo.addEventListener( + 'screenReaderChanged', + enabled => { + setScreenReaderEnabled(enabled) + }, + ) + + ;(async () => { + const [_reduceMotionEnabled, _screenReaderEnabled] = await Promise.all([ + AccessibilityInfo.isReduceMotionEnabled(), + AccessibilityInfo.isScreenReaderEnabled(), + ]) + setReduceMotionEnabled(_reduceMotionEnabled) + setScreenReaderEnabled(_screenReaderEnabled) + })() + + return () => { + reduceMotionChangedSubscription.remove() + screenReaderChangedSubscription.remove() + } + }, []) + + const ctx = React.useMemo(() => { + return { + reduceMotionEnabled, + /** + * Always returns true on web. For now, we're using this for mobile a11y, + * so we reset to false on web. + * + * @see https://github.com/necolas/react-native-web/discussions/2072 + */ + screenReaderEnabled: isWeb ? false : screenReaderEnabled, + } + }, [reduceMotionEnabled, screenReaderEnabled]) + + return <Context.Provider value={ctx}>{children}</Context.Provider> +} diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx index 64bdd4b89..88f50daca 100644 --- a/src/state/feed-feedback.tsx +++ b/src/state/feed-feedback.tsx @@ -4,6 +4,7 @@ import {AppBskyFeedDefs, BskyAgent} from '@atproto/api' import throttle from 'lodash.throttle' import {PROD_DEFAULT_FEED} from '#/lib/constants' +import {logEvent} from '#/lib/statsig/statsig' import {logger} from '#/logger' import { FeedDescriptor, @@ -34,6 +35,16 @@ export function useFeedFeedback(feed: FeedDescriptor, hasSession: boolean) { WeakSet<FeedPostSliceItem | AppBskyFeedDefs.Interaction> >(new WeakSet()) + const aggregatedStats = React.useRef<AggregatedStats | null>(null) + const throttledFlushAggregatedStats = React.useMemo( + () => + throttle(() => flushToStatsig(aggregatedStats.current), 45e3, { + leading: true, // The outer call is already throttled somewhat. + trailing: true, + }), + [], + ) + const sendToFeedNoDelay = React.useCallback(() => { const proxyAgent = agent.withProxy( // @ts-ignore TODO need to update withProxy() to support this key -prf @@ -45,12 +56,20 @@ export function useFeedFeedback(feed: FeedDescriptor, hasSession: boolean) { const interactions = Array.from(queue.current).map(toInteraction) queue.current.clear() + // Send to the feed proxyAgent.app.bsky.feed .sendInteractions({interactions}) .catch((e: any) => { logger.warn('Failed to send feed interactions', {error: e}) }) - }, [agent]) + + // Send to Statsig + if (aggregatedStats.current === null) { + aggregatedStats.current = createAggregatedStats() + } + sendOrAggregateInteractionsForStats(aggregatedStats.current, interactions) + throttledFlushAggregatedStats() + }, [agent, throttledFlushAggregatedStats]) const sendToFeed = React.useMemo( () => @@ -149,3 +168,89 @@ function toInteraction(str: string): AppBskyFeedDefs.Interaction { const [item, event, feedContext] = str.split('|') return {item, event, feedContext} } + +type AggregatedStats = { + clickthroughCount: number + engagedCount: number + seenCount: number +} + +function createAggregatedStats(): AggregatedStats { + return { + clickthroughCount: 0, + engagedCount: 0, + seenCount: 0, + } +} + +function sendOrAggregateInteractionsForStats( + stats: AggregatedStats, + interactions: AppBskyFeedDefs.Interaction[], +) { + for (let interaction of interactions) { + switch (interaction.event) { + // Pressing "Show more" / "Show less" is relatively uncommon so we won't aggregate them. + // This lets us send the feed context together with them. + case 'app.bsky.feed.defs#requestLess': { + logEvent('discover:showLess', { + feedContext: interaction.feedContext ?? '', + }) + break + } + case 'app.bsky.feed.defs#requestMore': { + logEvent('discover:showMore', { + feedContext: interaction.feedContext ?? '', + }) + break + } + + // The rest of the events are aggregated and sent later in batches. + case 'app.bsky.feed.defs#clickthroughAuthor': + case 'app.bsky.feed.defs#clickthroughEmbed': + case 'app.bsky.feed.defs#clickthroughItem': + case 'app.bsky.feed.defs#clickthroughReposter': { + stats.clickthroughCount++ + break + } + case 'app.bsky.feed.defs#interactionLike': + case 'app.bsky.feed.defs#interactionQuote': + case 'app.bsky.feed.defs#interactionReply': + case 'app.bsky.feed.defs#interactionRepost': + case 'app.bsky.feed.defs#interactionShare': { + stats.engagedCount++ + break + } + case 'app.bsky.feed.defs#interactionSeen': { + stats.seenCount++ + break + } + } + } +} + +function flushToStatsig(stats: AggregatedStats | null) { + if (stats === null) { + return + } + + if (stats.clickthroughCount > 0) { + logEvent('discover:clickthrough:sampled', { + count: stats.clickthroughCount, + }) + stats.clickthroughCount = 0 + } + + if (stats.engagedCount > 0) { + logEvent('discover:engaged:sampled', { + count: stats.engagedCount, + }) + stats.engagedCount = 0 + } + + if (stats.seenCount > 0) { + logEvent('discover:seen:sampled', { + count: stats.seenCount, + }) + stats.seenCount = 0 + } +} diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts index 83d6a7634..e5d615177 100644 --- a/src/state/queries/feed.ts +++ b/src/state/queries/feed.ts @@ -9,20 +9,24 @@ import { } from '@atproto/api' import { InfiniteData, + QueryClient, QueryKey, useInfiniteQuery, useMutation, useQuery, + useQueryClient, } from '@tanstack/react-query' import {DISCOVER_FEED_URI, DISCOVER_SAVED_FEED} from '#/lib/constants' import {sanitizeDisplayName} from '#/lib/strings/display-names' import {sanitizeHandle} from '#/lib/strings/handles' import {STALE} from '#/state/queries' +import {RQKEY as listQueryKey} from '#/state/queries/list' import {usePreferencesQuery} from '#/state/queries/preferences' import {useAgent, useSession} from '#/state/session' import {router} from '#/routes' import {FeedDescriptor} from './post-feed' +import {precacheResolvedUri} from './resolve-uri' export type FeedSourceFeedInfo = { type: 'feed' @@ -201,6 +205,7 @@ export function useGetPopularFeedsQuery(options?: GetPopularFeedsOptions) { const agent = useAgent() const limit = options?.limit || 10 const {data: preferences} = usePreferencesQuery() + const queryClient = useQueryClient() // Make sure this doesn't invalidate unless really needed. const selectArgs = useMemo( @@ -225,6 +230,13 @@ export function useGetPopularFeedsQuery(options?: GetPopularFeedsOptions) { limit, cursor: pageParam, }) + + // precache feeds + for (const feed of res.data.feeds) { + const hydratedFeed = hydrateFeedGenerator(feed) + precacheFeed(queryClient, hydratedFeed) + } + return res.data }, initialPageParam: undefined, @@ -449,3 +461,138 @@ export function usePinnedFeedsInfos() { }, }) } + +export type SavedFeedItem = + | { + type: 'feed' + config: AppBskyActorDefs.SavedFeed + view: AppBskyFeedDefs.GeneratorView + } + | { + type: 'list' + config: AppBskyActorDefs.SavedFeed + view: AppBskyGraphDefs.ListView + } + | { + type: 'timeline' + config: AppBskyActorDefs.SavedFeed + view: undefined + } + +export function useSavedFeeds() { + const agent = useAgent() + const {data: preferences, isLoading: isLoadingPrefs} = usePreferencesQuery() + const savedItems = preferences?.savedFeeds ?? [] + const queryClient = useQueryClient() + + return useQuery({ + staleTime: STALE.INFINITY, + enabled: !isLoadingPrefs, + queryKey: [pinnedFeedInfosQueryKeyRoot, ...savedItems], + placeholderData: previousData => { + return ( + previousData || { + count: savedItems.length, + feeds: [], + } + ) + }, + queryFn: async () => { + const resolvedFeeds = new Map<string, AppBskyFeedDefs.GeneratorView>() + const resolvedLists = new Map<string, AppBskyGraphDefs.ListView>() + + const savedFeeds = savedItems.filter(feed => feed.type === 'feed') + const savedLists = savedItems.filter(feed => feed.type === 'list') + + let feedsPromise = Promise.resolve() + if (savedFeeds.length > 0) { + feedsPromise = agent.app.bsky.feed + .getFeedGenerators({ + feeds: savedFeeds.map(f => f.value), + }) + .then(res => { + res.data.feeds.forEach(f => { + resolvedFeeds.set(f.uri, f) + }) + }) + } + + const listsPromises = savedLists.map(list => + agent.app.bsky.graph + .getList({ + list: list.value, + limit: 1, + }) + .then(res => { + const listView = res.data.list + resolvedLists.set(listView.uri, listView) + }), + ) + + await Promise.allSettled([feedsPromise, ...listsPromises]) + + resolvedFeeds.forEach(feed => { + const hydratedFeed = hydrateFeedGenerator(feed) + precacheFeed(queryClient, hydratedFeed) + }) + resolvedLists.forEach(list => { + precacheList(queryClient, list) + }) + + const res: SavedFeedItem[] = savedItems.map(s => { + if (s.type === 'timeline') { + return { + type: 'timeline', + config: s, + view: undefined, + } + } + + return { + type: s.type, + config: s, + view: + s.type === 'feed' + ? resolvedFeeds.get(s.value) + : resolvedLists.get(s.value), + } + }) as SavedFeedItem[] + + return { + count: savedItems.length, + feeds: res, + } + }, + }) +} + +function precacheFeed(queryClient: QueryClient, hydratedFeed: FeedSourceInfo) { + precacheResolvedUri( + queryClient, + hydratedFeed.creatorHandle, + hydratedFeed.creatorDid, + ) + queryClient.setQueryData<FeedSourceInfo>( + feedSourceInfoQueryKey({uri: hydratedFeed.uri}), + hydratedFeed, + ) +} + +export function precacheList( + queryClient: QueryClient, + list: AppBskyGraphDefs.ListView, +) { + precacheResolvedUri(queryClient, list.creator.handle, list.creator.did) + queryClient.setQueryData<AppBskyGraphDefs.ListView>( + listQueryKey(list.uri), + list, + ) +} + +export function precacheFeedFromGeneratorView( + queryClient: QueryClient, + view: AppBskyFeedDefs.GeneratorView, +) { + const hydratedFeed = hydrateFeedGenerator(view) + precacheFeed(queryClient, hydratedFeed) +} diff --git a/src/state/queries/resolve-uri.ts b/src/state/queries/resolve-uri.ts index 7bd26435c..c1fd8e240 100644 --- a/src/state/queries/resolve-uri.ts +++ b/src/state/queries/resolve-uri.ts @@ -1,5 +1,10 @@ import {AppBskyActorDefs, AtUri} from '@atproto/api' -import {useQuery, useQueryClient, UseQueryResult} from '@tanstack/react-query' +import { + QueryClient, + useQuery, + useQueryClient, + UseQueryResult, +} from '@tanstack/react-query' import {STALE} from '#/state/queries' import {useAgent} from '#/state/session' @@ -50,3 +55,11 @@ export function useResolveDidQuery(didOrHandle: string | undefined) { enabled: !!didOrHandle, }) } + +export function precacheResolvedUri( + queryClient: QueryClient, + handle: string, + did: string, +) { + queryClient.setQueryData<string>(RQKEY(handle), did) +} diff --git a/src/state/queries/suggested-follows.ts b/src/state/queries/suggested-follows.ts index 40251d43d..a1244721a 100644 --- a/src/state/queries/suggested-follows.ts +++ b/src/state/queries/suggested-follows.ts @@ -34,13 +34,14 @@ const suggestedFollowsByActorQueryKey = (did: string) => [ did, ] -type SuggestedFollowsOptions = {limit?: number} +type SuggestedFollowsOptions = {limit?: number; subsequentPageLimit?: number} export function useSuggestedFollowsQuery(options?: SuggestedFollowsOptions) { const {currentAccount} = useSession() const agent = useAgent() const moderationOpts = useModerationOpts() const {data: preferences} = usePreferencesQuery() + const limit = options?.limit || 25 return useInfiniteQuery< AppBskyActorGetSuggestions.OutputSchema, @@ -54,9 +55,13 @@ export function useSuggestedFollowsQuery(options?: SuggestedFollowsOptions) { queryKey: suggestedFollowsQueryKey(options), queryFn: async ({pageParam}) => { const contentLangs = getContentLanguages().join(',') + const maybeDifferentLimit = + options?.subsequentPageLimit && pageParam + ? options.subsequentPageLimit + : limit const res = await agent.app.bsky.actor.getSuggestions( { - limit: options?.limit || 25, + limit: maybeDifferentLimit, cursor: pageParam, }, { diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx index 314945bcf..3aac19025 100644 --- a/src/state/session/index.tsx +++ b/src/state/session/index.tsx @@ -19,6 +19,7 @@ import { import {getInitialState, reducer} from './reducer' export {isSignupQueued} from './util' +import {addSessionDebugLog} from './logging' export type {SessionAccount} from '#/state/session/types' import {SessionApiContext, SessionStateContext} from '#/state/session/types' @@ -40,9 +41,11 @@ const ApiContext = React.createContext<SessionApiContext>({ export function Provider({children}: React.PropsWithChildren<{}>) { const cancelPendingTask = useOneTaskAtATime() - const [state, dispatch] = React.useReducer(reducer, null, () => - getInitialState(persisted.get('session').accounts), - ) + const [state, dispatch] = React.useReducer(reducer, null, () => { + const initialState = getInitialState(persisted.get('session').accounts) + addSessionDebugLog({type: 'reducer:init', state: initialState}) + return initialState + }) const onAgentSessionChange = React.useCallback( (agent: BskyAgent, accountDid: string, sessionEvent: AtpSessionEvent) => { @@ -63,6 +66,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) { const createAccount = React.useCallback<SessionApiContext['createAccount']>( async params => { + addSessionDebugLog({type: 'method:start', method: 'createAccount'}) const signal = cancelPendingTask() track('Try Create Account') logEvent('account:create:begin', {}) @@ -81,12 +85,14 @@ export function Provider({children}: React.PropsWithChildren<{}>) { }) track('Create Account') logEvent('account:create:success', {}) + addSessionDebugLog({type: 'method:end', method: 'createAccount', account}) }, [onAgentSessionChange, cancelPendingTask], ) const login = React.useCallback<SessionApiContext['login']>( async (params, logContext) => { + addSessionDebugLog({type: 'method:start', method: 'login'}) const signal = cancelPendingTask() const {agent, account} = await createAgentAndLogin( params, @@ -103,23 +109,31 @@ export function Provider({children}: React.PropsWithChildren<{}>) { }) track('Sign In', {resumedSession: false}) logEvent('account:loggedIn', {logContext, withPassword: true}) + addSessionDebugLog({type: 'method:end', method: 'login', account}) }, [onAgentSessionChange, cancelPendingTask], ) const logout = React.useCallback<SessionApiContext['logout']>( logContext => { + addSessionDebugLog({type: 'method:start', method: 'logout'}) cancelPendingTask() dispatch({ type: 'logged-out', }) logEvent('account:loggedOut', {logContext}) + addSessionDebugLog({type: 'method:end', method: 'logout'}) }, [cancelPendingTask], ) const resumeSession = React.useCallback<SessionApiContext['resumeSession']>( async storedAccount => { + addSessionDebugLog({ + type: 'method:start', + method: 'resumeSession', + account: storedAccount, + }) const signal = cancelPendingTask() const {agent, account} = await createAgentAndResume( storedAccount, @@ -134,17 +148,24 @@ export function Provider({children}: React.PropsWithChildren<{}>) { newAgent: agent, newAccount: account, }) + addSessionDebugLog({type: 'method:end', method: 'resumeSession', account}) }, [onAgentSessionChange, cancelPendingTask], ) const removeAccount = React.useCallback<SessionApiContext['removeAccount']>( account => { + addSessionDebugLog({ + type: 'method:start', + method: 'removeAccount', + account, + }) cancelPendingTask() dispatch({ type: 'removed-account', accountDid: account.did, }) + addSessionDebugLog({type: 'method:end', method: 'removeAccount', account}) }, [cancelPendingTask], ) @@ -152,18 +173,21 @@ export function Provider({children}: React.PropsWithChildren<{}>) { React.useEffect(() => { if (state.needsPersist) { state.needsPersist = false - persisted.write('session', { + const persistedData = { accounts: state.accounts, currentAccount: state.accounts.find( a => a.did === state.currentAgentState.did, ), - }) + } + addSessionDebugLog({type: 'persisted:broadcast', data: persistedData}) + persisted.write('session', persistedData) } }, [state]) React.useEffect(() => { return persisted.onUpdate(() => { const synced = persisted.get('session') + addSessionDebugLog({type: 'persisted:receive', data: synced}) dispatch({ type: 'synced-accounts', syncedAccounts: synced.accounts, @@ -177,7 +201,14 @@ export function Provider({children}: React.PropsWithChildren<{}>) { resumeSession(syncedAccount) } else { const agent = state.currentAgentState.agent as BskyAgent + const prevSession = agent.session agent.session = sessionAccountToSession(syncedAccount) + addSessionDebugLog({ + type: 'agent:patch', + agent, + prevSession, + nextSession: agent.session, + }) } } }) @@ -215,6 +246,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) { // Read the previous value and immediately advance the pointer. const prevAgent = currentAgentRef.current currentAgentRef.current = agent + addSessionDebugLog({type: 'agent:switch', prevAgent, nextAgent: agent}) // We never reuse agents so let's fully neutralize the previous one. // This ensures it won't try to consume any refresh tokens. prevAgent.session = undefined diff --git a/src/state/session/logging.ts b/src/state/session/logging.ts new file mode 100644 index 000000000..16aa66fe7 --- /dev/null +++ b/src/state/session/logging.ts @@ -0,0 +1,137 @@ +import {AtpSessionData} from '@atproto/api' +import {sha256} from 'js-sha256' +import {Statsig} from 'statsig-react-native-expo' + +import {Schema} from '../persisted' +import {Action, State} from './reducer' +import {SessionAccount} from './types' + +type Reducer = (state: State, action: Action) => State + +type Log = + | { + type: 'reducer:init' + state: State + } + | { + type: 'reducer:call' + action: Action + prevState: State + nextState: State + } + | { + type: 'method:start' + method: + | 'createAccount' + | 'login' + | 'logout' + | 'resumeSession' + | 'removeAccount' + account?: SessionAccount + } + | { + type: 'method:end' + method: + | 'createAccount' + | 'login' + | 'logout' + | 'resumeSession' + | 'removeAccount' + account?: SessionAccount + } + | { + type: 'persisted:broadcast' + data: Schema['session'] + } + | { + type: 'persisted:receive' + data: Schema['session'] + } + | { + type: 'agent:switch' + prevAgent: object + nextAgent: object + } + | { + type: 'agent:patch' + agent: object + prevSession: AtpSessionData | undefined + nextSession: AtpSessionData + } + +export function wrapSessionReducerForLogging(reducer: Reducer): Reducer { + return function loggingWrapper(prevState: State, action: Action): State { + const nextState = reducer(prevState, action) + addSessionDebugLog({type: 'reducer:call', prevState, action, nextState}) + return nextState + } +} + +let nextMessageIndex = 0 +const MAX_SLICE_LENGTH = 1000 + +export function addSessionDebugLog(log: Log) { + try { + if (!Statsig.initializeCalled() || !Statsig.getStableID()) { + // Drop these logs for now. + return + } + if (!Statsig.checkGate('debug_session')) { + return + } + const messageIndex = nextMessageIndex++ + const {type, ...content} = log + let payload = JSON.stringify(content, replacer) + + let nextSliceIndex = 0 + while (payload.length > 0) { + const sliceIndex = nextSliceIndex++ + const slice = payload.slice(0, MAX_SLICE_LENGTH) + payload = payload.slice(MAX_SLICE_LENGTH) + Statsig.logEvent('session:debug', null, { + realmId, + messageIndex: String(messageIndex), + messageType: type, + sliceIndex: String(sliceIndex), + slice, + }) + } + } catch (e) { + console.error(e) + } +} + +let agentIds = new WeakMap<object, string>() +let realmId = Math.random().toString(36).slice(2) +let nextAgentId = 1 + +function getAgentId(agent: object) { + let id = agentIds.get(agent) + if (id === undefined) { + id = realmId + '::' + nextAgentId++ + agentIds.set(agent, id) + } + return id +} + +function replacer(key: string, value: unknown) { + if (typeof value === 'object' && value != null && 'api' in value) { + return getAgentId(value) + } + if ( + key === 'service' || + key === 'email' || + key === 'emailConfirmed' || + key === 'emailAuthFactor' || + key === 'pdsUrl' + ) { + return undefined + } + if ( + typeof value === 'string' && + (key === 'refreshJwt' || key === 'accessJwt') + ) { + return sha256(value) + } + return value +} diff --git a/src/state/session/reducer.ts b/src/state/session/reducer.ts index 7f3080935..0a537b42c 100644 --- a/src/state/session/reducer.ts +++ b/src/state/session/reducer.ts @@ -1,6 +1,7 @@ import {AtpSessionEvent} from '@atproto/api' import {createPublicAgent} from './agent' +import {wrapSessionReducerForLogging} from './logging' import {SessionAccount} from './types' // A hack so that the reducer can't read anything from the agent. @@ -64,7 +65,7 @@ export function getInitialState(persistedAccounts: SessionAccount[]): State { } } -export function reducer(state: State, action: Action): State { +let reducer = (state: State, action: Action): State => { switch (action.type) { case 'received-agent-event': { const {agent, accountDid, refreshedAccount, sessionEvent} = action @@ -166,3 +167,5 @@ export function reducer(state: State, action: Action): State { } } } +reducer = wrapSessionReducerForLogging(reducer) +export {reducer} diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 80bce5351..9e2f77d4d 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -24,12 +24,18 @@ import Animated, { } from 'react-native-reanimated' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {LinearGradient} from 'expo-linear-gradient' +import { + AppBskyFeedDefs, + AppBskyFeedGetPostThread, + BskyAgent, +} from '@atproto/api' import {RichText} from '@atproto/api' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {observer} from 'mobx-react-lite' +import {until} from '#/lib/async/until' import { createGIFDescription, parseAltFromGIFDescription, @@ -299,6 +305,17 @@ export const ComposePost = observer(function ComposePost({ langs: toPostLanguages(langPrefs.postLanguage), }) ).uri + try { + await whenAppViewReady(agent, postUri, res => { + const thread = res.data.thread + return AppBskyFeedDefs.isThreadViewPost(thread) + }) + } catch (waitErr: any) { + logger.error(waitErr, { + message: `Waiting for app view failed`, + }) + // Keep going because the post *was* published. + } } catch (e: any) { logger.error(e, { message: `Composer: create post failed`, @@ -756,6 +773,23 @@ function useKeyboardVerticalOffset() { return top + 10 } +async function whenAppViewReady( + agent: BskyAgent, + uri: string, + fn: (res: AppBskyFeedGetPostThread.Response) => boolean, +) { + await until( + 5, // 5 tries + 1e3, // 1s delay between tries + fn, + () => + agent.app.bsky.feed.getPostThread({ + uri, + depth: 0, + }), + ) +} + const styles = StyleSheet.create({ topbarInner: { flexDirection: 'row', diff --git a/src/view/com/feeds/ProfileFeedgens.tsx b/src/view/com/feeds/ProfileFeedgens.tsx index 197f35e4d..ec1a55e22 100644 --- a/src/view/com/feeds/ProfileFeedgens.tsx +++ b/src/view/com/feeds/ProfileFeedgens.tsx @@ -3,7 +3,6 @@ import { findNodeHandle, ListRenderItemInfo, StyleProp, - StyleSheet, View, ViewStyle, } from 'react-native' @@ -12,18 +11,17 @@ import {useLingui} from '@lingui/react' import {useQueryClient} from '@tanstack/react-query' import {cleanError} from '#/lib/strings/errors' -import {useTheme} from '#/lib/ThemeContext' import {logger} from '#/logger' import {isNative, isWeb} from '#/platform/detection' -import {hydrateFeedGenerator} from '#/state/queries/feed' import {usePreferencesQuery} from '#/state/queries/preferences' import {RQKEY, useProfileFeedgensQuery} from '#/state/queries/profile-feedgens' import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder' import {EmptyState} from 'view/com/util/EmptyState' +import {atoms as a, useTheme} from '#/alf' +import * as FeedCard from '#/components/FeedCard' import {ErrorMessage} from '../util/error/ErrorMessage' import {List, ListRef} from '../util/List' import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn' -import {FeedSourceCardLoaded} from './FeedSourceCard' const LOADING = {_reactKey: '__loading__'} const EMPTY = {_reactKey: '__empty__'} @@ -52,7 +50,7 @@ export const ProfileFeedgens = React.forwardRef< ref, ) { const {_} = useLingui() - const theme = useTheme() + const t = useTheme() const [isPTRing, setIsPTRing] = React.useState(false) const opts = React.useMemo(() => ({enabled}), [enabled]) const { @@ -79,10 +77,9 @@ export const ProfileFeedgens = React.forwardRef< items = items.concat([EMPTY]) } else if (data?.pages) { for (const page of data?.pages) { - items = items.concat(page.feeds.map(feed => hydrateFeedGenerator(feed))) + items = items.concat(page.feeds) } - } - if (isError && !isEmpty) { + } else if (isError && !isEmpty) { items = items.concat([LOAD_MORE_ERROR_ITEM]) } return items @@ -132,48 +129,46 @@ export const ProfileFeedgens = React.forwardRef< // rendering // = - const renderItemInner = React.useCallback( - ({item, index}: ListRenderItemInfo<any>) => { - if (item === EMPTY) { - return ( - <EmptyState - icon="hashtag" - message={_(msg`You have no feeds.`)} - testID="listsEmpty" - /> - ) - } else if (item === ERROR_ITEM) { - return ( - <ErrorMessage message={cleanError(error)} onPressTryAgain={refetch} /> - ) - } else if (item === LOAD_MORE_ERROR_ITEM) { - return ( - <LoadMoreRetryBtn - label={_( - msg`There was an issue fetching your lists. Tap here to try again.`, - )} - onPress={onPressRetryLoadMore} - /> - ) - } else if (item === LOADING) { - return <FeedLoadingPlaceholder /> - } - if (preferences) { - return ( - <FeedSourceCardLoaded - feedUri={item.uri} - feed={item} - preferences={preferences} - style={styles.item} - showLikes - hideTopBorder={index === 0 && !isWeb} - /> - ) - } - return null - }, - [error, refetch, onPressRetryLoadMore, preferences, _], - ) + const renderItem = ({item, index}: ListRenderItemInfo<any>) => { + if (item === EMPTY) { + return ( + <EmptyState + icon="hashtag" + message={_(msg`You have no feeds.`)} + testID="listsEmpty" + /> + ) + } else if (item === ERROR_ITEM) { + return ( + <ErrorMessage message={cleanError(error)} onPressTryAgain={refetch} /> + ) + } else if (item === LOAD_MORE_ERROR_ITEM) { + return ( + <LoadMoreRetryBtn + label={_( + msg`There was an issue fetching your lists. Tap here to try again.`, + )} + onPress={onPressRetryLoadMore} + /> + ) + } else if (item === LOADING) { + return <FeedLoadingPlaceholder /> + } + if (preferences) { + return ( + <View + style={[ + (index !== 0 || isWeb) && a.border_t, + t.atoms.border_contrast_low, + a.px_lg, + a.py_lg, + ]}> + <FeedCard.Default type="feed" view={item} /> + </View> + ) + } + return null + } React.useEffect(() => { if (enabled && scrollElRef.current) { @@ -189,12 +184,12 @@ export const ProfileFeedgens = React.forwardRef< ref={scrollElRef} data={items} keyExtractor={(item: any) => item._reactKey || item.uri} - renderItem={renderItemInner} + renderItem={renderItem} refreshing={isPTRing} onRefresh={onRefresh} headerOffset={headerOffset} contentContainerStyle={isNative && {paddingBottom: headerOffset + 100}} - indicatorStyle={theme.colorScheme === 'dark' ? 'white' : 'black'} + indicatorStyle={t.name === 'light' ? 'black' : 'white'} removeClippedSubviews={true} // @ts-ignore our .web version only -prf desktopFixedHeight @@ -203,9 +198,3 @@ export const ProfileFeedgens = React.forwardRef< </View> ) }) - -const styles = StyleSheet.create({ - item: { - paddingHorizontal: 18, - }, -}) diff --git a/src/view/com/lists/ProfileLists.tsx b/src/view/com/lists/ProfileLists.tsx index e7fdfe4bd..62c944efc 100644 --- a/src/view/com/lists/ProfileLists.tsx +++ b/src/view/com/lists/ProfileLists.tsx @@ -3,7 +3,6 @@ import { findNodeHandle, ListRenderItemInfo, StyleProp, - StyleSheet, View, ViewStyle, } from 'react-native' @@ -12,17 +11,17 @@ import {useLingui} from '@lingui/react' import {useQueryClient} from '@tanstack/react-query' import {cleanError} from '#/lib/strings/errors' -import {useTheme} from '#/lib/ThemeContext' import {logger} from '#/logger' import {isNative, isWeb} from '#/platform/detection' import {RQKEY, useProfileListsQuery} from '#/state/queries/profile-lists' import {useAnalytics} from 'lib/analytics/analytics' import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder' import {EmptyState} from 'view/com/util/EmptyState' +import {atoms as a, useTheme} from '#/alf' +import * as FeedCard from '#/components/FeedCard' import {ErrorMessage} from '../util/error/ErrorMessage' import {List, ListRef} from '../util/List' import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn' -import {ListCard} from './ListCard' const LOADING = {_reactKey: '__loading__'} const EMPTY = {_reactKey: '__empty__'} @@ -48,7 +47,7 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>( {did, scrollElRef, headerOffset, enabled, style, testID, setScrollViewTag}, ref, ) { - const theme = useTheme() + const t = useTheme() const {track} = useAnalytics() const {_} = useLingui() const [isPTRing, setIsPTRing] = React.useState(false) @@ -166,15 +165,18 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>( return <FeedLoadingPlaceholder /> } return ( - <ListCard - list={item} - testID={`list-${item.name}`} - style={styles.item} - noBorder={index === 0 && !isWeb} - /> + <View + style={[ + (index !== 0 || isWeb) && a.border_t, + t.atoms.border_contrast_low, + a.px_lg, + a.py_lg, + ]}> + <FeedCard.Default type="list" view={item} /> + </View> ) }, - [error, refetch, onPressRetryLoadMore, _], + [error, refetch, onPressRetryLoadMore, _, t.atoms.border_contrast_low], ) React.useEffect(() => { @@ -198,7 +200,7 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>( contentContainerStyle={ isNative && {paddingBottom: headerOffset + 100} } - indicatorStyle={theme.colorScheme === 'dark' ? 'white' : 'black'} + indicatorStyle={t.name === 'light' ? 'black' : 'white'} removeClippedSubviews={true} // @ts-ignore our .web version only -prf desktopFixedHeight @@ -208,9 +210,3 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>( ) }, ) - -const styles = StyleSheet.create({ - item: { - paddingHorizontal: 18, - }, -}) diff --git a/src/view/com/profile/ProfileCard.tsx b/src/view/com/profile/ProfileCard.tsx index 2b0790002..a3cd5ca1b 100644 --- a/src/view/com/profile/ProfileCard.tsx +++ b/src/view/com/profile/ProfileCard.tsx @@ -328,6 +328,7 @@ const styles = StyleSheet.create({ borderRadius: 4, paddingHorizontal: 6, paddingVertical: 2, + justifyContent: 'center', }, btn: { paddingVertical: 7, diff --git a/src/view/com/util/post-ctrls/PostCtrls.tsx b/src/view/com/util/post-ctrls/PostCtrls.tsx index 472ce4043..231808bf2 100644 --- a/src/view/com/util/post-ctrls/PostCtrls.tsx +++ b/src/view/com/util/post-ctrls/PostCtrls.tsx @@ -6,6 +6,7 @@ import { View, type ViewStyle, } from 'react-native' +import * as Clipboard from 'expo-clipboard' import { AppBskyFeedDefs, AppBskyFeedPost, @@ -19,6 +20,7 @@ import {POST_CTRL_HITSLOP} from '#/lib/constants' import {useHaptics} from '#/lib/haptics' import {makeProfileLink} from '#/lib/routes/links' import {shareUrl} from '#/lib/sharing' +import {useGate} from '#/lib/statsig/statsig' import {toShareUrl} from '#/lib/strings/url-helpers' import {s} from '#/lib/styles' import {Shadow} from '#/state/cache/types' @@ -41,6 +43,7 @@ import * as Prompt from '#/components/Prompt' import {PostDropdownBtn} from '../forms/PostDropdownBtn' import {formatCount} from '../numeric/format' import {Text} from '../text/Text' +import * as Toast from '../Toast' import {RepostButton} from './RepostButton' let PostCtrls = ({ @@ -75,6 +78,7 @@ let PostCtrls = ({ const loggedOutWarningPromptControl = useDialogControl() const {sendInteraction} = useFeedFeedbackContext() const playHaptic = useHaptics() + const gate = useGate() const shouldShowLoggedOutWarning = React.useMemo(() => { return ( @@ -329,6 +333,31 @@ let PostCtrls = ({ timestamp={post.indexedAt} /> </View> + {gate('debug_show_feedcontext') && feedContext && ( + <Pressable + accessible={false} + style={{ + position: 'absolute', + top: 0, + bottom: 0, + right: 0, + display: 'flex', + justifyContent: 'center', + }} + onPress={e => { + e.stopPropagation() + Clipboard.setStringAsync(feedContext) + Toast.show(_(msg`Copied to clipboard`)) + }}> + <Text + style={{ + color: t.palette.contrast_400, + fontSize: 7, + }}> + {feedContext} + </Text> + </Pressable> + )} </View> ) } diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx index 134521177..2e5b48513 100644 --- a/src/view/screens/Feeds.tsx +++ b/src/view/screens/Feeds.tsx @@ -1,8 +1,6 @@ import React from 'react' import {ActivityIndicator, type FlatList, StyleSheet, View} from 'react-native' -import {AppBskyActorDefs, AppBskyFeedDefs} from '@atproto/api' -import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' -import {FontAwesomeIconStyle} from '@fortawesome/react-native-fontawesome' +import {AppBskyFeedDefs} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useFocusEffect} from '@react-navigation/native' @@ -10,12 +8,11 @@ import debounce from 'lodash.debounce' import {isNative, isWeb} from '#/platform/detection' import { - getAvatarTypeFromUri, - useFeedSourceInfoQuery, + SavedFeedItem, useGetPopularFeedsQuery, + useSavedFeeds, useSearchPopularFeedsMutation, } from '#/state/queries/feed' -import {usePreferencesQuery} from '#/state/queries/preferences' import {useSession} from '#/state/session' import {useSetMinimalShellMode} from '#/state/shell' import {useComposerControls} from '#/state/shell/composer' @@ -28,14 +25,10 @@ import {s} from 'lib/styles' import {ErrorMessage} from 'view/com/util/error/ErrorMessage' import {FAB} from 'view/com/util/fab/FAB' import {SearchInput} from 'view/com/util/forms/SearchInput' -import {Link, TextLink} from 'view/com/util/Link' +import {TextLink} from 'view/com/util/Link' import {List} from 'view/com/util/List' -import { - FeedFeedLoadingPlaceholder, - LoadingPlaceholder, -} from 'view/com/util/LoadingPlaceholder' +import {FeedFeedLoadingPlaceholder} from 'view/com/util/LoadingPlaceholder' import {Text} from 'view/com/util/text/Text' -import {UserAvatar} from 'view/com/util/UserAvatar' import {ViewHeader} from 'view/com/util/ViewHeader' import {NoFollowingFeed} from '#/screens/Feeds/NoFollowingFeed' import {NoSavedFeedsOfAnyType} from '#/screens/Feeds/NoSavedFeedsOfAnyType' @@ -47,6 +40,7 @@ import {ListSparkle_Stroke2_Corner0_Rounded} from '#/components/icons/ListSparkl import hairlineWidth = StyleSheet.hairlineWidth import {Divider} from '#/components/Divider' import * as FeedCard from '#/components/FeedCard' +import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron' type Props = NativeStackScreenProps<CommonNavigatorParams, 'Feeds'> @@ -61,9 +55,8 @@ type FlatlistSlice = key: string } | { - type: 'savedFeedsLoading' + type: 'savedFeedPlaceholder' key: string - // pendingItems: number, } | { type: 'savedFeedNoResults' @@ -72,8 +65,7 @@ type FlatlistSlice = | { type: 'savedFeed' key: string - feedUri: string - savedFeedConfig: AppBskyActorDefs.SavedFeed + savedFeed: SavedFeedItem } | { type: 'savedFeedsLoadMore' @@ -113,11 +105,11 @@ export function FeedsScreen(_props: Props) { const [query, setQuery] = React.useState('') const [isPTR, setIsPTR] = React.useState(false) const { - data: preferences, - isLoading: isPreferencesLoading, - error: preferencesError, - refetch: refetchPreferences, - } = usePreferencesQuery() + data: savedFeeds, + isPlaceholderData: isSavedFeedsPlaceholder, + error: savedFeedsError, + refetch: refetchSavedFeeds, + } = useSavedFeeds() const { data: popularFeeds, isFetching: isPopularFeedsFetching, @@ -173,11 +165,11 @@ export function FeedsScreen(_props: Props) { const onPullToRefresh = React.useCallback(async () => { setIsPTR(true) await Promise.all([ - refetchPreferences().catch(_e => undefined), + refetchSavedFeeds().catch(_e => undefined), refetchPopularFeeds().catch(_e => undefined), ]) setIsPTR(false) - }, [setIsPTR, refetchPreferences, refetchPopularFeeds]) + }, [setIsPTR, refetchSavedFeeds, refetchPopularFeeds]) const onEndReached = React.useCallback(() => { if ( isPopularFeedsFetching || @@ -203,6 +195,11 @@ export function FeedsScreen(_props: Props) { const items = React.useMemo(() => { let slices: FlatlistSlice[] = [] + const hasActualSavedCount = + !isSavedFeedsPlaceholder || + (isSavedFeedsPlaceholder && (savedFeeds?.count || 0) > 0) + const canShowDiscoverSection = + !hasSession || (hasSession && hasActualSavedCount) if (hasSession) { slices.push({ @@ -210,47 +207,63 @@ export function FeedsScreen(_props: Props) { type: 'savedFeedsHeader', }) - if (preferencesError) { + if (savedFeedsError) { slices.push({ key: 'savedFeedsError', type: 'error', - error: cleanError(preferencesError.toString()), + error: cleanError(savedFeedsError.toString()), }) } else { - if (isPreferencesLoading || !preferences?.savedFeeds) { - slices.push({ - key: 'savedFeedsLoading', - type: 'savedFeedsLoading', - // pendingItems: this.rootStore.preferences.savedFeeds.length || 3, - }) + if (isSavedFeedsPlaceholder && !savedFeeds?.feeds.length) { + /* + * Initial render in placeholder state is 0 on a cold page load, + * because preferences haven't loaded yet. + * + * In practice, `savedFeeds` is always defined, but we check for TS + * and for safety. + * + * In both cases, we show 4 as the the loading state. + */ + const min = 8 + const count = savedFeeds + ? savedFeeds.count === 0 + ? min + : savedFeeds.count + : min + Array(count) + .fill(0) + .forEach((_, i) => { + slices.push({ + key: 'savedFeedPlaceholder' + i, + type: 'savedFeedPlaceholder', + }) + }) } else { - if (preferences.savedFeeds?.length) { - const noFollowingFeed = preferences.savedFeeds.every( + if (savedFeeds?.feeds?.length) { + const noFollowingFeed = savedFeeds.feeds.every( f => f.type !== 'timeline', ) slices = slices.concat( - preferences.savedFeeds - .filter(f => { - return f.pinned + savedFeeds.feeds + .filter(s => { + return s.config.pinned }) - .map(feed => ({ - key: `savedFeed:${feed.value}:${feed.id}`, + .map(s => ({ + key: `savedFeed:${s.view?.uri}:${s.config.id}`, type: 'savedFeed', - feedUri: feed.value, - savedFeedConfig: feed, + savedFeed: s, })), ) slices = slices.concat( - preferences.savedFeeds - .filter(f => { - return !f.pinned + savedFeeds.feeds + .filter(s => { + return !s.config.pinned }) - .map(feed => ({ - key: `savedFeed:${feed.value}:${feed.id}`, + .map(s => ({ + key: `savedFeed:${s.view?.uri}:${s.config.id}`, type: 'savedFeed', - feedUri: feed.value, - savedFeedConfig: feed, + savedFeed: s, })), ) @@ -270,59 +283,36 @@ export function FeedsScreen(_props: Props) { } } - slices.push({ - key: 'popularFeedsHeader', - type: 'popularFeedsHeader', - }) - - if (popularFeedsError || searchError) { + if (!hasSession || (hasSession && canShowDiscoverSection)) { slices.push({ - key: 'popularFeedsError', - type: 'error', - error: cleanError( - popularFeedsError?.toString() ?? searchError?.toString() ?? '', - ), + key: 'popularFeedsHeader', + type: 'popularFeedsHeader', }) - } else { - if (isUserSearching) { - if (isSearchPending || !searchResults) { - slices.push({ - key: 'popularFeedsLoading', - type: 'popularFeedsLoading', - }) - } else { - if (!searchResults || searchResults?.length === 0) { - slices.push({ - key: 'popularFeedsNoResults', - type: 'popularFeedsNoResults', - }) - } else { - slices = slices.concat( - searchResults.map(feed => ({ - key: `popularFeed:${feed.uri}`, - type: 'popularFeed', - feedUri: feed.uri, - feed, - })), - ) - } - } + + if (popularFeedsError || searchError) { + slices.push({ + key: 'popularFeedsError', + type: 'error', + error: cleanError( + popularFeedsError?.toString() ?? searchError?.toString() ?? '', + ), + }) } else { - if (isPopularFeedsFetching && !popularFeeds?.pages) { - slices.push({ - key: 'popularFeedsLoading', - type: 'popularFeedsLoading', - }) - } else { - if (!popularFeeds?.pages) { + if (isUserSearching) { + if (isSearchPending || !searchResults) { slices.push({ - key: 'popularFeedsNoResults', - type: 'popularFeedsNoResults', + key: 'popularFeedsLoading', + type: 'popularFeedsLoading', }) } else { - for (const page of popularFeeds.pages || []) { + if (!searchResults || searchResults?.length === 0) { + slices.push({ + key: 'popularFeedsNoResults', + type: 'popularFeedsNoResults', + }) + } else { slices = slices.concat( - page.feeds.map(feed => ({ + searchResults.map(feed => ({ key: `popularFeed:${feed.uri}`, type: 'popularFeed', feedUri: feed.uri, @@ -330,12 +320,37 @@ export function FeedsScreen(_props: Props) { })), ) } - - if (isPopularFeedsFetchingNextPage) { + } + } else { + if (isPopularFeedsFetching && !popularFeeds?.pages) { + slices.push({ + key: 'popularFeedsLoading', + type: 'popularFeedsLoading', + }) + } else { + if (!popularFeeds?.pages) { slices.push({ - key: 'popularFeedsLoadingMore', - type: 'popularFeedsLoadingMore', + key: 'popularFeedsNoResults', + type: 'popularFeedsNoResults', }) + } else { + for (const page of popularFeeds.pages || []) { + slices = slices.concat( + page.feeds.map(feed => ({ + key: `popularFeed:${feed.uri}`, + type: 'popularFeed', + feedUri: feed.uri, + feed, + })), + ) + } + + if (isPopularFeedsFetchingNextPage) { + slices.push({ + key: 'popularFeedsLoadingMore', + type: 'popularFeedsLoadingMore', + }) + } } } } @@ -345,9 +360,9 @@ export function FeedsScreen(_props: Props) { return slices }, [ hasSession, - preferences, - isPreferencesLoading, - preferencesError, + savedFeeds, + isSavedFeedsPlaceholder, + savedFeedsError, popularFeeds, isPopularFeedsFetching, popularFeedsError, @@ -407,10 +422,7 @@ export function FeedsScreen(_props: Props) { ({item}: {item: FlatlistSlice}) => { if (item.type === 'error') { return <ErrorMessage message={item.error} /> - } else if ( - item.type === 'popularFeedsLoadingMore' || - item.type === 'savedFeedsLoading' - ) { + } else if (item.type === 'popularFeedsLoadingMore') { return ( <View style={s.p10}> <ActivityIndicator size="large" /> @@ -459,8 +471,10 @@ export function FeedsScreen(_props: Props) { <NoSavedFeedsOfAnyType /> </View> ) + } else if (item.type === 'savedFeedPlaceholder') { + return <SavedFeedPlaceholder /> } else if (item.type === 'savedFeed') { - return <FeedOrFollowing savedFeedConfig={item.savedFeedConfig} /> + return <FeedOrFollowing savedFeed={item.savedFeed} /> } else if (item.type === 'popularFeedsHeader') { return ( <> @@ -481,7 +495,7 @@ export function FeedsScreen(_props: Props) { } else if (item.type === 'popularFeed') { return ( <View style={[a.px_lg, a.pt_lg, a.gap_lg]}> - <FeedCard.Default feed={item.feed} /> + <FeedCard.Default type="feed" view={item.feed} /> <Divider /> </View> ) @@ -571,136 +585,106 @@ export function FeedsScreen(_props: Props) { ) } -function FeedOrFollowing({ - savedFeedConfig: feed, -}: { - savedFeedConfig: AppBskyActorDefs.SavedFeed -}) { - return feed.type === 'timeline' ? ( +function FeedOrFollowing({savedFeed}: {savedFeed: SavedFeedItem}) { + return savedFeed.type === 'timeline' ? ( <FollowingFeed /> ) : ( - <SavedFeed savedFeedConfig={feed} /> + <SavedFeed savedFeed={savedFeed} /> ) } function FollowingFeed() { - const pal = usePalette('default') const t = useTheme() - const {isMobile} = useWebMediaQueries() + const {_} = useLingui() return ( <View - testID={`saved-feed-timeline`} style={[ - pal.border, - styles.savedFeed, - isMobile && styles.savedFeedMobile, + a.flex_1, + a.px_lg, + a.py_md, + a.border_b, + t.atoms.border_contrast_low, ]}> - <View - style={[ - a.align_center, - a.justify_center, - { - width: 28, - height: 28, - borderRadius: 3, - backgroundColor: t.palette.primary_500, - }, - ]}> - <FilterTimeline + <FeedCard.Header> + <View style={[ + a.align_center, + a.justify_center, { - width: 18, - height: 18, + width: 28, + height: 28, + borderRadius: 3, + backgroundColor: t.palette.primary_500, }, - ]} - fill={t.palette.white} - /> - </View> - <View - style={{flex: 1, flexDirection: 'row', gap: 8, alignItems: 'center'}}> - <Text type="lg-medium" style={pal.text} numberOfLines={1}> - <Trans>Following</Trans> - </Text> - </View> + ]}> + <FilterTimeline + style={[ + { + width: 18, + height: 18, + }, + ]} + fill={t.palette.white} + /> + </View> + <FeedCard.TitleAndByline title={_(msg`Following`)} type="feed" /> + </FeedCard.Header> </View> ) } function SavedFeed({ - savedFeedConfig: feed, + savedFeed, }: { - savedFeedConfig: AppBskyActorDefs.SavedFeed + savedFeed: SavedFeedItem & {type: 'feed' | 'list'} }) { - const pal = usePalette('default') - const {isMobile} = useWebMediaQueries() - const {data: info, error} = useFeedSourceInfoQuery({uri: feed.value}) - const typeAvatar = getAvatarTypeFromUri(feed.value) - - if (!info) - return ( - <SavedFeedLoadingPlaceholder - key={`savedFeedLoadingPlaceholder:${feed.value}`} - /> - ) + const t = useTheme() + const {view: feed} = savedFeed + const displayName = + savedFeed.type === 'feed' ? savedFeed.view.displayName : savedFeed.view.name return ( - <Link - testID={`saved-feed-${info.displayName}`} - href={info.route.href} - style={[pal.border, styles.savedFeed, isMobile && styles.savedFeedMobile]} - hoverStyle={pal.viewLight} - accessibilityLabel={info.displayName} - accessibilityHint="" - asAnchor - anchorNoUnderline> - {error ? ( + <FeedCard.Link testID={`saved-feed-${feed.displayName}`} {...savedFeed}> + {({hovered, pressed}) => ( <View - style={{width: 28, flexDirection: 'row', justifyContent: 'center'}}> - <FontAwesomeIcon - icon="exclamation-circle" - color={pal.colors.textLight} - /> + style={[ + a.flex_1, + a.px_lg, + a.py_md, + a.border_b, + t.atoms.border_contrast_low, + (hovered || pressed) && t.atoms.bg_contrast_25, + ]}> + <FeedCard.Header> + <FeedCard.Avatar src={feed.avatar} size={28} /> + <FeedCard.TitleAndByline + title={displayName} + type={savedFeed.type} + /> + + <ChevronRight size="sm" fill={t.atoms.text_contrast_low.color} /> + </FeedCard.Header> </View> - ) : ( - <UserAvatar type={typeAvatar} size={28} avatar={info.avatar} /> )} - <View - style={{flex: 1, flexDirection: 'row', gap: 8, alignItems: 'center'}}> - <Text type="lg-medium" style={pal.text} numberOfLines={1}> - {info.displayName} - </Text> - {error ? ( - <View style={[styles.offlineSlug, pal.borderDark]}> - <Text type="xs" style={pal.textLight}> - <Trans>Feed offline</Trans> - </Text> - </View> - ) : null} - </View> - - {isMobile && ( - <FontAwesomeIcon - icon="chevron-right" - size={14} - style={pal.textLight as FontAwesomeIconStyle} - /> - )} - </Link> + </FeedCard.Link> ) } -function SavedFeedLoadingPlaceholder() { - const pal = usePalette('default') - const {isMobile} = useWebMediaQueries() +function SavedFeedPlaceholder() { + const t = useTheme() return ( <View style={[ - pal.border, - styles.savedFeed, - isMobile && styles.savedFeedMobile, + a.flex_1, + a.px_lg, + a.py_md, + a.border_b, + t.atoms.border_contrast_low, ]}> - <LoadingPlaceholder width={28} height={28} style={{borderRadius: 4}} /> - <LoadingPlaceholder width={140} height={12} /> + <FeedCard.Header> + <FeedCard.AvatarPlaceholder size={28} /> + <FeedCard.TitleAndBylinePlaceholder /> + </FeedCard.Header> </View> ) } diff --git a/src/view/screens/Search/Explore.tsx b/src/view/screens/Search/Explore.tsx index dd93bf813..8f6f6d4ba 100644 --- a/src/view/screens/Search/Explore.tsx +++ b/src/view/screens/Search/Explore.tsx @@ -282,7 +282,7 @@ export function Explore() { isFetchingNextPage: isFetchingNextProfilesPage, error: profilesError, fetchNextPage: fetchNextProfilesPage, - } = useSuggestedFollowsQuery({limit: 3}) + } = useSuggestedFollowsQuery({limit: 6, subsequentPageLimit: 10}) const { data: feeds, hasNextPage: hasNextFeedsPage, @@ -290,7 +290,7 @@ export function Explore() { isFetchingNextPage: isFetchingNextFeedsPage, error: feedsError, fetchNextPage: fetchNextFeedsPage, - } = useGetPopularFeedsQuery({limit: 3}) + } = useGetPopularFeedsQuery({limit: 10}) const isLoadingMoreProfiles = isFetchingNextProfilesPage && !isLoadingProfiles const onLoadMoreProfiles = React.useCallback(async () => { @@ -340,11 +340,12 @@ export function Explore() { // Currently the responses contain duplicate items. // Needs to be fixed on backend, but let's dedupe to be safe. let seen = new Set() + const profileItems: ExploreScreenItems[] = [] for (const page of profiles.pages) { for (const actor of page.actors) { if (!seen.has(actor.did)) { seen.add(actor.did) - i.push({ + profileItems.push({ type: 'profile', key: actor.did, profile: actor, @@ -354,13 +355,19 @@ export function Explore() { } if (hasNextProfilesPage) { + // splice off 3 as previews if we have a next page + const previews = profileItems.splice(-3) + // push remainder + i.push(...profileItems) i.push({ type: 'loadMore', key: 'loadMoreProfiles', isLoadingMore: isLoadingMoreProfiles, onLoadMore: onLoadMoreProfiles, - items: i.filter(item => item.type === 'profile').slice(-3), + items: previews, }) + } else { + i.push(...profileItems) } } else { if (profilesError) { @@ -390,11 +397,12 @@ export function Explore() { // Currently the responses contain duplicate items. // Needs to be fixed on backend, but let's dedupe to be safe. let seen = new Set() + const feedItems: ExploreScreenItems[] = [] for (const page of feeds.pages) { for (const feed of page.feeds) { if (!seen.has(feed.uri)) { seen.add(feed.uri) - i.push({ + feedItems.push({ type: 'feed', key: feed.uri, feed, @@ -403,6 +411,7 @@ export function Explore() { } } + // feeds errors can occur during pagination, so feeds is truthy if (feedsError) { i.push({ type: 'error', @@ -418,13 +427,17 @@ export function Explore() { error: cleanError(preferencesError), }) } else if (hasNextFeedsPage) { + const preview = feedItems.splice(-3) + i.push(...feedItems) i.push({ type: 'loadMore', key: 'loadMoreFeeds', isLoadingMore: isLoadingMoreFeeds, onLoadMore: onLoadMoreFeeds, - items: i.filter(item => item.type === 'feed').slice(-3), + items: preview, }) + } else { + i.push(...feedItems) } } else { if (feedsError) { @@ -492,7 +505,7 @@ export function Explore() { a.px_lg, a.py_lg, ]}> - <FeedCard.Default feed={item.feed} /> + <FeedCard.Default type="feed" view={item.feed} /> </View> ) } diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index 0b1fe37aa..76ffba935 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -306,7 +306,7 @@ let SearchScreenFeedsResults = ({ a.px_lg, a.py_lg, ]}> - <FeedCard.Default feed={item} /> + <FeedCard.Default type="feed" view={item} /> </View> )} keyExtractor={item => item.uri} |