sync user settings

package-lock.json

@@ -5574,8 +5574,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#3133ea60b0302c162f7b6f67cc858997f1d2ab52",
-            "from": "github:lbryio/lbry-redux#3133ea60b0302c162f7b6f67cc858997f1d2ab52",
+            "version": "github:lbryio/lbry-redux#e5443aafcfa7450c97e4edf838859352be6ca220",
+            "from": "github:lbryio/lbry-redux#e5443aafcfa7450c97e4edf838859352be6ca220",
             "requires": {
                 "proxy-polyfill": "0.1.6",
                 "reselect": "^3.0.0",

package.json

@@ -12,7 +12,7 @@
         "base-64": "^0.1.0",
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
-        "lbry-redux": "lbryio/lbry-redux#123efacf4d45289ebda9dc291976d475de227a55",
+        "lbry-redux": "lbryio/lbry-redux#e5443aafcfa7450c97e4edf838859352be6ca220",
         "lbryinc": "lbryio/lbryinc#b9f354ae50bd57691765a7d042c5054167878bf4",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",

src/index.js

@@ -15,6 +15,7 @@ import {
   walletReducer,
 } from 'lbry-redux';
 import {
+  Lbryio,
   authReducer,
   blacklistReducer,
   costInfoReducer,
@@ -41,6 +42,7 @@ import formReducer from 'redux/reducers/form';
 import drawerReducer from 'redux/reducers/drawer';
 import settingsReducer from 'redux/reducers/settings';
 import thunk from 'redux-thunk';
+import isEqual from 'utils/deep-equal';
 
 const globalExceptionHandler = (error, isFatal) => {
   if (error && NativeModules.Firebase) {
@@ -145,22 +147,25 @@ const persistor = persistStore(store, persistOptions, err => {
 });
 window.persistor = persistor;
 
-/*
-const persistFilter = {
-  'auth': ['authToken'],
-  'claims': ['byId', 'claimsByUri'],
-  'content': ['positions'],
-  'subscriptions': ['enabledChannelNotifications', 'subscriptions'],
-  'settings': ['clientSettings'],
-  'tags': ['followedTags'],
-  'wallet': ['receiveAddress']
-};
-
+let currentPayload;
 store.subscribe(() => {
-  const state = (({ auth, claims, content, subscriptions, settings, tags, wallet }) =>
-    ({ auth, claims, content, subscriptions, settings, tags, wallet }))(store.getState());
-  NativeModules.StatePersistor.update(state, persistFilter);
-}); */
+  const state = store.getState();
+  const subscriptions = state.subscriptions.subscriptions.map(({ uri }) => uri);
+  const tags = state.tags.followedTags;
+
+  const newPayload = {
+    version: '0',
+    shared: {
+      subscriptions,
+      tags,
+    },
+  };
+
+  if (!isEqual(newPayload, currentPayload)) {
+    currentPayload = newPayload;
+    Lbryio.call('user_settings', 'set', { settings: JSON.stringify(newPayload) });
+  }
+});
 
 // TODO: Find i18n module that is compatible with react-native
 global.__ = str => str;

src/page/splash/index.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { doBalanceSubscribe, doUpdateBlockHeight, doToast } from 'lbry-redux';
+import { doBalanceSubscribe, doUpdateBlockHeight, doPopulateSharedUserState, doToast } from 'lbry-redux';
 import {
   doAuthenticate,
   doBlackListedOutpointsSubscribe,
@@ -34,6 +34,7 @@ const perform = dispatch => ({
   notify: data => dispatch(doToast(data)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
   setEmailToVerify: email => dispatch(doUserEmailToVerify(email)),
+  populateSharedUserState: settings => dispatch(doPopulateSharedUserState(settings)),
   updateBlockHeight: () => dispatch(doUpdateBlockHeight()),
   verifyUserEmail: (token, recaptcha) => dispatch(doUserEmailVerify(token, recaptcha)),
   verifyUserEmailFailure: error => dispatch(doUserEmailVerifyFailure(error)),

src/page/splash/view.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Lbry } from 'lbry-redux';
+import { Lbryio } from 'lbryinc';
 import { ActivityIndicator, Linking, NativeModules, Platform, Text, View } from 'react-native';
 import { NavigationActions, StackActions } from 'react-navigation';
 import { decode as atob } from 'base-64';
@@ -15,6 +16,8 @@ import splashStyle from 'styles/splash';
 
 const BLOCK_HEIGHT_INTERVAL = 1000 * 60 * 2.5; // every 2.5 minutes
 
+const SETTINGS_GET_INTERVAL = 1000 * 60 * 5; // every 5 minutes
+
 const testingNetwork = 'Testing network';
 const waitingForResolution = 'Waiting for name resolution';
 
@@ -108,6 +111,19 @@ class SplashScreen extends React.PureComponent {
     }
   }
 
+  getUserSettings = () => {
+    const { populateSharedUserState } = this.props;
+    Lbryio.call('user_settings', 'get')
+      .then(settings => {
+        console.log('***populate with settings***');
+        console.log(settings);
+        populateSharedUserState(settings);
+      })
+      .catch(err => {
+        console.log(err);
+      });
+  };
+
   finishSplashScreen = () => {
     const {
       authenticate,
@@ -127,6 +143,10 @@ class SplashScreen extends React.PureComponent {
       filteredOutpointsSubscribe();
       checkSubscriptionsInit();
 
+      // get user settings interval
+      this.getUserSettings();
+      setInterval(() => this.getUserSettings(), SETTINGS_GET_INTERVAL);
+
       if (user && user.id && user.has_verified_email) {
         // user already authenticated
         NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {

src/utils/deep-equal.js

@@ -0,0 +1,117 @@
+/* eslint-disable */
+// underscore's deep equal function
+// https://github.com/jashkenas/underscore/blob/master/underscore.js#L1189
+
+export default function isEqual(a, b, aStack, bStack) {
+  // Identical objects are equal. `0 === -0`, but they aren't identical.
+  // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
+  if (a === b) return a !== 0 || 1 / a === 1 / b;
+  // `null` or `undefined` only equal to itself (strict comparison).
+  if (a == null || b == null) return false;
+  // `NaN`s are equivalent, but non-reflexive.
+  if (a !== a) return b !== b;
+  // Exhaust primitive checks
+  var type = typeof a;
+  if (type !== 'function' && type !== 'object' && typeof b != 'object') return false;
+  return deepEq(a, b, aStack, bStack);
+}
+
+function deepEq(a, b, aStack, bStack) {
+  // Compare `[[Class]]` names.
+  var className = toString.call(a);
+  if (className !== toString.call(b)) return false;
+  switch (className) {
+    // Strings, numbers, regular expressions, dates, and booleans are compared by value.
+    case '[object RegExp]':
+    // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
+    case '[object String]':
+      // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+      // equivalent to `new String("5")`.
+      return '' + a === '' + b;
+    case '[object Number]':
+      // `NaN`s are equivalent, but non-reflexive.
+      // Object(NaN) is equivalent to NaN.
+      if (+a !== +a) return +b !== +b;
+      // An `egal` comparison is performed for other numeric values.
+      return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+    case '[object Date]':
+    case '[object Boolean]':
+      // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+      // millisecond representations. Note that invalid dates with millisecond representations
+      // of `NaN` are not equivalent.
+      return +a === +b;
+    case '[object Symbol]':
+      return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b);
+  }
+
+  var areArrays = className === '[object Array]';
+  if (!areArrays) {
+    if (typeof a != 'object' || typeof b != 'object') return false;
+
+    // Objects with different constructors are not equivalent, but `Object`s or `Array`s
+    // from different frames are.
+    var aCtor = a.constructor,
+      bCtor = b.constructor;
+    if (
+      aCtor !== bCtor &&
+      !(
+        typeof aCtor === 'function' &&
+        aCtor instanceof aCtor &&
+        typeof bCtor === 'function' &&
+        bCtor instanceof bCtor
+      ) &&
+      ('constructor' in a && 'constructor' in b)
+    ) {
+      return false;
+    }
+  }
+  // Assume equality for cyclic structures. The algorithm for detecting cyclic
+  // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+
+  // Initializing stack of traversed objects.
+  // It's done here since we only need them for objects and arrays comparison.
+  aStack = aStack || [];
+  bStack = bStack || [];
+  var length = aStack.length;
+  while (length--) {
+    // Linear search. Performance is inversely proportional to the number of
+    // unique nested structures.
+    if (aStack[length] === a) return bStack[length] === b;
+  }
+
+  // Add the first object to the stack of traversed objects.
+  aStack.push(a);
+  bStack.push(b);
+
+  // Recursively compare objects and arrays.
+  if (areArrays) {
+    // Compare array lengths to determine if a deep comparison is necessary.
+    length = a.length;
+    if (length !== b.length) return false;
+    // Deep compare the contents, ignoring non-numeric properties.
+    while (length--) {
+      if (!isEqual(a[length], b[length], aStack, bStack)) return false;
+    }
+  } else {
+    // Deep compare objects.
+    var keys = Object.keys(a),
+      key;
+    length = keys.length;
+    // Ensure that both objects contain the same number of properties before comparing deep equality.
+    if (Object.keys(b).length !== length) return false;
+    while (length--) {
+      // Deep compare each member
+      key = keys[length];
+      if (!(has(b, key) && isEqual(a[key], b[key], aStack, bStack))) return false;
+    }
+  }
+  // Remove the first object from the stack of traversed objects.
+  aStack.pop();
+  bStack.pop();
+  return true;
+}
+
+function has(obj, path) {
+  return obj != null && hasOwnProperty.call(obj, path);
+}
+/* eslint-enable */