From 961f1cf2fd58e1670a7373f5b1332b7e44a05196 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt
Date: Wed, 13 Jun 2018 16:47:22 -0400
Subject: [PATCH] add no thumbnail fallback and make sure .zips aren't playable
---
src/renderer/modal/modalUpgrade/index.js | 12 +++++++++---
src/renderer/modal/modalUpgrade/view.jsx | 6 +++++-
src/renderer/page/file/view.jsx | 8 ++------
src/renderer/redux/reducers/app.js | 1 -
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/renderer/modal/modalUpgrade/index.js b/src/renderer/modal/modalUpgrade/index.js
index abec51a72..031927b96 100644
--- a/src/renderer/modal/modalUpgrade/index.js
+++ b/src/renderer/modal/modalUpgrade/index.js
@@ -1,13 +1,19 @@
import React from 'react';
import { connect } from 'react-redux';
-import { doDownloadUpgrade, doSkipUpgrade } from 'redux/actions/app';
+import { doDownloadUpgrade, doSkipUpgrade, doHideNotification } from 'redux/actions/app';
import ModalUpgrade from './view';
const select = state => ({});
const perform = dispatch => ({
downloadUpgrade: () => dispatch(doDownloadUpgrade()),
- skipUpgrade: () => dispatch(doSkipUpgrade()),
+ skipUpgrade: () => {
+ dispatch(doHideNotification());
+ dispatch(doSkipUpgrade());
+ },
});
-export default connect(select, perform)(ModalUpgrade);
+export default connect(
+ select,
+ perform
+)(ModalUpgrade);
diff --git a/src/renderer/modal/modalUpgrade/view.jsx b/src/renderer/modal/modalUpgrade/view.jsx
index ced5fd808..41425b1e4 100644
--- a/src/renderer/modal/modalUpgrade/view.jsx
+++ b/src/renderer/modal/modalUpgrade/view.jsx
@@ -24,7 +24,11 @@ class ModalUpgrade extends React.PureComponent {
{__('Want to know what has changed?')} See the{' '}
- .
+ .
);
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index 4f07bf8ad..ff251b045 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -116,7 +116,7 @@ class FilePage extends React.Component {
const { height, channel_name: channelName, value } = claim;
const mediaType = Lbry.getMediaType(contentType);
const isPlayable =
- Object.values(player.mime).indexOf(contentType) !== -1 || mediaType === 'audio';
+ Object.values(player.mime).indexOf(mediaType) !== -1 || mediaType === 'audio';
const channelClaimId =
value && value.publisherSignature && value.publisherSignature.certificateId;
let subscriptionUri;
@@ -160,11 +160,7 @@ class FilePage extends React.Component {
'content__empty--nsfw': shouldObscureThumbnail,
})}
>
-
- {__('This content is not playable.')}
-
- {__('To view this, click the download link below.')}
-
+ {__('This content is not playable.')}
))}
diff --git a/src/renderer/redux/reducers/app.js b/src/renderer/redux/reducers/app.js
index 3417d55d2..c66ae24b3 100644
--- a/src/renderer/redux/reducers/app.js
+++ b/src/renderer/redux/reducers/app.js
@@ -114,7 +114,6 @@ reducers[ACTIONS.SKIP_UPGRADE] = state => {
return Object.assign({}, state, {
isUpgradeSkipped: true,
- modal: null,
});
};