Revert "bring in ClaimListDiscover changes from odysee"
This reverts commit 56cd1ddfa7
.
This commit is contained in:
parent
56cd1ddfa7
commit
892fb6f687
3 changed files with 59 additions and 71 deletions
|
@ -136,7 +136,7 @@
|
||||||
"imagesloaded": "^4.1.4",
|
"imagesloaded": "^4.1.4",
|
||||||
"json-loader": "^0.5.4",
|
"json-loader": "^0.5.4",
|
||||||
"lbry-format": "https://github.com/lbryio/lbry-format.git",
|
"lbry-format": "https://github.com/lbryio/lbry-format.git",
|
||||||
"lbry-redux": "lbryio/lbry-redux#ba5d6b84bec6bdb2f0a1a6b23e695212c65f650e",
|
"lbry-redux": "lbryio/lbry-redux#04015155796bc588bdf5b10762cfc874e6a1b00c",
|
||||||
"lbryinc": "lbryio/lbryinc#db0663fcc4a64cb082b6edc5798fafa67eb4300f",
|
"lbryinc": "lbryio/lbryinc#db0663fcc4a64cb082b6edc5798fafa67eb4300f",
|
||||||
"lint-staged": "^7.0.2",
|
"lint-staged": "^7.0.2",
|
||||||
"localforage": "^1.7.1",
|
"localforage": "^1.7.1",
|
||||||
|
@ -191,7 +191,6 @@
|
||||||
"three": "^0.93.0",
|
"three": "^0.93.0",
|
||||||
"three-full": "^17.1.0",
|
"three-full": "^17.1.0",
|
||||||
"tiny-relative-date": "^1.3.0",
|
"tiny-relative-date": "^1.3.0",
|
||||||
"uuid": "^8.3.0",
|
|
||||||
"tree-kill": "^1.1.0",
|
"tree-kill": "^1.1.0",
|
||||||
"unist-util-visit": "^1.4.1",
|
"unist-util-visit": "^1.4.1",
|
||||||
"video.js": "7.8.4",
|
"video.js": "7.8.4",
|
||||||
|
@ -215,7 +214,7 @@
|
||||||
"yarn": "^1.3"
|
"yarn": "^1.3"
|
||||||
},
|
},
|
||||||
"lbrySettings": {
|
"lbrySettings": {
|
||||||
"lbrynetDaemonVersion": "0.82.0",
|
"lbrynetDaemonVersion": "0.81.0",
|
||||||
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
|
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
|
||||||
"lbrynetDaemonDir": "static/daemon",
|
"lbrynetDaemonDir": "static/daemon",
|
||||||
"lbrynetDaemonFileName": "lbrynet",
|
"lbrynetDaemonFileName": "lbrynet",
|
||||||
|
|
|
@ -58,7 +58,6 @@ type Props = {
|
||||||
infiniteScroll?: Boolean,
|
infiniteScroll?: Boolean,
|
||||||
feeAmount?: string,
|
feeAmount?: string,
|
||||||
tileLayout: boolean,
|
tileLayout: boolean,
|
||||||
hideFilters?: boolean,
|
|
||||||
maxPages?: number,
|
maxPages?: number,
|
||||||
forceShowReposts?: boolean,
|
forceShowReposts?: boolean,
|
||||||
};
|
};
|
||||||
|
@ -102,7 +101,6 @@ function ClaimListDiscover(props: Props) {
|
||||||
feeAmount,
|
feeAmount,
|
||||||
uris,
|
uris,
|
||||||
tileLayout,
|
tileLayout,
|
||||||
hideFilters = false,
|
|
||||||
claimIds,
|
claimIds,
|
||||||
maxPages,
|
maxPages,
|
||||||
forceShowReposts = false,
|
forceShowReposts = false,
|
||||||
|
@ -161,7 +159,7 @@ function ClaimListDiscover(props: Props) {
|
||||||
no_totals: boolean,
|
no_totals: boolean,
|
||||||
any_tags?: Array<string>,
|
any_tags?: Array<string>,
|
||||||
not_tags: Array<string>,
|
not_tags: Array<string>,
|
||||||
channel_ids?: Array<string>,
|
channel_ids: Array<string>,
|
||||||
claim_ids?: Array<string>,
|
claim_ids?: Array<string>,
|
||||||
not_channel_ids: Array<string>,
|
not_channel_ids: Array<string>,
|
||||||
order_by: Array<string>,
|
order_by: Array<string>,
|
||||||
|
@ -180,6 +178,7 @@ function ClaimListDiscover(props: Props) {
|
||||||
// no_totals makes it so the sdk doesn't have to calculate total number pages for pagination
|
// no_totals makes it so the sdk doesn't have to calculate total number pages for pagination
|
||||||
// it's faster, but we will need to remove it if we start using total_pages
|
// it's faster, but we will need to remove it if we start using total_pages
|
||||||
no_totals: true,
|
no_totals: true,
|
||||||
|
channel_ids: channelIdsParam || [],
|
||||||
not_channel_ids:
|
not_channel_ids:
|
||||||
// If channelIdsParam were passed in, we don't need not_channel_ids
|
// If channelIdsParam were passed in, we don't need not_channel_ids
|
||||||
!channelIdsParam && hiddenUris && hiddenUris.length ? hiddenUris.map(hiddenUri => hiddenUri.split('#')[1]) : [],
|
!channelIdsParam && hiddenUris && hiddenUris.length ? hiddenUris.map(hiddenUri => hiddenUri.split('#')[1]) : [],
|
||||||
|
@ -197,7 +196,6 @@ function ClaimListDiscover(props: Props) {
|
||||||
options.reposted_claim_id = repostedClaimId;
|
options.reposted_claim_id = repostedClaimId;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (claimType !== CS.CLAIM_CHANNEL) {
|
|
||||||
if (orderParam === CS.ORDER_BY_TOP && freshnessParam !== CS.FRESH_ALL) {
|
if (orderParam === CS.ORDER_BY_TOP && freshnessParam !== CS.FRESH_ALL) {
|
||||||
options.release_time = `>${Math.floor(
|
options.release_time = `>${Math.floor(
|
||||||
moment()
|
moment()
|
||||||
|
@ -240,9 +238,8 @@ function ClaimListDiscover(props: Props) {
|
||||||
)}`;
|
)}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (feeAmountParam && claimType !== CS.CLAIM_CHANNEL) {
|
if (feeAmountParam) {
|
||||||
options.fee_amount = feeAmountParam;
|
options.fee_amount = feeAmountParam;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -250,10 +247,6 @@ function ClaimListDiscover(props: Props) {
|
||||||
options.claim_ids = claimIds;
|
options.claim_ids = claimIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (channelIdsParam) {
|
|
||||||
options.channel_ids = channelIdsParam;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (durationParam) {
|
if (durationParam) {
|
||||||
if (durationParam === CS.DURATION_SHORT) {
|
if (durationParam === CS.DURATION_SHORT) {
|
||||||
options.duration = '<=1800';
|
options.duration = '<=1800';
|
||||||
|
@ -430,7 +423,6 @@ function ClaimListDiscover(props: Props) {
|
||||||
hiddenNsfwMessage={hiddenNsfwMessage}
|
hiddenNsfwMessage={hiddenNsfwMessage}
|
||||||
setPage={setPage}
|
setPage={setPage}
|
||||||
tileLayout={tileLayout}
|
tileLayout={tileLayout}
|
||||||
hideFilters={hideFilters}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@ type Props = {
|
||||||
tileLayout: boolean,
|
tileLayout: boolean,
|
||||||
doSetClientSetting: (string, boolean, ?boolean) => void,
|
doSetClientSetting: (string, boolean, ?boolean) => void,
|
||||||
setPage: number => void,
|
setPage: number => void,
|
||||||
hideFilters: boolean,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
function ClaimListHeader(props: Props) {
|
function ClaimListHeader(props: Props) {
|
||||||
|
@ -54,7 +53,6 @@ function ClaimListHeader(props: Props) {
|
||||||
tileLayout,
|
tileLayout,
|
||||||
doSetClientSetting,
|
doSetClientSetting,
|
||||||
setPage,
|
setPage,
|
||||||
hideFilters,
|
|
||||||
} = props;
|
} = props;
|
||||||
const { action, push, location } = useHistory();
|
const { action, push, location } = useHistory();
|
||||||
const { search } = location;
|
const { search } = location;
|
||||||
|
@ -205,8 +203,7 @@ function ClaimListHeader(props: Props) {
|
||||||
<div className="claim-search__wrapper">
|
<div className="claim-search__wrapper">
|
||||||
<div className="claim-search__top">
|
<div className="claim-search__top">
|
||||||
<div className="claim-search__top-row">
|
<div className="claim-search__top-row">
|
||||||
{!hideFilters &&
|
{CS.ORDER_BY_TYPES.map(type => (
|
||||||
CS.ORDER_BY_TYPES.map(type => (
|
|
||||||
<Button
|
<Button
|
||||||
key={type}
|
key={type}
|
||||||
button="alt"
|
button="alt"
|
||||||
|
|
Loading…
Reference in a new issue