forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Improve error name and message for signed-in only feeds (#6577)
* Improve error name and message for logged-in only feeds
* Revert msg edit
---------
Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
authored by
Eric Bailey
Dan Abramov
and committed by
GitHub
72326844
a5dbb352
+9
-34
+1
-1
src/state/queries/post-feed.ts
+1
-1
src/state/queries/post-feed.ts
+5
-5
src/view/com/posts/FeedErrorMessage.tsx
+5
-5
src/view/com/posts/FeedErrorMessage.tsx
···
25
25
FeedgenBadResponse = 'FeedgenBadResponse',
26
26
FeedgenOffline = 'FeedgenOffline',
27
27
FeedgenUnknown = 'FeedgenUnknown',
28
-
FeedNSFPublic = 'FeedNSFPublic',
28
+
FeedSignedInOnly = 'FeedSignedInOnly',
29
29
FeedTooManyRequests = 'FeedTooManyRequests',
30
30
Unknown = 'Unknown',
31
31
}
···
110
110
[KnownError.FeedgenOffline]: _l(
111
111
msgLingui`Hmm, the feed server appears to be offline. Please let the feed owner know about this issue.`,
112
112
),
113
-
[KnownError.FeedNSFPublic]: _l(
113
+
[KnownError.FeedSignedInOnly]: _l(
114
114
msgLingui`This content is not viewable without a Bluesky account.`,
115
115
),
116
116
[KnownError.FeedgenUnknown]: _l(
···
152
152
153
153
const cta = React.useMemo(() => {
154
154
switch (knownError) {
155
-
case KnownError.FeedNSFPublic: {
155
+
case KnownError.FeedSignedInOnly: {
156
156
return null
157
157
}
158
158
case KnownError.FeedgenDoesNotExist:
···
249
249
if (typeof error !== 'string') {
250
250
error = error.toString()
251
251
}
252
-
if (error.includes(KnownError.FeedNSFPublic)) {
253
-
return KnownError.FeedNSFPublic
252
+
if (error.includes(KnownError.FeedSignedInOnly)) {
253
+
return KnownError.FeedSignedInOnly
254
254
}
255
255
if (!feedDesc.startsWith('feedgen')) {
256
256
return KnownError.Unknown
+3
-28
yarn.lock
+3
-28
yarn.lock
···
17458
17458
resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
17459
17459
integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
17460
17460
17461
-
"string-width-cjs@npm:string-width@^4.2.0":
17462
-
version "4.2.3"
17463
-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
17464
-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
17465
-
dependencies:
17466
-
emoji-regex "^8.0.0"
17467
-
is-fullwidth-code-point "^3.0.0"
17468
-
strip-ansi "^6.0.1"
17469
-
17470
-
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
17461
+
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
17471
17462
version "4.2.3"
17472
17463
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
17473
17464
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
···
17567
17558
dependencies:
17568
17559
safe-buffer "~5.1.0"
17569
17560
17570
-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
17561
+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
17571
17562
version "6.0.1"
17572
17563
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
17573
17564
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
···
17580
17571
integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
17581
17572
dependencies:
17582
17573
ansi-regex "^4.1.0"
17583
-
17584
-
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
17585
-
version "6.0.1"
17586
-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
17587
-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
17588
-
dependencies:
17589
-
ansi-regex "^5.0.1"
17590
17574
17591
17575
strip-ansi@^7.0.1:
17592
17576
version "7.1.0"
···
18928
18912
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
18929
18913
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
18930
18914
18931
-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
18915
+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
18932
18916
version "7.0.0"
18933
18917
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
18934
18918
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
···
18941
18925
version "6.2.0"
18942
18926
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
18943
18927
integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
18944
-
dependencies:
18945
-
ansi-styles "^4.0.0"
18946
-
string-width "^4.1.0"
18947
-
strip-ansi "^6.0.0"
18948
-
18949
-
wrap-ansi@^7.0.0:
18950
-
version "7.0.0"
18951
-
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
18952
-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
18953
18928
dependencies:
18954
18929
ansi-styles "^4.0.0"
18955
18930
string-width "^4.1.0"