zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

Surface raw server error if exists (#2096)

Browse source 
* Surface raw server error if exists

* Update copy

* Update translation files

---------

Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
Eric Bailey 2023-12-05 20:25:32 -06:00 • committed by GitHub
parent 7f3324d4a4
commit e6bda92b20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 602 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/view/com/posts/Feed.tsx
View file

@ -210,7 +210,7 @@ let Feed = ({
return (
<FeedErrorMessage
feedDesc={feed}
error={error}
error={error ?? undefined}
onPressTryAgain={onPressTryAgain}
/>
)

29
src/view/com/posts/FeedErrorMessage.tsx
View file

@ -10,7 +10,7 @@ import {useNavigation} from '@react-navigation/native'
import {NavigationProp} from 'lib/routes/types'
import {logger} from '#/logger'
import {useModalControls} from '#/state/modals'
import {msg as msgLingui} from '@lingui/macro'
import {msg as msgLingui, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {FeedDescriptor} from '#/state/queries/post-feed'
import {EmptyState} from '../util/EmptyState'
@ -35,7 +35,7 @@ export function FeedErrorMessage({
onPressTryAgain,
}: {
feedDesc: FeedDescriptor
error: any
error?: Error
onPressTryAgain: () => void
}) {
const knownError = React.useMemo(
@ -47,7 +47,13 @@ export function FeedErrorMessage({
knownError !== KnownError.Unknown &&
feedDesc.startsWith('feedgen')
) {
return <FeedgenErrorMessage feedDesc={feedDesc} knownError={knownError} />
return (
<FeedgenErrorMessage
feedDesc={feedDesc}
knownError={knownError}
rawError={error}
/>
)
}
if (knownError === KnownError.Block) {
@ -71,9 +77,11 @@ export function FeedErrorMessage({
function FeedgenErrorMessage({
feedDesc,
knownError,
rawError,
}: {
feedDesc: FeedDescriptor
knownError: KnownError
rawError?: Error
}) {
const pal = usePalette('default')
const {_: _l} = useLingui()
@ -84,7 +92,7 @@ function FeedgenErrorMessage({
[KnownError.Unknown]: '',
[KnownError.Block]: '',
[KnownError.FeedgenDoesNotExist]: _l(
msgLingui`Hmmm, we're having trouble finding this feed. It may have been deleted.`,
msgLingui`Hmm, we're having trouble finding this feed. It may have been deleted.`,
),
[KnownError.FeedgenMisconfigured]: _l(
msgLingui`Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue.`,
@ -96,13 +104,13 @@ function FeedgenErrorMessage({
msgLingui`Hmm, the feed server appears to be offline. Please let the feed owner know about this issue.`,
),
[KnownError.FeedNSFPublic]: _l(
msgLingui`We're sorry, but this content is not viewable without a Bluesky account.`,
msgLingui`This content is not viewable without a Bluesky account.`,
),
[KnownError.FeedgenUnknown]: _l(
msgLingui`Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue.`,
msgLingui`Hmm, some kind of issue occurred when contacting the feed server. Please let the feed owner know about this issue.`,
),
[KnownError.FeedTooManyRequests]: _l(
msgLingui`We're sorry, but this feed is currently receiving high traffic and is temporarily unavailable. Please try again later.`,
msgLingui`This feed is currently receiving high traffic and is temporarily unavailable. Please try again later.`,
),
}[knownError]),
[_l, knownError],
@ -180,6 +188,13 @@ function FeedgenErrorMessage({
},
]}>
<Text style={pal.text}>{msg}</Text>
{rawError?.message && (
<Text style={pal.textLight}>
<Trans>Message from server</Trans>: {rawError.message}
</Text>
)}
{cta}
</View>
)