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

Handle feedgen 429 (#2066) 

* Handle feedgen 429

* Translate
zio/stable
Eric Bailey 2023-12-04 15:27:48 -06:00 committed by GitHub
parent 37cafb080b
commit 094a58490f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 71 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/locale/locales/cs/messages.po
View File

@ -920,23 +920,23 @@ msgstr ""
msgid "Hide user list" msgid "Hide user list"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:101 #: src/view/com/posts/FeedErrorMessage.tsx:102
msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue." msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:89 #: src/view/com/posts/FeedErrorMessage.tsx:90
msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:95 #: src/view/com/posts/FeedErrorMessage.tsx:96
msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:92 #: src/view/com/posts/FeedErrorMessage.tsx:93
msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue." msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:86 #: src/view/com/posts/FeedErrorMessage.tsx:87
msgid "Hmmm, we're having trouble finding this feed. It may have been deleted." msgid "Hmmm, we're having trouble finding this feed. It may have been deleted."
msgstr "" msgstr ""
@ -1527,7 +1527,7 @@ msgstr ""
msgid "Remove account" msgid "Remove account"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:118 #: src/view/com/posts/FeedErrorMessage.tsx:122
msgid "Remove feed" msgid "Remove feed"
msgstr "" msgstr ""
@ -1544,7 +1544,7 @@ msgstr ""
msgid "Remove image preview" msgid "Remove image preview"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:119 #: src/view/com/posts/FeedErrorMessage.tsx:123
msgid "Remove this feed from your saved feeds?" msgid "Remove this feed from your saved feeds?"
msgstr "" msgstr ""
@ -2145,10 +2145,14 @@ msgstr ""
msgid "We're so excited to have you join us!" msgid "We're so excited to have you join us!"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:98 #: src/view/com/posts/FeedErrorMessage.tsx:99
msgid "We're sorry, but this content is not viewable without a Bluesky account." msgid "We're sorry, but this content is not viewable without a Bluesky account."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:105
msgid "We're sorry, but this feed is currently receiving high traffic and is temporarily unavailable. Please try again later."
msgstr ""
#: src/view/screens/Search/Search.tsx:236 #: src/view/screens/Search/Search.tsx:236
msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgid "We're sorry, but your search could not be completed. Please try again in a few minutes."
msgstr "" msgstr ""

20
src/locale/locales/en/messages.po
View File

@ -920,23 +920,23 @@ msgstr ""
msgid "Hide user list" msgid "Hide user list"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:101 #: src/view/com/posts/FeedErrorMessage.tsx:102
msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue." msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:89 #: src/view/com/posts/FeedErrorMessage.tsx:90
msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:95 #: src/view/com/posts/FeedErrorMessage.tsx:96
msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:92 #: src/view/com/posts/FeedErrorMessage.tsx:93
msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue." msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:86 #: src/view/com/posts/FeedErrorMessage.tsx:87
msgid "Hmmm, we're having trouble finding this feed. It may have been deleted." msgid "Hmmm, we're having trouble finding this feed. It may have been deleted."
msgstr "" msgstr ""
@ -1527,7 +1527,7 @@ msgstr ""
msgid "Remove account" msgid "Remove account"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:118 #: src/view/com/posts/FeedErrorMessage.tsx:122
msgid "Remove feed" msgid "Remove feed"
msgstr "" msgstr ""
@ -1544,7 +1544,7 @@ msgstr ""
msgid "Remove image preview" msgid "Remove image preview"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:119 #: src/view/com/posts/FeedErrorMessage.tsx:123
msgid "Remove this feed from your saved feeds?" msgid "Remove this feed from your saved feeds?"
msgstr "" msgstr ""
@ -2145,10 +2145,14 @@ msgstr ""
msgid "We're so excited to have you join us!" msgid "We're so excited to have you join us!"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:98 #: src/view/com/posts/FeedErrorMessage.tsx:99
msgid "We're sorry, but this content is not viewable without a Bluesky account." msgid "We're sorry, but this content is not viewable without a Bluesky account."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:105
msgid "We're sorry, but this feed is currently receiving high traffic and is temporarily unavailable. Please try again later."
msgstr ""
#: src/view/screens/Search/Search.tsx:236 #: src/view/screens/Search/Search.tsx:236
msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgid "We're sorry, but your search could not be completed. Please try again in a few minutes."
msgstr "" msgstr ""

20
src/locale/locales/es/messages.po
View File

@ -920,23 +920,23 @@ msgstr ""
msgid "Hide user list" msgid "Hide user list"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:101 #: src/view/com/posts/FeedErrorMessage.tsx:102
msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue." msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:89 #: src/view/com/posts/FeedErrorMessage.tsx:90
msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:95 #: src/view/com/posts/FeedErrorMessage.tsx:96
msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:92 #: src/view/com/posts/FeedErrorMessage.tsx:93
msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue." msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:86 #: src/view/com/posts/FeedErrorMessage.tsx:87
msgid "Hmmm, we're having trouble finding this feed. It may have been deleted." msgid "Hmmm, we're having trouble finding this feed. It may have been deleted."
msgstr "" msgstr ""
@ -1527,7 +1527,7 @@ msgstr ""
msgid "Remove account" msgid "Remove account"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:118 #: src/view/com/posts/FeedErrorMessage.tsx:122
msgid "Remove feed" msgid "Remove feed"
msgstr "" msgstr ""
@ -1544,7 +1544,7 @@ msgstr ""
msgid "Remove image preview" msgid "Remove image preview"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:119 #: src/view/com/posts/FeedErrorMessage.tsx:123
msgid "Remove this feed from your saved feeds?" msgid "Remove this feed from your saved feeds?"
msgstr "" msgstr ""
@ -2145,10 +2145,14 @@ msgstr ""
msgid "We're so excited to have you join us!" msgid "We're so excited to have you join us!"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:98 #: src/view/com/posts/FeedErrorMessage.tsx:99
msgid "We're sorry, but this content is not viewable without a Bluesky account." msgid "We're sorry, but this content is not viewable without a Bluesky account."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:105
msgid "We're sorry, but this feed is currently receiving high traffic and is temporarily unavailable. Please try again later."
msgstr ""
#: src/view/screens/Search/Search.tsx:236 #: src/view/screens/Search/Search.tsx:236
msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgid "We're sorry, but your search could not be completed. Please try again in a few minutes."
msgstr "" msgstr ""

20
src/locale/locales/fr/messages.po
View File

@ -920,23 +920,23 @@ msgstr ""
msgid "Hide user list" msgid "Hide user list"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:101 #: src/view/com/posts/FeedErrorMessage.tsx:102
msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue." msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:89 #: src/view/com/posts/FeedErrorMessage.tsx:90
msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:95 #: src/view/com/posts/FeedErrorMessage.tsx:96
msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:92 #: src/view/com/posts/FeedErrorMessage.tsx:93
msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue." msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:86 #: src/view/com/posts/FeedErrorMessage.tsx:87
msgid "Hmmm, we're having trouble finding this feed. It may have been deleted." msgid "Hmmm, we're having trouble finding this feed. It may have been deleted."
msgstr "" msgstr ""
@ -1527,7 +1527,7 @@ msgstr ""
msgid "Remove account" msgid "Remove account"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:118 #: src/view/com/posts/FeedErrorMessage.tsx:122
msgid "Remove feed" msgid "Remove feed"
msgstr "" msgstr ""
@ -1544,7 +1544,7 @@ msgstr ""
msgid "Remove image preview" msgid "Remove image preview"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:119 #: src/view/com/posts/FeedErrorMessage.tsx:123
msgid "Remove this feed from your saved feeds?" msgid "Remove this feed from your saved feeds?"
msgstr "" msgstr ""
@ -2145,10 +2145,14 @@ msgstr ""
msgid "We're so excited to have you join us!" msgid "We're so excited to have you join us!"
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:98 #: src/view/com/posts/FeedErrorMessage.tsx:99
msgid "We're sorry, but this content is not viewable without a Bluesky account." msgid "We're sorry, but this content is not viewable without a Bluesky account."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:105
msgid "We're sorry, but this feed is currently receiving high traffic and is temporarily unavailable. Please try again later."
msgstr ""
#: src/view/screens/Search/Search.tsx:236 #: src/view/screens/Search/Search.tsx:236
msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgid "We're sorry, but your search could not be completed. Please try again in a few minutes."
msgstr "" msgstr ""

20
src/locale/locales/hi/messages.po
View File

@ -912,23 +912,23 @@ msgstr "इसे छिपाएं"
msgid "Hide user list" msgid "Hide user list"
msgstr "उपयोगकर्ता सूची छुपाएँ" msgstr "उपयोगकर्ता सूची छुपाएँ"
#: src/view/com/posts/FeedErrorMessage.tsx:101 #: src/view/com/posts/FeedErrorMessage.tsx:102
msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue." msgid "Hmm, some kind of issue occured when contacting the feed server. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:89 #: src/view/com/posts/FeedErrorMessage.tsx:90
msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:95 #: src/view/com/posts/FeedErrorMessage.tsx:96
msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue." msgid "Hmm, the feed server appears to be offline. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:92 #: src/view/com/posts/FeedErrorMessage.tsx:93
msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue." msgid "Hmm, the feed server gave a bad response. Please let the feed owner know about this issue."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:86 #: src/view/com/posts/FeedErrorMessage.tsx:87
msgid "Hmmm, we're having trouble finding this feed. It may have been deleted." msgid "Hmmm, we're having trouble finding this feed. It may have been deleted."
msgstr "" msgstr ""
@ -1519,7 +1519,7 @@ msgstr "मेरे फ़ीड से {0} हटाएं?"
msgid "Remove account" msgid "Remove account"
msgstr "खाता हटाएं" msgstr "खाता हटाएं"
#: src/view/com/posts/FeedErrorMessage.tsx:118 #: src/view/com/posts/FeedErrorMessage.tsx:122
msgid "Remove feed" msgid "Remove feed"
msgstr "फ़ीड हटाएँ" msgstr "फ़ीड हटाएँ"
@ -1536,7 +1536,7 @@ msgstr "छवि निकालें"
msgid "Remove image preview" msgid "Remove image preview"
msgstr "छवि पूर्वावलोकन निकालें" msgstr "छवि पूर्वावलोकन निकालें"
#: src/view/com/posts/FeedErrorMessage.tsx:119 #: src/view/com/posts/FeedErrorMessage.tsx:123
msgid "Remove this feed from your saved feeds?" msgid "Remove this feed from your saved feeds?"
msgstr "इस फ़ीड को सहेजे गए फ़ीड से हटा दें?" msgstr "इस फ़ीड को सहेजे गए फ़ीड से हटा दें?"
@ -2137,10 +2137,14 @@ msgstr "साइट पर जाएं"
msgid "We're so excited to have you join us!" msgid "We're so excited to have you join us!"
msgstr "हम आपके हमारी सेवा में शामिल होने को लेकर बहुत उत्साहित हैं!" msgstr "हम आपके हमारी सेवा में शामिल होने को लेकर बहुत उत्साहित हैं!"
#: src/view/com/posts/FeedErrorMessage.tsx:98 #: src/view/com/posts/FeedErrorMessage.tsx:99
msgid "We're sorry, but this content is not viewable without a Bluesky account." msgid "We're sorry, but this content is not viewable without a Bluesky account."
msgstr "" msgstr ""
#: src/view/com/posts/FeedErrorMessage.tsx:105
msgid "We're sorry, but this feed is currently receiving high traffic and is temporarily unavailable. Please try again later."
msgstr ""
#: src/view/screens/Search/Search.tsx:236 #: src/view/screens/Search/Search.tsx:236
msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgid "We're sorry, but your search could not be completed. Please try again in a few minutes."
msgstr "" msgstr ""

11
src/view/com/posts/FeedErrorMessage.tsx
View File

@ -25,6 +25,7 @@ export enum KnownError {
FeedgenOffline = 'FeedgenOffline', FeedgenOffline = 'FeedgenOffline',
FeedgenUnknown = 'FeedgenUnknown', FeedgenUnknown = 'FeedgenUnknown',
FeedNSFPublic = 'FeedNSFPublic', FeedNSFPublic = 'FeedNSFPublic',
FeedTooManyRequests = 'FeedTooManyRequests',
Unknown = 'Unknown', Unknown = 'Unknown',
} }
@ -100,6 +101,9 @@ function FeedgenErrorMessage({
[KnownError.FeedgenUnknown]: _l( [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 occured 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.`,
),
}[knownError]), }[knownError]),
[_l, knownError], [_l, knownError],
) )
@ -203,6 +207,13 @@ function detectKnownError(
) { ) {
return KnownError.Block return KnownError.Block
} }
// check status codes
if (error?.status === 429) {
return KnownError.FeedTooManyRequests
}
// convert error to string and continue
if (typeof error !== 'string') { if (typeof error !== 'string') {
error = error.toString() error = error.toString()
} }