LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

change display of blocked error

Browse source
This commit is contained in:
zeppi 2022-11-04 16:35:04 -04:00
parent 6d52763e19
commit 1d55a84c94
4 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/app-strings.json
View file

@ -2319,5 +2319,7 @@
"Your hub has blocked this content because it subscribes to the following blocking channel:": "Your hub has blocked this content because it subscribes to the following blocking channel:", "Your hub has blocked this content because it subscribes to the following blocking channel:": "Your hub has blocked this content because it subscribes to the following blocking channel:",
"Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.": "Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.", "Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.": "Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.",
"Autoplay Next is on.": "Autoplay Next is on.", "Autoplay Next is on.": "Autoplay Next is on.",
"Content Blocked": "Content Blocked",
"Your hub has blocked %content% because it subscribes to the following blocking channel:": "Your hub has blocked %content% because it subscribes to the following blocking channel:",
"--end--": "--end--" "--end--": "--end--"
} }

10
ui/page/show/view.jsx
View file

@ -162,17 +162,19 @@ function ShowPage(props: Props) {
) : ( ) : (
<Page> <Page>
<Card <Card
title={uri} title={__('Content Blocked')}
subtitle={ subtitle={
<> <>
{(!errorCensor || !errorCensor.text) && {errorCensor &&
__('Your hub has blocked this content because it subscribes to the following blocking channel:')} __(`Your hub has blocked %content% because it subscribes to the following blocking channel:`, {
{errorCensor && errorCensor.text}{' '} content: uri,
})}{' '}
<Button <Button
button="link" button="link"
navigate={errorCensor && errorCensor.canonical_url} navigate={errorCensor && errorCensor.canonical_url}
label={errorCensor && errorCensor.name} label={errorCensor && errorCensor.name}
/> />
{errorCensor && <div className={'error__text'}>{`\nMessage:\n${errorCensor.text}\n`}</div>}
</> </>
} }
/> />

27
ui/redux/actions/claims.js
View file

@ -86,16 +86,25 @@ export function doResolveUris(
// https://github.com/facebook/flow/issues/2221 // https://github.com/facebook/flow/issues/2221
if (uriResolveInfo) { if (uriResolveInfo) {
if (uriResolveInfo.error) { if (uriResolveInfo.error) {
// $FlowFixMe // TODO: handled filtered too
resolveInfo[uri] = { if (uriResolveInfo.error.name === 'BLOCKED') {
...fallbackResolveInfo, // $FlowFixMe
errorCensor: { resolveInfo[uri] = {
// $FlowFixMe // $FlowFixMe
...uriResolveInfo.error.censor, ...fallbackResolveInfo,
// $FlowFixMe errorCensor: {
text: uriResolveInfo.error.text, // $FlowFixMe
}, ...uriResolveInfo.error.censor,
}; // $FlowFixMe
text: uriResolveInfo.error.text,
}, // $FlowFixMe
};
} else {
// $FlowFixMe
resolveInfo[uri] = {
...fallbackResolveInfo,
};
}
} else { } else {
if (checkReposts) { if (checkReposts) {
if (uriResolveInfo.reposted_claim) { if (uriResolveInfo.reposted_claim) {

1
ui/redux/selectors/claims.js
View file

@ -83,6 +83,7 @@ export const selectClaimIdForUri = (state: State, uri: string) => selectClaimIds
export const selectReflectingById = (state: State) => selectState(state).reflectingById; export const selectReflectingById = (state: State) => selectState(state).reflectingById;
// TODO: remove this.
export const makeSelectBlacklistedDueToDMCA = (claimUri: string) => export const makeSelectBlacklistedDueToDMCA = (claimUri: string) =>
createSelector(makeSelectClaimErrorCensor(claimUri), (claimError) => { createSelector(makeSelectClaimErrorCensor(claimUri), (claimError) => {
if (!claimError) { if (!claimError) {