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

Merge pull request #2460 from lbryio/issue2431-j-paidcontent

Browse source 
checks for downloaded paid content before disabling
This commit is contained in:
Sean Yesmunt 2019-05-02 16:57:09 -05:00 committed by GitHub
commit f00c7430c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ui/component/fileViewer/view.jsx
View file

@ -154,7 +154,7 @@ class FileViewer extends React.PureComponent<Props> {
playContent() { playContent() {
const { play, uri, fileInfo, isDownloading, isLoading, insufficientCredits } = this.props; const { play, uri, fileInfo, isDownloading, isLoading, insufficientCredits } = this.props;
if (insufficientCredits) { if (!fileInfo && insufficientCredits) {
return; return;
} }
@ -255,7 +255,7 @@ class FileViewer extends React.PureComponent<Props> {
const layoverClass = classnames('content__cover', { const layoverClass = classnames('content__cover', {
'card__media--nsfw': shouldObscureNsfw, 'card__media--nsfw': shouldObscureNsfw,
'card__media--disabled': insufficientCredits, 'card__media--disabled': !fileInfo && insufficientCredits,
}); });
const layoverStyle = const layoverStyle =

66
src/ui/page/file/view.jsx
View file

@ -2,7 +2,7 @@
import * as MODALS from 'constants/modal_types'; import * as MODALS from 'constants/modal_types';
import * as icons from 'constants/icons'; import * as icons from 'constants/icons';
import * as React from 'react'; import * as React from 'react';
import {buildURI, normalizeURI} from 'lbry-redux'; import { buildURI, normalizeURI } from 'lbry-redux';
import FileViewer from 'component/fileViewer'; import FileViewer from 'component/fileViewer';
import Thumbnail from 'component/common/thumbnail'; import Thumbnail from 'component/common/thumbnail';
import FilePrice from 'component/filePrice'; import FilePrice from 'component/filePrice';
@ -28,7 +28,7 @@ type Props = {
rewardedContentClaimIds: Array<string>, rewardedContentClaimIds: Array<string>,
obscureNsfw: boolean, obscureNsfw: boolean,
claimIsMine: boolean, claimIsMine: boolean,
costInfo: ?{cost: number}, costInfo: ?{ cost: number },
fetchFileInfo: string => void, fetchFileInfo: string => void,
fetchCostInfo: string => void, fetchCostInfo: string => void,
setViewed: string => void, setViewed: string => void,
@ -37,7 +37,7 @@ type Props = {
channelUri: string, channelUri: string,
viewCount: number, viewCount: number,
prepareEdit: ({}, string) => void, prepareEdit: ({}, string) => void,
openModal: (id: string, {uri: string}) => void, openModal: (id: string, { uri: string }) => void,
markSubscriptionRead: (string, string) => void, markSubscriptionRead: (string, string) => void,
fetchViewCount: string => void, fetchViewCount: string => void,
balance: number, balance: number,
@ -72,11 +72,11 @@ class FilePage extends React.Component<Props> {
claim, claim,
} = this.props; } = this.props;
if(isSubscribed) { if (isSubscribed) {
this.removeFromSubscriptionNotifications(); this.removeFromSubscriptionNotifications();
} }
if(claimIsMine) { if (claimIsMine) {
fetchViewCount(claim.claim_id); fetchViewCount(claim.claim_id);
} }
@ -91,26 +91,26 @@ class FilePage extends React.Component<Props> {
} }
componentWillReceiveProps(nextProps: Props) { componentWillReceiveProps(nextProps: Props) {
const {fetchFileInfo, uri, setViewed} = this.props; const { fetchFileInfo, uri, setViewed } = this.props;
// @if TARGET='app' // @if TARGET='app'
if(nextProps.fileInfo === undefined) { if (nextProps.fileInfo === undefined) {
fetchFileInfo(uri); fetchFileInfo(uri);
} }
// @endif // @endif
if(uri !== nextProps.uri) { if (uri !== nextProps.uri) {
setViewed(nextProps.uri); setViewed(nextProps.uri);
} }
} }
componentDidUpdate(prevProps: Props) { componentDidUpdate(prevProps: Props) {
const {isSubscribed, claim, uri, fetchViewCount, claimIsMine} = this.props; const { isSubscribed, claim, uri, fetchViewCount, claimIsMine } = this.props;
if(!prevProps.isSubscribed && isSubscribed) { if (!prevProps.isSubscribed && isSubscribed) {
this.removeFromSubscriptionNotifications(); this.removeFromSubscriptionNotifications();
} }
if(prevProps.uri !== uri && claimIsMine) { if (prevProps.uri !== uri && claimIsMine) {
fetchViewCount(claim.claim_id); fetchViewCount(claim.claim_id);
} }
} }
@ -118,7 +118,7 @@ class FilePage extends React.Component<Props> {
removeFromSubscriptionNotifications() { removeFromSubscriptionNotifications() {
// Always try to remove // Always try to remove
// If it doesn't exist, nothing will happen // If it doesn't exist, nothing will happen
const {markSubscriptionRead, uri, channelUri} = this.props; const { markSubscriptionRead, uri, channelUri } = this.props;
markSubscriptionRead(channelUri, uri); markSubscriptionRead(channelUri, uri);
} }
@ -144,8 +144,8 @@ class FilePage extends React.Component<Props> {
} = this.props; } = this.props;
// File info // File info
const {height, channel_name: channelName} = claim; const { height, channel_name: channelName } = claim;
const {PLAYABLE_MEDIA_TYPES, PREVIEW_MEDIA_TYPES} = FilePage; const { PLAYABLE_MEDIA_TYPES, PREVIEW_MEDIA_TYPES } = FilePage;
const isRewardContent = (rewardedContentClaimIds || []).includes(claim.claim_id); const isRewardContent = (rewardedContentClaimIds || []).includes(claim.claim_id);
const shouldObscureThumbnail = obscureNsfw && nsfw; const shouldObscureThumbnail = obscureNsfw && nsfw;
const fileName = fileInfo ? fileInfo.file_name : null; const fileName = fileInfo ? fileInfo.file_name : null;
@ -162,12 +162,12 @@ class FilePage extends React.Component<Props> {
// This is what the user is used to seeing, they don't care about the claim id // This is what the user is used to seeing, they don't care about the claim id
// We will select the claim id before they publish // We will select the claim id before they publish
let editUri; let editUri;
if(claimIsMine) { if (claimIsMine) {
const uriObject: {contentName: string, claimId: string, channelName?: string} = { const uriObject: { contentName: string, claimId: string, channelName?: string } = {
contentName: claim.name, contentName: claim.name,
claimId: claim.claim_id, claimId: claim.claim_id,
}; };
if(channelName) { if (channelName) {
uriObject.channelName = channelName; uriObject.channelName = channelName;
} }
@ -180,7 +180,7 @@ class FilePage extends React.Component<Props> {
<Page notContained className="main--file-page"> <Page notContained className="main--file-page">
<div className="grid-area--content"> <div className="grid-area--content">
<h1 className="media__uri">{uri}</h1> <h1 className="media__uri">{uri}</h1>
{insufficientCredits && ( {!fileInfo && insufficientCredits && (
<div className="media__insufficient-credits help--warning"> <div className="media__insufficient-credits help--warning">
{__( {__(
'The publisher has chosen to charge LBC to view this content. Your balance is currently to low to view it.' 'The publisher has chosen to charge LBC to view this content. Your balance is currently to low to view it.'
@ -202,16 +202,16 @@ class FilePage extends React.Component<Props> {
(thumbnail ? ( (thumbnail ? (
<Thumbnail shouldObscure={shouldObscureThumbnail} src={thumbnail} /> <Thumbnail shouldObscure={shouldObscureThumbnail} src={thumbnail} />
) : ( ) : (
<div <div
className={classnames('content__empty', { className={classnames('content__empty', {
'content__empty--nsfw': shouldObscureThumbnail, 'content__empty--nsfw': shouldObscureThumbnail,
})} })}
> >
<div className="card__media-text"> <div className="card__media-text">
{__("Sorry, looks like we can't preview this file.")} {__("Sorry, looks like we can't preview this file.")}
</div>
</div> </div>
))} </div>
))}
</div> </div>
<div className="grid-area--info media__content media__content--large"> <div className="grid-area--info media__content media__content--large">
@ -223,10 +223,10 @@ class FilePage extends React.Component<Props> {
size={20} size={20}
iconColor="red" iconColor="red"
icon={icons.FEATURED} icon={icons.FEATURED}
// Figure out how to get the tooltip to overlap the navbar on the file page and I will love you // Figure out how to get the tooltip to overlap the navbar on the file page and I will love you
// https://stackoverflow.com/questions/6421966/css-overflow-x-visible-and-overflow-y-hidden-causing-scrollbar-issue // https://stackoverflow.com/questions/6421966/css-overflow-x-visible-and-overflow-y-hidden-causing-scrollbar-issue
// https://spee.ch/4/overflow-issue // https://spee.ch/4/overflow-issue
// tooltip="bottom" // tooltip="bottom"
/> />
)} )}
{nsfw && <div className="badge badge--nsfw">MATURE</div>} {nsfw && <div className="badge badge--nsfw">MATURE</div>}
@ -269,7 +269,7 @@ class FilePage extends React.Component<Props> {
button="alt" button="alt"
icon={icons.TIP} icon={icons.TIP}
label={__('Send a tip')} label={__('Send a tip')}
onClick={() => openModal(MODALS.SEND_TIP, {uri})} onClick={() => openModal(MODALS.SEND_TIP, { uri })}
/> />
</React.Fragment> </React.Fragment>
)} )}
@ -277,7 +277,7 @@ class FilePage extends React.Component<Props> {
button="alt" button="alt"
icon={icons.SHARE} icon={icons.SHARE}
label={__('Share')} label={__('Share')}
onClick={() => openModal(MODALS.SOCIAL_SHARE, {uri, speechShareable})} onClick={() => openModal(MODALS.SOCIAL_SHARE, { uri, speechShareable })}
/> />
</div> </div>