From 51ec4aca6f045400dfe585e5e49601154eca2e65 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Tue, 3 Dec 2019 18:11:47 -0500 Subject: [PATCH] dirty, unacceptable image rendering --- ui/component/claimPreview/index.js | 2 ++ ui/component/claimPreview/view.jsx | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/ui/component/claimPreview/index.js b/ui/component/claimPreview/index.js index c9dfd3965..c6ff96318 100644 --- a/ui/component/claimPreview/index.js +++ b/ui/component/claimPreview/index.js @@ -13,6 +13,7 @@ import { selectChannelIsBlocked, doClearPublish, doPrepareEdit, + makeSelectMediaTypeForUri, } from 'lbry-redux'; import { selectBlackListedOutpoints, selectFilteredOutpoints } from 'lbryinc'; import { selectShowMatureContent } from 'redux/selectors/settings'; @@ -30,6 +31,7 @@ const select = (state, props) => ({ isResolvingUri: props.uri && makeSelectIsUriResolving(props.uri)(state), thumbnail: props.uri && makeSelectThumbnailForUri(props.uri)(state), title: props.uri && makeSelectTitleForUri(props.uri)(state), + mediaType: makeSelectMediaTypeForUri(props.uri)(state), nsfw: props.uri && makeSelectClaimIsNsfw(props.uri)(state), blackListedOutpoints: selectBlackListedOutpoints(state), filteredOutpoints: selectFilteredOutpoints(state), diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx index 167e12658..805d224b4 100644 --- a/ui/component/claimPreview/view.jsx +++ b/ui/component/claimPreview/view.jsx @@ -17,6 +17,7 @@ import SubscribeButton from 'component/subscribeButton'; import ChannelThumbnail from 'component/channelThumbnail'; import BlockButton from 'component/blockButton'; import Button from 'component/button'; +import { generateStreamUrl } from '../../util/lbrytv'; type Props = { uri: string, @@ -29,6 +30,7 @@ type Props = { isResolvingUri: boolean, history: { push: string => void }, thumbnail: string, + mediaType: string, title: string, nsfw: boolean, placeholder: string, @@ -62,6 +64,7 @@ const ClaimPreview = forwardRef((props: Props, ref: any) => { isResolvingUri, thumbnail, title, + mediaType, nsfw, resolveUri, claim, @@ -195,13 +198,18 @@ const ClaimPreview = forwardRef((props: Props, ref: any) => { 'claim-preview--pending': pending, })} > +<<<<<<< HEAD {isChannel && claim ? ( +======= + {isChannel ? ( +>>>>>>> dirty, unacceptable image rendering ) : ( )} +<<<<<<< HEAD
@@ -209,6 +217,12 @@ const ClaimPreview = forwardRef((props: Props, ref: any) => { {claim ? : {__('Nothing here')}}
{!isChannel && claim && } +======= +
+
+
+ {claim ? : {__('Nothing here')}} +>>>>>>> dirty, unacceptable image rendering