Merge pull request #119 from lbryio/invites-canonical-urls

canonical urls for invite links

package-lock.json

@@ -7067,8 +7067,8 @@
             }
         },
         "lbry-redux": {
-            "version": "github:lbryio/lbry-redux#acbbc66b78566da11faa0fa8c65b44a8d4302c5e",
-            "from": "github:lbryio/lbry-redux#acbbc66b78566da11faa0fa8c65b44a8d4302c5e",
+            "version": "github:lbryio/lbry-redux#1de1d534c982db913f145a6171f39d7b8ebd61af",
+            "from": "github:lbryio/lbry-redux#1de1d534c982db913f145a6171f39d7b8ebd61af",
             "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#acbbc66b78566da11faa0fa8c65b44a8d4302c5e",
+        "lbry-redux": "lbryio/lbry-redux#1de1d534c982db913f145a6171f39d7b8ebd61af",
         "lbryinc": "lbryio/lbryinc#138a053754ec8e3da8e9bf153d32f527c962f25c",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",

src/component/channelSelector/index.js

@@ -19,11 +19,11 @@ const select = state => ({
 const perform = dispatch => ({
   notify: data => dispatch(doToast(data)),
   createChannel: (name, amount) => dispatch(doCreateChannel(name, amount)),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
   getSync: (password, callback) => dispatch(doGetSync(password, callback)),
 });
 
 export default connect(
   select,
-  perform
+  perform,
 )(ChannelSelector);

src/component/drawerContent/index.js

@@ -9,10 +9,10 @@ const select = state => ({
 });
 
 const perform = dispatch => ({
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
 });
 
 export default connect(
   select,
-  perform
+  perform,
 )(DrawerContent);

src/page/channel/index.js

@@ -18,7 +18,7 @@ const select = (state, props) => ({
 
 const perform = dispatch => ({
   abandonClaim: (txid, nout) => dispatch(doAbandonClaim(txid, nout)),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
   fetchSubCount: claimId => dispatch(doFetchSubCount(claimId)),
   popDrawerStack: () => dispatch(doPopDrawerStack()),
   setSortByItem: item => dispatch(doSetSortByItem(item)),
@@ -27,5 +27,5 @@ const perform = dispatch => ({
 
 export default connect(
   select,
-  perform
+  perform,
 )(ChannelPage);

src/page/channelCreator/index.js

@@ -42,7 +42,7 @@ const perform = dispatch => ({
   notify: data => dispatch(doToast(data)),
   clearChannelFormState: () => dispatch(doClearChannelFormState()),
   createChannel: (name, amount, optionalParams) => dispatch(doCreateChannel(name, amount, optionalParams)),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
   getSync: (password, callback) => dispatch(doGetSync(password, callback)),
   updateChannel: params => dispatch(doUpdateChannel(params)),
   updateChannelFormState: data => dispatch(doUpdateChannelFormState(data)),

src/page/file/index.js

@@ -82,7 +82,7 @@ const perform = dispatch => ({
   fetchFileInfo: uri => dispatch(doFetchFileInfo(uri)),
   fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
   fetchMyClaims: () => dispatch(doFetchClaimListMine()),
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
   fetchViewCount: claimId => dispatch(doFetchViewCount(claimId)),
   fileGet: (uri, saveFile) => dispatch(doFileGet(uri, saveFile)),
   notify: data => dispatch(doToast(data)),

src/page/invites/index.js

@@ -32,7 +32,7 @@ const select = state => ({
 });
 
 const perform = dispatch => ({
-  fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
+  fetchChannelListMine: () => dispatch(doFetchChannelListMine(1, 99999, true)),
   fetchInviteStatus: () => dispatch(doFetchInviteStatus()),
   inviteNew: email => dispatch(doUserInviteNew(email)),
   pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_INVITES)),

src/page/invites/view.js

@@ -68,7 +68,8 @@ class InvitesPage extends React.PureComponent {
   };
 
   getLinkForChannel = channel => {
-    const { claimId, claimName } = parseURI(channel.permanent_url);
+    const parsedUrl = channel.canonical_url ? parseURI(channel.canonical_url) : parseURI(channel.permanent_url);
+    const { claimId, claimName } = parsedUrl;
     return `https://lbry.tv/$/invite/${claimName}:${claimId}`;
   };
 

src/utils/helper.js

@@ -10,6 +10,7 @@ const specialRouteMap = {
   about: Constants.DRAWER_ROUTE_ABOUT,
   allContent: Constants.DRAWER_ROUTE_TRENDING,
   channels: Constants.DRAWER_ROUTE_CHANNEL_CREATOR,
+  invite: Constants.DRAWER_ROUTE_INVITES,
   invites: Constants.DRAWER_ROUTE_INVITES,
   library: Constants.DRAWER_ROUTE_MY_LBRY,
   publish: Constants.DRAWER_ROUTE_PUBLISH,