From 5e270c129cd13b2e5f859ba50de9cf4c83b5bf0c Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Thu, 16 Aug 2018 12:41:50 -0400
Subject: [PATCH] doCheckSubs only takes uri; do not clear notifications on
 doFetchClaimsByChan; doFetchMySubs on startup; always set latest on checkSub;
 do not download or notify when latest is undefined

---
 src/renderer/component/sideBar/view.jsx     |  5 +-
 src/renderer/page/file/index.js             |  2 +-
 src/renderer/page/file/view.jsx             | 18 ++---
 src/renderer/page/subscriptions/view.jsx    |  3 +
 src/renderer/redux/actions/content.js       | 23 +++---
 src/renderer/redux/actions/subscriptions.js | 86 ++++++++++++---------
 6 files changed, 72 insertions(+), 65 deletions(-)

diff --git a/src/renderer/component/sideBar/view.jsx b/src/renderer/component/sideBar/view.jsx
index d50d21491..becc2d3ed 100644
--- a/src/renderer/component/sideBar/view.jsx
+++ b/src/renderer/component/sideBar/view.jsx
@@ -25,10 +25,7 @@ type Props = {
 const SideBar = (props: Props) => {
   const { navLinks, notifications } = props;
 
-  const badges = Object.keys(notifications).reduce(
-    (acc, cur) => (notifications[cur].type === NOTIFICATION_TYPES.DOWNLOADING ? acc : acc + 1),
-    0
-  );
+  const badges = Object.keys(notifications).length;
 
   return (
     <nav className="nav">
diff --git a/src/renderer/page/file/index.js b/src/renderer/page/file/index.js
index 564ce0aed..99a89e4fd 100644
--- a/src/renderer/page/file/index.js
+++ b/src/renderer/page/file/index.js
@@ -40,7 +40,7 @@ const perform = dispatch => ({
   navigate: (path, params) => dispatch(doNavigate(path, params)),
   fetchFileInfo: uri => dispatch(doFetchFileInfo(uri)),
   fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
-  checkSubscription: subscription => dispatch(doCheckSubscription(subscription)),
+  checkSubscription: uri => dispatch(doCheckSubscription(uri)),
   openModal: (modal, props) => dispatch(doNotify(modal, props)),
   prepareEdit: (publishData, uri) => dispatch(doPrepareEdit(publishData, uri)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index 8eba0ed2d..8e0ab3da2 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -44,7 +44,7 @@ type Props = {
   fetchFileInfo: string => void,
   fetchCostInfo: string => void,
   prepareEdit: ({}, string) => void,
-  checkSubscription: ({ channelName: string, uri: string }) => void,
+  checkSubscription: (uri: string) => void,
   subscriptions: Array<Subscription>,
   setClientSetting: (string, boolean | string) => void,
   autoplay: boolean,
@@ -96,16 +96,12 @@ class FilePage extends React.Component<Props> {
 
   checkSubscription = (props: Props) => {
     if (props.subscriptions.find(sub => sub.channelName === props.claim.channel_name)) {
-      props.checkSubscription({
-        channelName: props.claim.channel_name,
-        uri: buildURI(
-          {
-            contentName: props.claim.channel_name,
-            claimId: props.claim.value.publisherSignature.certificateId,
-          },
-          false
-        ),
-      });
+      props.checkSubscription(
+        buildURI({
+          contentName: props.claim.channel_name,
+          claimId: props.claim.value.publisherSignature.certificateId,
+        }, false)
+      );
     }
   };
 
diff --git a/src/renderer/page/subscriptions/view.jsx b/src/renderer/page/subscriptions/view.jsx
index 68fa3e81f..60c57cf93 100644
--- a/src/renderer/page/subscriptions/view.jsx
+++ b/src/renderer/page/subscriptions/view.jsx
@@ -25,6 +25,9 @@ export default class extends React.PureComponent<Props> {
     const { notifications, setSubscriptionNotifications, doFetchMySubscriptions } = this.props;
     doFetchMySubscriptions();
 
+    // @sean will change this behavior when implementing new content labeling
+    // notifications should be cleared individually
+    // do we want a way to clear individual claims without viewing?
     const newNotifications = {};
     Object.keys(notifications).forEach(cur => {
       if (notifications[cur].type === NOTIFICATION_TYPES.DOWNLOADING) {
diff --git a/src/renderer/redux/actions/content.js b/src/renderer/redux/actions/content.js
index fa3ac9afa..d0db1980b 100644
--- a/src/renderer/redux/actions/content.js
+++ b/src/renderer/redux/actions/content.js
@@ -379,17 +379,18 @@ export function doFetchClaimsByChannel(uri, page) {
             buildURI({ contentName: latest.name, claimId: latest.claim_id }, false)
           )
         );
-        const notifications = selectNotifications(getState());
-        const newNotifications = {};
-        Object.keys(notifications).forEach(cur => {
-          if (
-            notifications[cur].subscription.channelName !== latest.channel_name ||
-            notifications[cur].type === NOTIFICATION_TYPES.DOWNLOADING
-          ) {
-            newNotifications[cur] = { ...notifications[cur] };
-          }
-        });
-        dispatch(setSubscriptionNotifications(newNotifications));
+        // commented out as a note for @sean, notification will be clared individually
+        // const notifications = selectNotifications(getState());
+        // const newNotifications = {};
+        // Object.keys(notifications).forEach(cur => {
+        //   if (
+        //     notifications[cur].subscription.channelName !== latest.channel_name ||
+        //     notifications[cur].type === NOTIFICATION_TYPES.DOWNLOADING
+        //   ) {
+        //     newNotifications[cur] = { ...notifications[cur] };
+        //   }
+        // });
+        // dispatch(setSubscriptionNotifications(newNotifications));
       }
 
       dispatch({
diff --git a/src/renderer/redux/actions/subscriptions.js b/src/renderer/redux/actions/subscriptions.js
index 5fd208924..cbc7644e9 100644
--- a/src/renderer/redux/actions/subscriptions.js
+++ b/src/renderer/redux/actions/subscriptions.js
@@ -124,25 +124,31 @@ export const setSubscriptionNotification = (
     },
   });
 
-export const doCheckSubscription = (subscription: Subscription, notify?: boolean) => (
+export const doCheckSubscription = (subscriptionUri: string, notify?: boolean) => (
   dispatch: Dispatch,
   getState: () => {}
 ) => {
   // no dispatching FETCH_CHANNEL_CLAIMS_STARTED; causes loading issues on <SubscriptionsPage>
 
-  Lbry.claim_list_by_channel({ uri: subscription.uri, page: 1 }).then(result => {
-    const claimResult = result[subscription.uri] || {};
+  const state = getState();
+  const savedSubscription = state.subscriptions.subscriptions.find(sub => sub.uri === subscriptionUri);
+
+  Lbry.claim_list_by_channel({ uri: subscriptionUri, page: 1 }).then(result => {
+    const claimResult = result[subscriptionUri] || {};
     const { claims_in_channel: claimsInChannel } = claimResult;
 
     const latestIndex = claimsInChannel.findIndex(
-      claim => `${claim.name}#${claim.claim_id}` === subscription.latest
+      claim => `${claim.name}#${claim.claim_id}` === savedSubscription.latest
     );
 
-    if (claimsInChannel.length && latestIndex !== 0) {
+    // if latest is 0, nothing has changed
+    // when there is no subscription latest, it is either a newly subscriubed channel or
+    // the user has cleared their cache. Either way, do not download or notify about new content
+    // as that would download/notify 10 claims per channel
+    if (claimsInChannel.length && latestIndex !== 0 && savedSubscription.latest) {
       let downloadCount = 0;
       claimsInChannel.slice(0, latestIndex === -1 ? 10 : latestIndex).forEach(claim => {
         const uri = buildURI({ contentName: claim.name, claimId: claim.claim_id }, false);
-        const state = getState();
         const shouldDownload = Boolean(
           downloadCount < SUBSCRIPTION_DOWNLOAD_LIMIT &&
             !claim.value.stream.metadata.fee &&
@@ -151,7 +157,7 @@ export const doCheckSubscription = (subscription: Subscription, notify?: boolean
         if (notify) {
           dispatch(
             setSubscriptionNotification(
-              subscription,
+              savedSubscription,
               uri,
               shouldDownload ? NOTIFICATION_TYPES.DOWNLOADING : NOTIFICATION_TYPES.NOTIFY_ONLY
             )
@@ -163,36 +169,38 @@ export const doCheckSubscription = (subscription: Subscription, notify?: boolean
         }
       });
 
-      dispatch(
-        setSubscriptionLatest(
-          {
-            channelName: claimsInChannel[0].channel_name,
-            uri: buildURI(
-              {
-                channelName: claimsInChannel[0].channel_name,
-                claimId: claimsInChannel[0].claim_id,
-              },
-              false
-            ),
-          },
-          buildURI(
-            { contentName: claimsInChannel[0].name, claimId: claimsInChannel[0].claim_id },
-            false
-          )
-        )
-      );
-
-      // calling FETCH_CHANNEL_CLAIMS_COMPLETED after not calling STARTED
-      // means it will delete a non-existant fetchingChannelClaims[uri]
-      dispatch({
-        type: ACTIONS.FETCH_CHANNEL_CLAIMS_COMPLETED,
-        data: {
-          uri: subscription.uri,
-          claims: claimsInChannel || [],
-          page: 1,
-        },
-      });
     }
+
+    // always setLatest; important for newly subscribed channels
+    dispatch(
+      setSubscriptionLatest(
+        {
+          channelName: claimsInChannel[0].channel_name,
+          uri: buildURI(
+            {
+              channelName: claimsInChannel[0].channel_name,
+              claimId: claimsInChannel[0].claim_id,
+            },
+            false
+          ),
+        },
+        buildURI(
+          { contentName: claimsInChannel[0].name, claimId: claimsInChannel[0].claim_id },
+          false
+        )
+      )
+    );
+
+    // calling FETCH_CHANNEL_CLAIMS_COMPLETED after not calling STARTED
+    // means it will delete a non-existant fetchingChannelClaims[uri]
+    dispatch({
+      type: ACTIONS.FETCH_CHANNEL_CLAIMS_COMPLETED,
+      data: {
+        uri: subscriptionUri,
+        claims: claimsInChannel || [],
+        page: 1,
+      },
+    });
   });
 };
 
@@ -232,6 +240,7 @@ export const doChannelSubscribe = (subscription: Subscription) => (
     dispatch(doClaimRewardType(rewards.SUBSCRIPTION, { failSilently: true }));
   }
 
+  // should be subUri
   dispatch(doCheckSubscription(subscription, true));
 };
 
@@ -269,10 +278,11 @@ export const doCheckSubscriptionsInit = () => (dispatch: Dispatch) => {
   // doCheckSubscriptionsInit is called by doDaemonReady
   // setTimeout below is a hack to ensure redux is hydrated when subscriptions are checked
   // this will be replaced with <PersistGate> which reqiures a package upgrade
-  setTimeout(() => dispatch(doCheckSubscriptions()), 5000);
+  setTimeout(() => dispatch(doFetchMySubscriptions()), 5000);
+  setTimeout(() => dispatch(doCheckSubscriptions()), 10000);
   const checkSubscriptionsTimer = setInterval(
     () => dispatch(doCheckSubscriptions()),
-    CHECK_SUBSCRIPTIONS_INTERVAL
+    20000//CHECK_SUBSCRIPTIONS_INTERVAL
   );
   dispatch({
     type: ACTIONS.CHECK_SUBSCRIPTIONS_SUBSCRIBE,