Internal subscriptions #1424

neb-b · 2018-05-02T15:06:47Z

Adds subscriptions to our internal-api database

Notes

Ideally this should live in lbry-redux. It seems like there is still some work moving lbry.call over, mostly with auth stuff. And we need to figure out how we want to interact between app code and lbry-redux code. Currently the the subscriptions actions we are using doPurchaseUri which doesn't exist in lbry-redux. It shouldn't be too difficult to move over, but will just take some planning. I thought it was out of the scope for this PR.

Implementation

There are 3 main scenarios that cause some extra logic re: respecting users privacy. If a user decides not to share app usage, we will not make any calls to the db. If they are sharing data with us, this is what happens:

0 subs in db, but x subs in redux:
- This will happen on the initial run, or if users decide to start sharing data after they have subscribed to a channel
- In this case we will populate every sub in redux into the db


x subs in db, but 0 subs in redux:
- This will happen if a user clears there cache
- Populate all subs in db into redux
- This will cause issues with users who have subscribed, then stopped sharing data, and unsubscribed from everyone, then started sharing data again. They will be re-subscribed (I think this is ok for now)

x subs in db, y subs in redux:
- There is some mismatch from failing api calls or stopping/starting to share app usage
- Default to whats in redux
- Subscribe to any missing channels in the db
- Unsubscribe to any channels in the db that aren't in redux

neb-b · 2018-05-05T22:55:29Z

src/renderer/component/page/view.jsx

 };

+class Page extends React.PureComponent<Props, State> {
+  static getDerivedStateFromProps(nextProps: Props, prevState: State) {


React recommends getDerivedStateFromProps moving forward instead of componentWillReceiveProps

neb-b · 2018-05-07T04:35:25Z

.eslintrc.json

@@ -34,6 +34,7 @@
      "singleQuote": true
    }],
    "func-names": ["warn", "as-needed"],
-    "jsx-a11y/label-has-for": 0
+    "jsx-a11y/label-has-for": 0,
+    "import/prefer-default-export": 0


IMO this isn't needed. Mostly for util files, I don't want to add the first one as a default export if I think there may be more functions added later.

neb-b · 2018-05-07T04:46:53Z

src/renderer/redux/actions/subscriptions.js

 };

-export const doChannelUnsubscribe = (subscription: Subscription) => (dispatch: Dispatch) => {
+export const setSubscriptionLatest = (subscription: Subscription, uri: string) => (


Didn't touch this, lint was telling me to move it

neb-b · 2018-05-07T04:47:09Z

src/renderer/redux/actions/subscriptions.js

@@ -114,40 +228,80 @@ export const doCheckSubscription = (subscription: Subscription, notify?: boolean
  });
 };

-export const setSubscriptionLatest = (subscription: Subscription, uri: string) => (
+export const setSubscriptionNotifications = (notifications: SubscriptionNotifications) => (


Same here, just re-ordering

neb-b · 2018-05-07T04:48:10Z

src/renderer/redux/actions/subscriptions.js

+  }
+};
+
+export const doCheckSubscriptions = () => (


also this, just moved it

new review

neb-b · 2018-05-10T16:19:48Z

@kauffj ready for more feedback

kauffj

Looks very close.

kauffj · 2018-05-10T16:27:44Z

src/renderer/constants/action_types.js

@@ -166,6 +166,9 @@ export const SET_SUBSCRIPTION_NOTIFICATIONS = 'SET_SUBSCRIPTION_NOTIFICATIONS';
 export const CHECK_SUBSCRIPTION_STARTED = 'CHECK_SUBSCRIPTION_STARTED';
 export const CHECK_SUBSCRIPTION_COMPLETED = 'CHECK_SUBSCRIPTION_COMPLETED';
 export const CHECK_SUBSCRIPTIONS_SUBSCRIBE = 'CHECK_SUBSCRIPTIONS_SUBSCRIBE';
+export const FETCH_MY_SUBSCRIPTIONS_START = 'FETCH_MY_SUBSCRIPTIONS_START';


@seanyesmunt this is fine for now. My suggestion for that case would be to de-couple noticing new subscriptions from downloading or to add an auto-download setting that can default to a different value for desktop vs. mobile.

(@akinwale )

kauffj · 2018-05-10T16:28:49Z

src/renderer/constants/settings.js

@@ -11,4 +11,6 @@ export const INSTANT_PURCHASE_ENABLED = 'instantPurchaseEnabled';
 export const INSTANT_PURCHASE_MAX = 'instantPurchaseMax';
 export const THEME = 'theme';
 export const THEMES = 'themes';
+export const DARK_THEME = 'dark';
+export const LIGHT_THEME = 'light';


Currently these values are setting keys not setting values. It's a good idea to const these theme values, but we ought to do this in a way that retains that distinction.

kauffj · 2018-05-10T16:30:39Z

src/renderer/redux/actions/subscriptions.js

-    type: ACTIONS.CHANNEL_SUBSCRIBE,
-    data: subscription,
-  });
+const getClaimId = uri => {


Use parseURI?

kauffj · 2018-05-10T16:33:33Z

src/renderer/types/claim.js

+
+// Actual claim type has more values than this
+// Add them as they are used
+export type Claim = {


Should Subscription also be a standalone type file like Claim?

kauffj · 2018-05-10T16:35:27Z

src/renderer/redux/actions/subscriptions.js

+        storedSubscriptions.forEach(sub => {
+          if (!reduxSubMap[sub.claim_id]) {
+            const uri = `lbry://${sub.channel_name}#${sub.claim_id}`;
+            subscriptionsToReturn.push({ uri, channelName: sub.channel_name });


I'm mildly surprised this works. If subscriptionsToReturn is an array of Subscription, doesn't this need to include the latest property?

latest isn't required. It will populate it in doCheckSubscriptions. We are just adding them to redux, which is where it looks when it's checking for the latest.

I'm fairly sure this is my misunderstanding, but I still don't understand why Flow type checking wouldn't be forcing storedSubscriptions to be Array<Subscription> and thus require the latest property.

(Going to merge anyway, but if you know the answer would appreciate the education :) )

kauffj · 2018-05-10T16:36:19Z

src/renderer/constants/action_types.js

@@ -166,6 +176,9 @@ export const SET_SUBSCRIPTION_NOTIFICATIONS = 'SET_SUBSCRIPTION_NOTIFICATIONS';
 export const CHECK_SUBSCRIPTION_STARTED = 'CHECK_SUBSCRIPTION_STARTED';
 export const CHECK_SUBSCRIPTION_COMPLETED = 'CHECK_SUBSCRIPTION_COMPLETED';
 export const CHECK_SUBSCRIPTIONS_SUBSCRIBE = 'CHECK_SUBSCRIPTIONS_SUBSCRIBE';
+export const FETCH_MY_SUBSCRIPTIONS_START = 'FETCH_MY_SUBSCRIPTIONS_START';
+export const FETCH_MY_SUBSCRIPTIONS_FAIL = 'FETCH_MY_SUBSCRIPTIONS_FAIL';
+export const FETCH_MY_SUBSCRIPTIONS_SUCCESS = 'FETCH_MY_SUBSCRIPTIONS_SUCCESS';


Can we drop MY from these? Or let me know what additional clarity it is providing if you think it should remain.

kauffj · 2018-05-10T16:39:51Z

src/renderer/redux/actions/subscriptions.js

+
+      // There is some mismatch between redux state and db state
+      // If something is in the db, but not in redux, add it to redux
+      // If something is in redux, but not in the db, add it to the db


I think this is the most reasonable choice and that we can't (or shouldn't) do anything differently immediately, but I also think it's guaranteed that this will cause a bug or confusion in the future.

update subscription types update changelog Simplify subscriptions sync logic add claim type use let over const change spinner color based on theme clean up subscriptions

lbry-bot assigned neb-b May 2, 2018

This was referenced May 2, 2018

Add "unsubscribe" button in the subscriptions overview #1396

Closed

Added the unsubscribe button and added a type to the category #1426

Closed

neb-b force-pushed the internal-subscriptions branch 2 times, most recently from b8f568e to 0331298 Compare May 2, 2018 21:21

lbryio deleted a comment May 2, 2018

neb-b force-pushed the internal-subscriptions branch from 0331298 to 019d6e2 Compare May 2, 2018 21:47

lbryio deleted a comment May 2, 2018

neb-b requested a review from kauffj May 2, 2018 21:58

lbry-bot assigned kauffj and unassigned neb-b May 2, 2018

neb-b requested a review from IGassmann May 2, 2018 21:58

lbry-bot assigned IGassmann May 2, 2018

neb-b requested a review from liamcardenas May 2, 2018 21:58

lbry-bot assigned liamcardenas May 2, 2018

neb-b removed the request for review from IGassmann May 2, 2018 21:58

lbry-bot unassigned IGassmann May 2, 2018

neb-b changed the title ~~[WIP] Internal subscriptions~~ Internal subscriptions May 3, 2018

neb-b force-pushed the internal-subscriptions branch 2 times, most recently from 8611169 to a22813b Compare May 5, 2018 22:16

neb-b commented May 5, 2018

View reviewed changes

neb-b commented May 7, 2018

View reviewed changes

src/renderer/redux/actions/subscriptions.js

}

};

export const doCheckSubscriptions = () => (

Copy link

Author

neb-b May 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also this, just moved it

neb-b force-pushed the internal-subscriptions branch from a22813b to 1fe95ce Compare May 7, 2018 04:51

neb-b unassigned liamcardenas May 7, 2018

neb-b removed the request for review from liamcardenas May 7, 2018 04:55

neb-b force-pushed the internal-subscriptions branch from f7737a6 to e301f64 Compare May 7, 2018 05:07

lyoshenka added this to the May 14 (app) milestone May 7, 2018

lbry-bot assigned neb-b and unassigned neb-b May 8, 2018

neb-b force-pushed the internal-subscriptions branch from 4bdd51f to 2a3003d Compare May 8, 2018 05:30

neb-b mentioned this pull request May 10, 2018

Add fetching/processing message to subscriptions #1387

Closed

neb-b force-pushed the internal-subscriptions branch 4 times, most recently from 22c8a8f to 87026c8 Compare May 10, 2018 16:18

neb-b requested a review from kauffj May 10, 2018 16:19

lbry-bot assigned kauffj and unassigned neb-b May 10, 2018

kauffj requested changes May 10, 2018

View reviewed changes

lbry-bot assigned neb-b and unassigned kauffj and neb-b May 10, 2018

neb-b requested a review from kauffj May 10, 2018 17:03

lbry-bot assigned kauffj and unassigned kauffj May 10, 2018

feature: use internal-apis for subscriptions and add page loader

492b160

update subscription types update changelog Simplify subscriptions sync logic add claim type use let over const change spinner color based on theme clean up subscriptions

kauffj force-pushed the internal-subscriptions branch from 101f135 to 492b160 Compare May 15, 2018 15:16

kauffj merged commit 492b160 into master May 15, 2018

neb-b deleted the internal-subscriptions branch May 23, 2018 17:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Internal subscriptions #1424

Internal subscriptions #1424

neb-b commented May 2, 2018 •

edited

neb-b May 5, 2018

neb-b May 7, 2018

neb-b May 7, 2018

neb-b May 7, 2018

neb-b May 7, 2018

neb-b commented May 10, 2018

kauffj left a comment

kauffj May 10, 2018

kauffj May 10, 2018

kauffj May 10, 2018

kauffj May 10, 2018

neb-b May 10, 2018

kauffj May 10, 2018

neb-b May 10, 2018

kauffj May 15, 2018

kauffj May 10, 2018

kauffj May 10, 2018

Internal subscriptions #1424

Internal subscriptions #1424

Conversation

neb-b commented May 2, 2018 • edited

Adds subscriptions to our internal-api database

Notes

Implementation

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neb-b commented May 10, 2018

kauffj left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neb-b commented May 2, 2018 •

edited