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

Show smaller NSFW tag if it's my content #1585

Merged
kkorte merged 1 commit from master into master 2018-06-13 06:16:13 +02:00
Conversation 1 Commits 1 Files changed 2 +14 -3
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/renderer/component/fileCard/index.js
View file

@ -5,6 +5,7 @@ import {
makeSelectMetadataForUri,
makeSelectFileInfoForUri,
makeSelectIsUriResolving,
makeSelectClaimIsMine,
} from 'lbry-redux';
import { doNavigate } from 'redux/actions/navigation';
import { selectRewardContentClaimIds } from 'redux/selectors/content';
@ -27,6 +28,7 @@ const select = (state, props) => {
return {
obscureNsfw: !selectShowNsfw(state),
claimIsMine: makeSelectClaimIsMine(props.uri)(state),
rewardedContentClaimIds: selectRewardContentClaimIds(state, props),
...fileCardInfo,
pending: !!pendingPublish,
@ -38,4 +40,7 @@ const perform = dispatch => ({
resolveUri: uri => dispatch(doResolveUri(uri)),
});
export default connect(select, perform)(FileCard);
export default connect(
select,
perform
)(FileCard);

10
src/renderer/component/fileCard/view.jsx
View file

@ -16,12 +16,17 @@ type Props = {
uri: string,
claim: ?{ claim_id: string },
fileInfo: ?{},
metadata: ?{ nsfw: boolean, thumbnail: ?string },
metadata: ?{ nsfw: boolean, title: string, thumbnail: ?string },
navigate: (string, ?{}) => void,
rewardedContentClaimIds: Array<string>,
obscureNsfw: boolean,
claimIsMine: boolean,
showPrice: boolean,
pending?: boolean,
/* eslint-disable react/no-unused-prop-types */
resolveUri: string => void,
isResolvingUri: boolean,
/* eslint-enable react/no-unused-prop-types */
};
class FileCard extends React.PureComponent<Props> {
@ -53,13 +58,14 @@ class FileCard extends React.PureComponent<Props> {
navigate,
rewardedContentClaimIds,
obscureNsfw,
claimIsMine,
showPrice,
pending,
} = this.props;
const uri = !pending ? normalizeURI(this.props.uri) : this.props.uri;
const title = metadata && metadata.title ? metadata.title : uri;
const thumbnail = metadata && metadata.thumbnail ? metadata.thumbnail : null;
const shouldObscureNsfw = obscureNsfw && metadata && metadata.nsfw;
const shouldObscureNsfw = obscureNsfw && metadata && metadata.nsfw && !claimIsMine;
const isRewardContent = claim && rewardedContentClaimIds.includes(claim.claim_id);
const handleContextMenu = event => {
event.preventDefault();