04f88f7f10
fix replay select styling make meme a link Fix audio references get newest livestream claim in livestreamLink pin crackermilk fix livestream banner placement fix live page fix rebase fix rebase fix error nag fix darkmode blockquote style break word on livestream comment text fix dark mode snack fix live badge fix lint small fixes - word wrap, live badge wip Fix invisible snack in Odysee Light Theme Revert "wip" This reverts commitd17e477fe0
. Revert "small fixes - word wrap, live badge" This reverts commit0e431d4038
. fix blank pinned destiny fix badges and homepage again only get livestreams live for less than a day pinned hammy and olivia multi pin pin destiny updated pinned videos update tagline Update view.jsx pins updated destiny's video updated pinned videos removed destiny, added lie likes music pinned destiny and mason's woodshop removed hammy and olivia unpinned mason's woodshop removed pins added hammy and olivia pinned sam seder unpinned destiny and hammy and olivia Fix merge on ChannelThumbnails - sam seder, + hammy & olivia and passion for food update tagline (#6086) removed everyone, added kona and suba Theme color fixes (odysee) (#6089) * Cherry-pick master's 'base-theme.scss' * Non-functional cleanup (remove dups, re-order, etc.) * Dark: update positive Toast to --color-primary as well. This follows the intention of the refactoring, which I guess was (1) reduce the number of color names (2) reduce the number of customizations needed. The only issue I have with this is that the current Odysee primary color is pink, which can be intepreted as an error. The original (pre-refactoring color was green). For now, I follow the refactoring path. We can tweak this later. * Fix text color inside '--color-card-background-highlighted' Light: use base-theme (it was the same value anyway). Dark: use bright text. * Dark: add some contrast between the components The color for the background, header, card, placeholder, etc. is almost identical -- it looks like there are all in the same component. The almost-invisible border doesn't help. One would have to crank up the monitor's contrast setting to see separation of components. Brighten up the components a bit, somewhat following the same scale as lbry.tv's dark theme. Overall, I still think it's too dark. The Card's background color can still be brightened up further for better contrast, but I try not to make too drastic of a change for now. The original lbry.tv's gray theme is the most pleasant theme I've seen so far, but this is all subjective. changed pins removed kona and suba added destiny changed pins removed destiny pinned sgtducky changed pins removed sgtducky added hammy and olivia added chrissie mayr added the bite shot changed pins removed the bite shot added heads of tech changed pins removed hammy and olivia removed chrissie mayr changed pins removed heads of tech added crackermilk changed pins removed crackermilk added some ordinary gamer added passion for food changed pins removed some ordinary gamers removed passion for food added emmy hucker changed pins added game knights Update view.jsx Force rebuild changed pins removed emmy hucker changed pins removed game knights added crackermilk changed pins removed crackermilk added some ordinary gamer changed pins removed some ordinary gamers added passion for food added green renaissance changed pins removed passion for food removed green renaissance added expand love changed pins removed expand love added dr nora change tagline (#6122) there's so much room for activities comment out music changed pins removed dr nora added kona and suba changed pins removed kona and suba added destiny changed pins removed destiny added crackermilk changed pins removed crackermilk added someordinarygamers change tagline Drake, where's the door hole? changed pins unpinned someordinarygamers pinned kona and suba Add message for mature content changed pin changed pins removed creative model changed pins added bcpov added krish mohan added cigarvixen changed pins removed krish mohan added adrian logan bump fix footer change tagline just like the simulations changed pins removed: bcpov cigarvixen adrian logan added: someordinarygamers quick fix for reposts oops fix channel tabs changed pin removed someordinarygamers added kona and suba changed pins removed kona and suba added dirtyworkz added crackermilk
203 lines
6.9 KiB
JavaScript
203 lines
6.9 KiB
JavaScript
// @flow
|
|
import { DOMAIN } from 'config';
|
|
import * as PAGES from 'constants/pages';
|
|
import React, { useEffect } from 'react';
|
|
import { Redirect, useHistory } from 'react-router-dom';
|
|
import Spinner from 'component/spinner';
|
|
import ChannelPage from 'page/channel';
|
|
import FilePage from 'page/file';
|
|
import LivestreamPage from 'page/livestream';
|
|
import Page from 'component/page';
|
|
import Button from 'component/button';
|
|
import Card from 'component/common/card';
|
|
import AbandonedChannelPreview from 'component/abandonedChannelPreview';
|
|
import Yrbl from 'component/yrbl';
|
|
import { formatLbryUrlForWeb } from 'util/url';
|
|
import { parseURI, COLLECTIONS_CONSTS } from 'lbry-redux';
|
|
|
|
type Props = {
|
|
isResolvingUri: boolean,
|
|
resolveUri: (string) => void,
|
|
isSubscribed: boolean,
|
|
uri: string,
|
|
claim: StreamClaim,
|
|
location: UrlLocation,
|
|
blackListedOutpoints: Array<{
|
|
txid: string,
|
|
nout: number,
|
|
}>,
|
|
title: string,
|
|
claimIsMine: boolean,
|
|
claimIsPending: boolean,
|
|
isLivestream: boolean,
|
|
claimIsMine: Boolean,
|
|
beginPublish: (string) => void,
|
|
collectionId: string,
|
|
collection: Collection,
|
|
collectionUrls: Array<string>,
|
|
isResolvingCollection: boolean,
|
|
fetchCollectionItems: (string) => void,
|
|
};
|
|
|
|
function ShowPage(props: Props) {
|
|
const {
|
|
isResolvingUri,
|
|
resolveUri,
|
|
uri,
|
|
claim,
|
|
blackListedOutpoints,
|
|
location,
|
|
claimIsMine,
|
|
isSubscribed,
|
|
claimIsPending,
|
|
isLivestream,
|
|
beginPublish,
|
|
fetchCollectionItems,
|
|
collectionId,
|
|
collection,
|
|
collectionUrls,
|
|
isResolvingCollection,
|
|
} = props;
|
|
|
|
const { search } = location;
|
|
|
|
const signingChannel = claim && claim.signing_channel;
|
|
const canonicalUrl = claim && claim.canonical_url;
|
|
const claimExists = claim !== null && claim !== undefined;
|
|
const haventFetchedYet = claim === undefined;
|
|
const isMine = claim && claim.is_my_output;
|
|
const { contentName, isChannel } = parseURI(uri);
|
|
const { push } = useHistory();
|
|
const isCollection = claim && claim.value_type === 'collection';
|
|
const resolvedCollection = collection && collection.id; // not null
|
|
|
|
// changed this from 'isCollection' to resolve strangers' collections.
|
|
React.useEffect(() => {
|
|
if (collectionId && !resolvedCollection) {
|
|
fetchCollectionItems(collectionId);
|
|
}
|
|
}, [isCollection, resolvedCollection, collectionId, fetchCollectionItems]);
|
|
|
|
useEffect(() => {
|
|
// @if TARGET='web'
|
|
if (canonicalUrl) {
|
|
const canonicalUrlPath = '/' + canonicalUrl.replace(/^lbry:\/\//, '').replace(/#/g, ':');
|
|
// Only redirect if we are in lbry.tv land
|
|
// replaceState will fail if on a different domain (like webcache.googleusercontent.com)
|
|
if (canonicalUrlPath !== window.location.pathname && DOMAIN === window.location.hostname) {
|
|
const urlParams = new URLSearchParams(search);
|
|
if (urlParams.get(COLLECTIONS_CONSTS.COLLECTION_ID)) {
|
|
const listId = urlParams.get(COLLECTIONS_CONSTS.COLLECTION_ID) || '';
|
|
urlParams.set(COLLECTIONS_CONSTS.COLLECTION_ID, listId);
|
|
}
|
|
history.replaceState(history.state, '', `${canonicalUrlPath}?${urlParams.toString()}`);
|
|
}
|
|
}
|
|
// @endif
|
|
|
|
if (
|
|
(resolveUri && !isResolvingUri && uri && haventFetchedYet) ||
|
|
(claimExists && !claimIsPending && (!canonicalUrl || isMine === undefined))
|
|
) {
|
|
resolveUri(uri);
|
|
}
|
|
}, [resolveUri, isResolvingUri, canonicalUrl, uri, claimExists, haventFetchedYet, history, isMine, claimIsPending]);
|
|
|
|
// Don't navigate directly to repost urls
|
|
// Always redirect to the actual content
|
|
// Also need to add repost_url to the Claim type for flow
|
|
// $FlowFixMe
|
|
if (claim && claim.repost_url === uri) {
|
|
const newUrl = formatLbryUrlForWeb(claim.canonical_url);
|
|
return <Redirect to={newUrl} />;
|
|
}
|
|
let urlForCollectionZero;
|
|
if (claim && claim.value_type === 'collection' && collectionUrls && collectionUrls.length) {
|
|
urlForCollectionZero = collectionUrls && collectionUrls[0];
|
|
const claimId = claim.claim_id;
|
|
const urlParams = new URLSearchParams(search);
|
|
urlParams.set(COLLECTIONS_CONSTS.COLLECTION_ID, claimId);
|
|
const newUrl = formatLbryUrlForWeb(`${urlForCollectionZero}?${urlParams.toString()}`);
|
|
return <Redirect to={newUrl} />;
|
|
}
|
|
|
|
let innerContent = '';
|
|
if (!claim || (claim && !claim.name)) {
|
|
innerContent = (
|
|
<Page>
|
|
{(claim === undefined ||
|
|
isResolvingUri ||
|
|
isResolvingCollection || // added for collection
|
|
(claim && claim.value_type === 'collection' && !urlForCollectionZero)) && ( // added for collection - make sure we accept urls = []
|
|
<div className="main--empty">
|
|
<Spinner delayed />
|
|
</div>
|
|
)}
|
|
{!isResolvingUri && !isSubscribed && (
|
|
<div className="main--empty">
|
|
<Yrbl
|
|
title={isChannel ? __('Channel Not Found') : __('No Content Found')}
|
|
subtitle={
|
|
isChannel ? (
|
|
__(`Probably because you didn't make it.`)
|
|
) : (
|
|
<div className="section__actions">
|
|
<Button
|
|
button="primary"
|
|
label={__('Publish Something')}
|
|
onClick={() => beginPublish(contentName)}
|
|
/>
|
|
<Button
|
|
button="secondary"
|
|
onClick={() => push(`/$/${PAGES.REPOST_NEW}?to=${contentName}`)}
|
|
label={__('Repost Something')}
|
|
/>
|
|
</div>
|
|
)
|
|
}
|
|
/>
|
|
</div>
|
|
)}
|
|
{!isResolvingUri && isSubscribed && claim === null && <AbandonedChannelPreview uri={uri} type={'large'} />}
|
|
</Page>
|
|
);
|
|
} else if (claim.name.length && claim.name[0] === '@') {
|
|
innerContent = <ChannelPage uri={uri} location={location} />;
|
|
} else if (claim) {
|
|
let isClaimBlackListed = false;
|
|
|
|
isClaimBlackListed =
|
|
blackListedOutpoints &&
|
|
blackListedOutpoints.some(
|
|
(outpoint) =>
|
|
(signingChannel && outpoint.txid === signingChannel.txid && outpoint.nout === signingChannel.nout) ||
|
|
(outpoint.txid === claim.txid && outpoint.nout === claim.nout)
|
|
);
|
|
|
|
if (isClaimBlackListed && !claimIsMine) {
|
|
innerContent = (
|
|
<Page>
|
|
<Card
|
|
title={uri}
|
|
subtitle={__(
|
|
'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications.'
|
|
)}
|
|
actions={
|
|
<div className="section__actions">
|
|
<Button button="link" href="https://lbry.com/faq/dmca" label={__('Read More')} />
|
|
</div>
|
|
}
|
|
/>
|
|
</Page>
|
|
);
|
|
} else if (isLivestream) {
|
|
innerContent = <LivestreamPage uri={uri} />;
|
|
} else {
|
|
innerContent = <FilePage uri={uri} location={location} />;
|
|
}
|
|
}
|
|
|
|
return innerContent;
|
|
}
|
|
|
|
export default ShowPage;
|