From fb839b92efb685620fb2d59aad7f5974c186879e Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Fri, 9 Apr 2021 01:59:22 +0800 Subject: [PATCH] Only apply Staked Levels to Comments (allow it in Posts) Blocking videos and images was too limiting, plus the system was intended to block spammy comments in the first place. --- ui/component/channelAbout/index.js | 3 +-- ui/component/channelAbout/view.jsx | 5 ++--- ui/component/fileRender/index.js | 4 ---- ui/component/fileRender/view.jsx | 7 ++----- ui/component/viewers/documentViewer.jsx | 5 ++--- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/ui/component/channelAbout/index.js b/ui/component/channelAbout/index.js index 41e0e1221..40678c8c7 100644 --- a/ui/component/channelAbout/index.js +++ b/ui/component/channelAbout/index.js @@ -1,10 +1,9 @@ import { connect } from 'react-redux'; -import { makeSelectMetadataItemForUri, makeSelectClaimForUri, makeSelectStakedLevelForChannelUri } from 'lbry-redux'; +import { makeSelectMetadataItemForUri, makeSelectClaimForUri } from 'lbry-redux'; import ChannelAbout from './view'; const select = (state, props) => ({ claim: makeSelectClaimForUri(props.uri)(state), - stakedLevel: makeSelectStakedLevelForChannelUri(props.uri)(state), description: makeSelectMetadataItemForUri(props.uri, 'description')(state), website: makeSelectMetadataItemForUri(props.uri, 'website_url')(state), email: makeSelectMetadataItemForUri(props.uri, 'email')(state), diff --git a/ui/component/channelAbout/view.jsx b/ui/component/channelAbout/view.jsx index 6a2bf8773..711dd49ef 100644 --- a/ui/component/channelAbout/view.jsx +++ b/ui/component/channelAbout/view.jsx @@ -17,7 +17,6 @@ type Props = { email: ?string, website: ?string, languages: Array, - stakedLevel?: number, }; const formatEmail = (email: string) => { @@ -30,7 +29,7 @@ const formatEmail = (email: string) => { }; function ChannelAbout(props: Props) { - const { claim, uri, description, email, website, languages, stakedLevel } = props; + const { claim, uri, description, email, website, languages } = props; const claimId = claim && claim.claim_id; return ( @@ -41,7 +40,7 @@ function ChannelAbout(props: Props) { <>
- +
)} diff --git a/ui/component/fileRender/index.js b/ui/component/fileRender/index.js index 9e2af8b43..b09fd76d7 100644 --- a/ui/component/fileRender/index.js +++ b/ui/component/fileRender/index.js @@ -6,8 +6,6 @@ import { makeSelectDownloadPathForUri, makeSelectStreamingUrlForUri, SETTINGS, - makeSelectStakedLevelForChannelUri, - makeSelectChannelForClaimUri, } from 'lbry-redux'; import { makeSelectClientSetting } from 'redux/selectors/settings'; import { makeSelectFileRenderModeForUri, makeSelectFileExtensionForUri } from 'redux/selectors/content'; @@ -15,11 +13,9 @@ import FileRender from './view'; const select = (state, props) => { const autoplay = props.embedded ? false : makeSelectClientSetting(SETTINGS.AUTOPLAY)(state); - const channelUri = makeSelectChannelForClaimUri(props.uri)(state); return { currentTheme: makeSelectClientSetting(SETTINGS.THEME)(state), claim: makeSelectClaimForUri(props.uri)(state), - stakedLevel: makeSelectStakedLevelForChannelUri(channelUri)(state), thumbnail: makeSelectThumbnailForUri(props.uri)(state), contentType: makeSelectContentTypeForUri(props.uri)(state), downloadPath: makeSelectDownloadPathForUri(props.uri)(state), diff --git a/ui/component/fileRender/view.jsx b/ui/component/fileRender/view.jsx index f155eb9a7..55cc914c8 100644 --- a/ui/component/fileRender/view.jsx +++ b/ui/component/fileRender/view.jsx @@ -35,7 +35,6 @@ type Props = { thumbnail: string, desktopPlayStartTime?: number, className?: string, - stakedLevel?: number, }; class FileRender extends React.PureComponent { @@ -79,7 +78,6 @@ class FileRender extends React.PureComponent { uri, renderMode, desktopPlayStartTime, - stakedLevel, } = this.props; const source = streamingUrl; @@ -104,7 +102,7 @@ class FileRender extends React.PureComponent { fs.createReadStream(downloadPath, options), + file: (options) => fs.createReadStream(downloadPath, options), // @endif stream: source, fileExtension, @@ -112,7 +110,6 @@ class FileRender extends React.PureComponent { }} renderMode={renderMode} theme={currentTheme} - stakedLevel={stakedLevel} /> ); case RENDER_MODES.DOCX: @@ -134,7 +131,7 @@ class FileRender extends React.PureComponent { fs.createReadStream(downloadPath, options), + file: (options) => fs.createReadStream(downloadPath, options), // @endif stream: source, }} diff --git a/ui/component/viewers/documentViewer.jsx b/ui/component/viewers/documentViewer.jsx index d86ef0aee..8bd17f153 100644 --- a/ui/component/viewers/documentViewer.jsx +++ b/ui/component/viewers/documentViewer.jsx @@ -15,7 +15,6 @@ type Props = { stream: string, contentType: string, }, - stakedLevel?: number, }; type State = { @@ -76,11 +75,11 @@ class DocumentViewer extends React.PureComponent { renderDocument() { const { content } = this.state; - const { source, theme, renderMode, stakedLevel } = this.props; + const { source, theme, renderMode } = this.props; const { contentType } = source; return renderMode === RENDER_MODES.MARKDOWN ? ( - + ) : ( );