Merge pull request #3271 from lbryio/fix-noMatureSearchPagination

paginates over search count rather than channel claim count

package.json

@@ -127,7 +127,7 @@
     "imagesloaded": "^4.1.4",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#c30889d3392b89ffffdb5beea8534f2aa0f76b19",
+    "lbry-redux": "lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
     "lbryinc": "lbryio/lbryinc#2aedf5a188f028f61c45bc7ed0c747a2d4ae453a",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",

static/app-strings.json

@@ -887,6 +887,8 @@
   "An email was sent to %email%. Follow the link to %verify_text%. After, this page will update automatically.": "An email was sent to %email%. Follow the link to %verify_text%. After, this page will update automatically.",
   "Your email preferences": "Your email preferences",
   "allow you to receive notifications related to new content.": "allow you to receive notifications related to new content.",
+  "files": "files",
+  "Invalid claim ID %claimId%.": "Invalid claim ID %claimId%."
   "Suggested": "Suggested",
   "%amountBehind% blocks behind": "%amountBehind% blocks behind",
   "Startup Preferences": "Startup Preferences",
@@ -898,9 +900,7 @@
   "Checking your publishes...": "Checking your publishes...",
   "Checking your publishes": "Checking your publishes",
   "Checking for channels": "Checking for channels",
-  "files": "files",
   "Error Starting Up": "Error Starting Up",
   "Reach out to hello@lbry.com for help, or check out %help_link%.": "Reach out to hello@lbry.com for help, or check out %help_link%.",
   "You're not following any tags. Smash that %customize% button!": "You're not following any tags. Smash that %customize% button!",
   "customize": "customize"
-}

ui/component/channelContent/index.js

@@ -5,7 +5,7 @@ import {
   makeSelectClaimsInChannelForPage,
   makeSelectFetchingChannelClaims,
   makeSelectClaimIsMine,
-  makeSelectTotalPagesForChannel,
+  makeSelectTotalPagesInChannelSearch,
   selectChannelIsBlocked,
 } from 'lbry-redux';
 import { withRouter } from 'react-router';
@@ -16,9 +16,9 @@ const select = (state, props) => {
   const urlParams = new URLSearchParams(search);
   const page = urlParams.get('page') || 0;
   return {
-    claimsInChannel: makeSelectClaimsInChannelForPage(props.uri, page)(state),
+    pageOfClaimsInChannel: makeSelectClaimsInChannelForPage(props.uri, page)(state),
     fetching: makeSelectFetchingChannelClaims(props.uri)(state),
-    totalPages: makeSelectTotalPagesForChannel(props.uri, PAGE_SIZE)(state),
+    totalPages: makeSelectTotalPagesInChannelSearch(props.uri, PAGE_SIZE)(state),
     channelIsMine: makeSelectClaimIsMine(props.uri)(state),
     channelIsBlocked: selectChannelIsBlocked(props.uri)(state),
   };

ui/component/channelContent/view.jsx

@@ -12,7 +12,7 @@ type Props = {
   totalPages: number,
   fetching: boolean,
   params: { page: number },
-  claimsInChannel: Array<StreamClaim>,
+  pageOfClaimsInChannel: Array<StreamClaim>,
   channelIsBlocked: boolean,
   channelIsMine: boolean,
   fetchClaims: (string, number) => void,
@@ -23,15 +23,14 @@ function ChannelContent(props: Props) {
   const {
     uri,
     fetching,
-    claimsInChannel,
+    pageOfClaimsInChannel,
     totalPages,
     channelIsMine,
     channelIsBlocked,
-
     fetchClaims,
     channelIsBlackListed,
   } = props;
-  const hasContent = Boolean(claimsInChannel && claimsInChannel.length);
+  const hasContent = Boolean(pageOfClaimsInChannel && pageOfClaimsInChannel.length);
   return (
     <Fragment>
       {fetching && !hasContent && (
@@ -68,7 +67,7 @@ function ChannelContent(props: Props) {
       {!channelIsMine && <HiddenNsfwClaims uri={uri} />}
 
       {hasContent && !channelIsBlocked && !channelIsBlackListed && (
-        <ClaimList header={false} uris={claimsInChannel.map(claim => claim && claim.canonical_url)} />
+        <ClaimList header={false} uris={pageOfClaimsInChannel.map(claim => claim && claim.canonical_url)} />
       )}
 
       {!channelIsBlocked && !channelIsBlackListed && (

ui/component/hiddenNsfwClaims/index.js

@@ -1,23 +1,23 @@
 import { connect } from 'react-redux';
-import { makeSelectNsfwCountForChannel, makeSelectNsfwCountFromUris, parseURI } from 'lbry-redux';
+import { makeSelectNsfwCountFromUris, makeSelectOmittedCountForChannel, parseURI } from 'lbry-redux';
 import { selectShowMatureContent } from 'redux/selectors/settings';
 import HiddenNsfwClaims from './view';
 
 const select = (state, props) => {
   const { uri, uris } = props;
 
-  let numberOfNsfwClaims;
+  let numberOfHiddenClaims;
   if (uri) {
     const { isChannel } = parseURI(uri);
-    numberOfNsfwClaims = isChannel
-      ? makeSelectNsfwCountForChannel(uri)(state)
+    numberOfHiddenClaims = isChannel
+      ? makeSelectOmittedCountForChannel(uri)(state)
       : makeSelectNsfwCountFromUris([uri])(state);
   } else if (uris) {
-    numberOfNsfwClaims = makeSelectNsfwCountFromUris(uris)(state);
+    numberOfHiddenClaims = makeSelectNsfwCountFromUris(uris)(state);
   }
 
   return {
-    numberOfNsfwClaims,
+    numberOfHiddenClaims,
     obscureNsfw: !selectShowMatureContent(state),
   };
 };

ui/component/hiddenNsfwClaims/view.jsx

@@ -3,19 +3,19 @@ import React from 'react';
 import Button from 'component/button';
 
 type Props = {
-  numberOfNsfwClaims: number,
+  numberOfHiddenClaims: number,
   obscureNsfw: boolean,
   className: ?string,
 };
 
 export default (props: Props) => {
-  const { numberOfNsfwClaims, obscureNsfw } = props;
+  const { numberOfHiddenClaims, obscureNsfw } = props;
 
   return (
     obscureNsfw &&
-    Boolean(numberOfNsfwClaims) && (
+    Boolean(numberOfHiddenClaims) && (
       <div className="section--padded section__subtitle">
-        {numberOfNsfwClaims} {numberOfNsfwClaims > 1 ? __('files') : __('file')} {__('hidden due to your')}{' '}
+        {numberOfHiddenClaims} {numberOfHiddenClaims > 1 ? __('files') : __('file')} {__('hidden due to your')}{' '}
         <Button button="link" navigate="/$/settings" label={__('content viewing preferences')} />.
       </div>
     )

ui/redux/actions/content.js

@@ -12,6 +12,7 @@ import { setSubscriptionLatest, doUpdateUnreadSubscriptions } from 'redux/action
 import { makeSelectUnreadByChannel } from 'redux/selectors/subscriptions';
 import {
   ACTIONS,
+  MATURE_TAGS,
   Lbry,
   Lbryapi,
   makeSelectFileInfoForUri,
@@ -137,21 +138,28 @@ export function doSetPlayingUri(uri: ?string) {
 }
 
 export function doFetchClaimsByChannel(uri: string, page: number = 1, pageSize: number = PAGE_SIZE) {
-  return (dispatch: Dispatch) => {
-    dispatch({
-      type: ACTIONS.FETCH_CHANNEL_CLAIMS_STARTED,
-      data: { uri, page },
-    });
-
-    Lbry.claim_search({
+  return (dispatch: Dispatch, getState: GetState) => {
+    const state = getState();
+    const showMature = makeSelectClientSetting(SETTINGS.SHOW_MATURE)(state);
+    const params = {
       channel: uri,
       page,
       page_size: pageSize,
       valid_channel_signature: true,
       order_by: ['release_time'],
-    }).then(result => {
-      const { items: claims, total_items: claimsInChannel, page: returnedPage } = result;
+    };
 
+    if (!showMature) {
+      params['not_tags'] = MATURE_TAGS;
+    }
+
+    dispatch({
+      type: ACTIONS.FETCH_CHANNEL_CLAIMS_STARTED,
+      data: { uri, page },
+    });
+
+    Lbry.claim_search(params).then(result => {
+      const { items: claims, page: returnedPage, total_items: claimsInChannel, total_pages: pageTotal } = result;
       if (claims && claims.length) {
         if (page === 1) {
           const latest = claims[0];
@@ -174,6 +182,7 @@ export function doFetchClaimsByChannel(uri: string, page: number = 1, pageSize:
           claimsInChannel,
           claims: claims || [],
           page: returnedPage || undefined,
+          totalPages: pageTotal,
         },
       });
     });