From 528a0f4d6ee98e05af896cf2d4d21c225dd3a8a3 Mon Sep 17 00:00:00 2001 From: jessopb <36554050+jessopb@users.noreply.github.com> Date: Fri, 21 Jan 2022 11:21:43 -0500 Subject: [PATCH] apply ody pr #329 no blacklist check on claimLink (#7428) --- ui/component/claimLink/index.js | 2 -- ui/component/claimLink/view.jsx | 22 +--------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/ui/component/claimLink/index.js b/ui/component/claimLink/index.js index 21363a527..e8823589b 100644 --- a/ui/component/claimLink/index.js +++ b/ui/component/claimLink/index.js @@ -3,7 +3,6 @@ import { makeSelectClaimForUri, selectIsUriResolving } from 'redux/selectors/cla import { doResolveUri } from 'redux/actions/claims'; import { doSetPlayingUri } from 'redux/actions/content'; import { punctuationMarks } from 'util/remark-lbry'; -import { selectBlackListedOutpoints } from 'lbryinc'; import { selectPlayingUri } from 'redux/selectors/content'; import ClaimLink from './view'; @@ -26,7 +25,6 @@ const select = (state, props) => { claim, fullUri: props.uri, isResolvingUri: selectIsUriResolving(state, uri), - blackListedOutpoints: selectBlackListedOutpoints(state), playingUri: selectPlayingUri(state), }; }; diff --git a/ui/component/claimLink/view.jsx b/ui/component/claimLink/view.jsx index a9a6f9138..1c26a84f6 100644 --- a/ui/component/claimLink/view.jsx +++ b/ui/component/claimLink/view.jsx @@ -14,10 +14,6 @@ type Props = { description: ?string, isResolvingUri: boolean, doResolveUri: (string) => void, - blackListedOutpoints: Array<{ - txid: string, - nout: number, - }>, playingUri: ?PlayingUri, parentCommentId?: string, isMarkdownPost?: boolean, @@ -42,21 +38,6 @@ class ClaimLink extends React.Component { this.resolve(this.props); } - isClaimBlackListed() { - const { claim, blackListedOutpoints } = this.props; - const signingChannel = claim && claim.signing_channel; - if (claim && blackListedOutpoints) { - let blackListed = false; - - blackListed = blackListedOutpoints.some( - (outpoint) => - (signingChannel && outpoint.txid === signingChannel.txid && outpoint.nout === signingChannel.nout) || - (outpoint.txid === claim.txid && outpoint.nout === claim.nout) - ); - return blackListed; - } - } - resolve = (props: Props) => { const { isResolvingUri, doResolveUri, claim, uri } = props; @@ -78,14 +59,13 @@ class ClaimLink extends React.Component { allowPreview, } = this.props; const isUnresolved = (!isResolvingUri && !claim) || !claim; - const isBlacklisted = this.isClaimBlackListed(); const isPlayingInline = playingUri && playingUri.uri === uri && ((playingUri.source === 'comment' && parentCommentId === playingUri.commentId) || playingUri.source === 'markdown'); - if (isBlacklisted || isUnresolved) { + if (isUnresolved) { return {children}; }