Integrate lbry redux and lbryinc #7240

jessopb · 2021-10-08T13:52:32Z

Moves all Lbry interface and all redux files into app redux.
Moves lbryinc module to 'extras'

jessopb · 2021-10-08T14:04:34Z

extras/lbryinc/index.js

+export { doTransifexUpload } from 'util/transifex-upload';
+
+// actions
+export { doGenerateAuthToken } from './redux/actions/auth';


added relative path here: './redux/actions/auth'

jessopb · 2021-10-08T14:05:53Z

extras/lbryinc/redux/actions/blacklist.js

@@ -0,0 +1,52 @@
+import { Lbryio } from 'lbryinc';
+import * as ACTIONS from 'constants/action_types';


unsure whether to leave lbryinc actions separate (import relatively) or move them all into the main actions_types file.

jessopb · 2021-10-08T14:06:40Z

extras/lbryinc/redux/actions/homepage.js

@@ -0,0 +1,79 @@
+import Lbryio from 'lbryinc';


I disabled the import for the homepage actions, selectors, reducer. Should probably delete it.

jessopb · 2021-10-08T14:19:47Z

webpack.base.config.js

@@ -78,7 +78,7 @@ let baseConfig = {
      homepage: 'util/homepage.js',
      homepages: process.env.CUSTOM_HOMEPAGE === 'true' ? path.resolve(__dirname, 'custom/homepages/v2/index.js') : ('homepages/index.js'),
      memes: process.env.CUSTOM_HOMEPAGE === 'true' ? path.resolve(__dirname, 'custom/homepages/meme/index.js') : path.resolve(__dirname, 'homepages/meme/index.js'),
-      lbryinc: 'lbryinc/dist/bundle.es.js',
+      lbryinc: 'extras/lbryinc',


I moved this alias to internal folder path.

I fully merged lbry-redux stuff, but I didn't do the same for lbryinc. It may make sense to merge some of it but not others - but I got impatient and just wanted to hook it up.

I had to merge lbryinc because it had some dependencies on lbry-redux it was importing.

jessopb · 2021-10-08T14:20:17Z

web/webpack.config.js

@@ -170,7 +170,7 @@ const webConfig = {
    modules: [UI_ROOT, __dirname],

    alias: {
-      lbryinc: 'lbryinc/dist/bundle.es.js',
+      lbryinc: '../extras/lbryinc',
      electron: `${WEB_PLATFORM_ROOT}/stubs/electron.js`,


lbryinc alias to internal folder path.

jessopb · 2021-10-08T14:24:17Z

ui/reducers.js

-import { claimsReducer, fileInfoReducer, walletReducer, publishReducer, collectionsReducer } from 'lbry-redux';
-import { costInfoReducer, blacklistReducer, filteredReducer, homepageReducer, statsReducer, webReducer } from 'lbryinc';
+import { costInfoReducer, blacklistReducer, filteredReducer, statsReducer, webReducer } from 'lbryinc';
+import { claimsReducer } from 'redux/reducers/claims';


import reducers locally (these are named exports - I didn't rewrite them or default them).
lbryinc now imports from extras folder.

jessopb · 2021-10-08T14:28:50Z

ui/lbry.js

@@ -0,0 +1,247 @@
+// @flow
+// import 'proxy-polyfill';


unsure whether I need this proxy-polyfill

jessopb · 2021-10-08T14:35:39Z

package.json

@@ -156,8 +158,6 @@
    "imagesloaded": "^4.1.4",
    "json-loader": "^0.5.4",
    "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676",
-    "lbryinc": "lbryio/lbryinc#0b4e41ef90d6347819dd3453f2f9398a5c1b4f36",


infinite-persistence

Quick initial-first pass: looks good. Will test further.

static/app-strings.json

ui/component/claimPreview/index.js

infinite-persistence · 2021-10-12T07:21:15Z

ui/util/lbryURI.js

+
+  if (!isProduction) {
+    if (claimId) {
+      console.error(__("'claimId' should no longer be used. Use 'streamClaimId' or 'channelClaimId' instead"));


This error is happening constantly, with variations in livestreams.

If it's a direct copy, I'm guessing it's also happening in the past, just not displayed, so probably not a big deal. But curious what surfaced it.

infinite-persistence · 2021-10-12T07:27:15Z

extras/lbryinc/constants/action_types.js

+export const FETCH_BLACK_LISTED_CONTENT_STARTED = 'FETCH_BLACK_LISTED_CONTENT_STARTED';
+export const FETCH_BLACK_LISTED_CONTENT_COMPLETED = 'FETCH_BLACK_LISTED_CONTENT_COMPLETED';
+export const FETCH_BLACK_LISTED_CONTENT_FAILED = 'FETCH_BLACK_LISTED_CONTENT_FAILED';
+export const BLACK_LISTED_CONTENT_SUBSCRIBE = 'BLACK_LISTED_CONTENT_SUBSCRIBE';


unsure whether to leave lbryinc actions separate (import relatively) or move them all into the main actions_types file.

Mixed feelings on two action_types.js too. There are duplicates on both sides (just like in the past). It's not clear to new comers which one takes precedence -- the main one, or extras?

bugfix wip flow fix cleaning clean

jessopb · 2021-10-12T19:57:45Z

QQ

jessopb commented Oct 8, 2021

View reviewed changes

jessopb requested a review from infinite-persistence October 11, 2021 21:38

lbry-bot assigned infinite-persistence Oct 11, 2021

infinite-persistence reviewed Oct 12, 2021

View reviewed changes

lbry-bot unassigned infinite-persistence Oct 12, 2021

jessopb marked this pull request as ready for review October 12, 2021 16:03

integrate all the things

d2f6c9d

bugfix wip flow fix cleaning clean

jessopb force-pushed the integrate-lbryReduxAndLbryinc branch from 54240a7 to d2f6c9d Compare October 12, 2021 19:23

jessopb added 3 commits October 12, 2021 15:39

lint

181f82b

lint

a5eef1b

lint

d664751

jessopb added 6 commits October 13, 2021 09:30

lint

ed3cef4

lint

263175a

more flow

7e8595a

recsys import

356eb62

cleanup

01d8932

nudge

d6f2223

jessopb merged commit d405ff5 into master Oct 16, 2021

jessopb deleted the integrate-lbryReduxAndLbryinc branch October 16, 2021 03:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate lbry redux and lbryinc #7240

Integrate lbry redux and lbryinc #7240

jessopb commented Oct 8, 2021 •

edited

Loading

jessopb Oct 8, 2021

jessopb Oct 8, 2021

jessopb Oct 8, 2021 •

edited

Loading

jessopb Oct 8, 2021

jessopb Oct 8, 2021

jessopb Oct 8, 2021

jessopb Oct 8, 2021

jessopb Oct 8, 2021

jessopb Oct 8, 2021

jessopb Oct 8, 2021

infinite-persistence left a comment

infinite-persistence Oct 12, 2021

infinite-persistence Oct 12, 2021 •

edited

Loading

jessopb commented Oct 12, 2021

		@@ -0,0 +1,52 @@
		import { Lbryio } from 'lbryinc';
		import * as ACTIONS from 'constants/action_types';

Integrate lbry redux and lbryinc #7240

Integrate lbry redux and lbryinc #7240

Conversation

jessopb commented Oct 8, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jessopb Oct 8, 2021 • edited Loading

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

infinite-persistence left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

infinite-persistence Oct 12, 2021 • edited Loading

Choose a reason for hiding this comment

jessopb commented Oct 12, 2021

jessopb commented Oct 8, 2021 •

edited

Loading

jessopb Oct 8, 2021 •

edited

Loading

infinite-persistence Oct 12, 2021 •

edited

Loading