ui/component/claimMenuList/index.js

@@ -26,7 +26,7 @@ import {
 } from 'redux/selectors/comments';
 import { doToast } from 'redux/actions/notifications';
 import { doChannelSubscribe, doChannelUnsubscribe } from 'redux/actions/subscriptions';
-import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
+import { selectIsSubscribedForUri } from 'redux/selectors/subscriptions';
 import { selectListShuffle } from 'redux/selectors/content';
 import { doToggleLoopList, doToggleShuffleList } from 'redux/actions/content';
 import ClaimPreview from './view';
@@ -62,7 +62,7 @@ const select = (state, props) => {
     channelIsMuted: makeSelectChannelIsMuted(contentChannelUri)(state),
     channelIsBlocked: makeSelectChannelIsBlocked(contentChannelUri)(state),
     fileInfo: makeSelectFileInfoForUri(contentPermanentUri)(state),
-    isSubscribed: makeSelectIsSubscribed(contentChannelUri, true)(state),
+    isSubscribed: selectIsSubscribedForUri(state, contentChannelUri),
     channelIsAdminBlocked: makeSelectChannelIsAdminBlocked(props.uri)(state),
     isAdmin: selectHasAdminChannel(state),
     claimInCollection: makeSelectCollectionForIdHasClaimUrl(collectionId, contentPermanentUri)(state),

ui/component/claimPreview/index.js

@@ -23,7 +23,7 @@ import { doFileGet } from 'redux/actions/file';
 import { selectBanStateForUri } from 'lbryinc';
 import { selectShowMatureContent } from 'redux/selectors/settings';
 import { makeSelectHasVisitedUri } from 'redux/selectors/content';
-import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
+import { selectIsSubscribedForUri } from 'redux/selectors/subscriptions';
 import ClaimPreview from './view';
 import formatMediaDuration from 'util/formatMediaDuration';
 
@@ -46,7 +46,7 @@ const select = (state, props) => {
     nsfw: props.uri && makeSelectClaimIsNsfw(props.uri)(state),
     banState: selectBanStateForUri(state, props.uri),
     hasVisitedUri: props.uri && makeSelectHasVisitedUri(props.uri)(state),
-    isSubscribed: props.uri && makeSelectIsSubscribed(props.uri, true)(state),
+    isSubscribed: props.uri && selectIsSubscribedForUri(state, props.uri),
     streamingUrl: props.uri && makeSelectStreamingUrlForUri(props.uri)(state),
     wasPurchased: props.uri && makeSelectClaimWasPurchased(props.uri)(state),
     isCollectionMine: makeSelectCollectionIsMine(props.collectionId)(state),

ui/component/claimProperties/index.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { selectClaimIsMine, selectClaimForUri } from 'redux/selectors/claims';
-import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
+import { selectIsSubscribedForUri } from 'redux/selectors/subscriptions';
 import ClaimProperties from './view';
 
 const select = (state, props) => {
@@ -8,7 +8,7 @@ const select = (state, props) => {
 
   return {
     claim,
-    isSubscribed: makeSelectIsSubscribed(props.uri)(state),
+    isSubscribed: selectIsSubscribedForUri(state, props.uri),
     claimIsMine: selectClaimIsMine(state, claim),
   };
 };

ui/component/invited/index.js

@@ -5,7 +5,7 @@ import { selectUser, selectSetReferrerPending, selectSetReferrerError } from 're
 import { doClaimRewardType } from 'redux/actions/rewards';
 import { selectUnclaimedRewards } from 'redux/selectors/rewards';
 import { doUserSetReferrer } from 'redux/actions/user';
-import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
+import { selectIsSubscribedForUri } from 'redux/selectors/subscriptions';
 import { doChannelSubscribe } from 'redux/actions/subscriptions';
 import Invited from './view';
 
@@ -15,16 +15,16 @@ const select = (state, props) => {
     referrerSetPending: selectSetReferrerPending(state),
     referrerSetError: selectSetReferrerError(state),
     rewards: selectUnclaimedRewards(state),
-    isSubscribed: makeSelectIsSubscribed(props.fullUri)(state),
+    isSubscribed: selectIsSubscribedForUri(state, props.fullUri),
     fullUri: props.fullUri,
     referrer: props.referrer,
   };
 };
 
-const perform = dispatch => ({
+const perform = (dispatch) => ({
   claimReward: () => dispatch(doClaimRewardType(REWARDS.TYPE_REFEREE)),
-  setReferrer: referrer => dispatch(doUserSetReferrer(referrer)),
+  setReferrer: (referrer) => dispatch(doUserSetReferrer(referrer)),
-  channelSubscribe: uri => dispatch(doChannelSubscribe(uri)),
+  channelSubscribe: (uri) => dispatch(doChannelSubscribe(uri)),
 });
 
 export default withRouter(connect(select, perform)(Invited));

ui/component/previewOverlayProperties/index.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { selectClaimIsMine, selectClaimForUri } from 'redux/selectors/claims';
 import { makeSelectFilePartlyDownloaded } from 'redux/selectors/file_info';
 import { makeSelectEditedCollectionForId } from 'redux/selectors/collections';
-import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
+import { selectIsSubscribedForUri } from 'redux/selectors/subscriptions';
 import PreviewOverlayProperties from './view';
 
 const select = (state, props) => {
@@ -13,7 +13,7 @@ const select = (state, props) => {
     claim,
     editedCollection: makeSelectEditedCollectionForId(claimId)(state),
     downloaded: makeSelectFilePartlyDownloaded(props.uri)(state),
-    isSubscribed: makeSelectIsSubscribed(props.uri)(state),
+    isSubscribed: selectIsSubscribedForUri(state, props.uri),
     claimIsMine: selectClaimIsMine(state, claim),
   };
 };

ui/component/subscribeButton/index.js

@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { doChannelSubscribe, doChannelUnsubscribe } from 'redux/actions/subscriptions';
 import {
-  makeSelectIsSubscribed,
+  selectIsSubscribedForUri,
   selectFirstRunCompleted,
   makeSelectNotificationsDisabled,
 } from 'redux/selectors/subscriptions';
@@ -11,7 +11,7 @@ import { doToast } from 'redux/actions/notifications';
 import SubscribeButton from './view';
 
 const select = (state, props) => ({
-  isSubscribed: makeSelectIsSubscribed(props.uri, true)(state),
+  isSubscribed: selectIsSubscribedForUri(state, props.uri),
   firstRunCompleted: selectFirstRunCompleted(state),
   permanentUrl: makeSelectPermanentUrlForUri(props.uri)(state),
   notificationsDisabled: makeSelectNotificationsDisabled(props.uri)(state),

ui/page/channel/index.js

@@ -11,7 +11,7 @@ import {
 import { selectMyUnpublishedCollections } from 'redux/selectors/collections';
 import { selectBlackListedOutpoints, doFetchSubCount, selectSubCountForUri } from 'lbryinc'; // ban state
 import { selectYoutubeChannels } from 'redux/selectors/user';
-import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
+import { selectIsSubscribedForUri } from 'redux/selectors/subscriptions';
 import { selectModerationBlockList } from 'redux/selectors/comments';
 import { selectMutedChannels } from 'redux/selectors/blocked';
 import { doOpenModal } from 'redux/actions/app';
@@ -27,7 +27,7 @@ const select = (state, props) => {
     channelIsMine: selectClaimIsMine(state, claim),
     page: selectCurrentChannelPage(state),
     claim,
-    isSubscribed: makeSelectIsSubscribed(props.uri, true)(state),
+    isSubscribed: selectIsSubscribedForUri(state, props.uri),
     blackListedOutpoints: selectBlackListedOutpoints(state),
     subCount: selectSubCountForUri(state, props.uri),
     pending: makeSelectClaimIsPending(props.uri)(state),

ui/redux/selectors/subscriptions.js

@@ -1,12 +1,15 @@
 import { SUGGESTED_FEATURED, SUGGESTED_TOP_SUBSCRIBED } from 'constants/subscriptions';
 import { createSelector } from 'reselect';
+import { createCachedSelector } from 're-reselect';
 import { parseURI, isURIEqual } from 'util/lbryURI';
 import {
   selectAllFetchingChannelClaims,
   makeSelectChannelForClaimUri,
   makeSelectClaimForUri,
+  selectClaimForUri,
 } from 'redux/selectors/claims';
 import { swapKeyAndValue } from 'util/swap-json';
+import { getChannelFromClaim } from 'util/claim';
 
 // Returns the entire subscriptions state
 const selectState = (state) => state.subscriptions || {};
@@ -105,34 +108,18 @@ export const selectSubscriptionsBeingFetched = createSelector(
 export const makeSelectChannelInSubscriptions = (uri) =>
   createSelector(selectSubscriptions, (subscriptions) => subscriptions.some((sub) => sub.uri === uri));
 
-export const makeSelectIsSubscribed = (uri) =>
+export const selectIsSubscribedForUri = createCachedSelector(
-  createSelector(
+  selectClaimForUri,
   selectSubscriptions,
-    makeSelectChannelForClaimUri(uri, true),
+  (claim, subscriptions) => {
-    makeSelectClaimForUri(uri),
+    const channelClaim = getChannelFromClaim(claim);
-    (subscriptions, channelUri, claim) => {
+    if (channelClaim) {
-      if (channelUri) {
+      const uri = channelClaim.permanent_url;
-        return subscriptions.some((sub) => isURIEqual(sub.uri, channelUri));
-      }
-
-      // If we couldn't get a channel uri from the claim uri, the uri passed in might be a channel already
-      let isChannel;
-      try {
-        ({ isChannel } = parseURI(uri));
-      } catch (e) {}
-
-      if (isChannel && claim) {
-        const uri = claim.permanent_url;
       return subscriptions.some((sub) => isURIEqual(sub.uri, uri));
     }
-
-      if (isChannel && !claim) {
-        return subscriptions.some((sub) => isURIEqual(sub.uri, uri));
-      }
-
     return false;
   }
-  );
+)((state, uri) => String(uri));
 
 export const makeSelectNotificationsDisabled = (uri) =>
   createSelector(