Merge branch 'master' into livestream-api

.env.defaults

@@ -11,7 +11,7 @@ WEB_SERVER_PORT=1337
 LBRY_WEB_API=https://api.na-backend.odysee.com
 LBRY_WEB_STREAMING_API=https://cdn.lbryplayer.xyz
 LBRY_WEB_BUFFER_API=https://collector-service.api.lbry.tv/api/v1/events/video
-COMMENT_SERVER_API=https://comments.lbry.com/api/v2
+COMMENT_SERVER_API=https://comments.odysee.com/api/v2
 THUMBNAIL_CDN_URL=https://image-processor.vanwanet.com/optimize/
 WELCOME_VERSION=1.0
 
@@ -46,6 +46,7 @@ YRBL_SAD_IMG_URL=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649
 #LOGO_TEXT_LIGHT=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd
 #LOGO_TEXT_DARK=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd
 #AVATAR_DEFAULT=
+#FAVICON=
 
 # LOCALE
 DEFAULT_LANGUAGE=en
@@ -67,6 +68,7 @@ AUTO_FOLLOW_CHANNELS=lbry://@lbry#3fda836a92faaceedfe398225fb9b2ee2ed1f01a
 
 ## FEATURES AND LIMITS
 SIMPLE_SITE=false
+#BRANDED_SITE
 
 ENABLE_COMMENT_REACTIONS=true
 ENABLE_FILE_REACTIONS=false
@@ -77,6 +79,8 @@ CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS=4
 CHANNEL_STAKED_LEVEL_LIVESTREAM=5
 WEB_PUBLISH_SIZE_LIMIT_GB=4
 LOADING_BAR_COLOR=#2bbb90
+LIGHTHOUSE_DEFAULT_TYPES=audio,video,text,image,application
+
 SHOW_ADS=true
 
 ## SIMPLE_SITE REPLACEMENTS

.lintstagedrc.json

@@ -3,7 +3,7 @@
     "ui/**/*.{js,jsx,scss,json}": ["prettier --write", "git add"],
     "web/**/*.{js,jsx,scss,json}": ["prettier --write", "git add"],
     "ui/**/*.{js,jsx}": ["eslint", "flow focus-check --color always", "git add"],
-    "web/**/*.{js,jsx,scss}": ["eslint", "git add"]
+    "web/**/*.{js,jsx}": ["eslint", "git add"]
   },
   "ignore": ["node_modules", "web/dist/**/*", "dist/**/*", "package-lock.json"]
 }

CHANGELOG.md

@@ -8,17 +8,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Show currently active playing item on playlist _community pr!_ ([#6453](https://github.com/lbryio/lbry-desktop/pull/6453))
 - Add watch later to hover action for last used playlist on popup _community pr!_ ([#6274](https://github.com/lbryio/lbry-desktop/pull/6274))
+- Open in desktop (web feature) _community pr!_ ([#6667](https://github.com/lbryio/lbry-desktop/pull/6667))
 
 ### Changed
 - Use Canonical Url for copy link ([#6500](https://github.com/lbryio/lbry-desktop/pull/6500))
 - Use better icon for copy link ([#6485](https://github.com/lbryio/lbry-desktop/pull/6485))
 - Comments load paginated ([#6390](https://github.com/lbryio/lbry-desktop/pull/6390))
+- Update lighthouse search api _community pr!_ ([#6731](https://github.com/lbryio/lbry-desktop/pull/6731))
+- Improve twitter share _community pr!_ ([#6690](https://github.com/lbryio/lbry-desktop/pull/6690))
 
 ### Fixed
 - App now supports '#' and ':' for claimId separator ([#6496](https://github.com/lbryio/lbry-desktop/pull/6496))
 - Fix "exact match" being applied to Recommended ([#6460](https://github.com/lbryio/lbry-desktop/pull/6460))
 - Fix upload button on creator analytics _community pr!_ ([#6458](https://github.com/lbryio/lbry-desktop/pull/6458))
 - Prevent sidebar shortcut activation on textarea _community pr!_ ([#6454](https://github.com/lbryio/lbry-desktop/pull/6454))
+- Improve accessibility and some minor css fixes _community pr!_ ([#6470](https:/github.com/lbryio/lbry-desktop/pull/6470))
+- Fix drag / drop publish issues for web users _community pr!_ ([#6466](https://github.com/lbryio/lbry-desktop/pull/6466))
+- Fix yarn copyenv on windows _community pr!_ ([#6702](https://github.com/lbryio/lbry-desktop/pull/6702))
+- Fix unnecessary livestream api calls in channel page _community pr!_ ([#6652](https://github.com/lbryio/lbry-desktop/pull/6652))
 
 ## [0.51.1] - [2021-06-26]
 

config.js

@@ -9,6 +9,7 @@ const config = {
   WEBPACK_ELECTRON_PORT: process.env.WEBPACK_ELECTRON_PORT,
   WEB_SERVER_PORT: process.env.WEB_SERVER_PORT,
   LBRY_WEB_API: process.env.LBRY_WEB_API, //api.na-backend.odysee.com',
+  LBRY_WEB_PUBLISH_API: process.env.LBRY_WEB_PUBLISH_API,
   LBRY_API_URL: process.env.LBRY_API_URL, //api.lbry.com',
   LBRY_WEB_STREAMING_API: process.env.LBRY_WEB_STREAMING_API, //cdn.lbryplayer.xyz',
   LBRY_WEB_BUFFER_API: process.env.LBRY_WEB_BUFFER_API,
@@ -25,9 +26,10 @@ const config = {
   // LOGO
   LOGO_TITLE: process.env.LOGO_TITLE,
   FAVICON: process.env.FAVICON,
-  LOGO_URL: process.env.LOGO_URL,
-  LOGO_TEXT_LIGHT_URL: process.env.LOGO_TEXT_LIGHT_URL,
-  LOGO_TEXT_DARK_URL: process.env.LOGO_TEXT_DARK_URL,
+  LOGO: process.env.LOGO,
+  LOGO_TEXT_LIGHT: process.env.LOGO_TEXT_LIGHT,
+  LOGO_TEXT_DARK: process.env.LOGO_TEXT_DARK,
+  AVATAR_DEFAULT: process.env.AVATAR_DEFAULT,
   // OG
   OG_TITLE_SUFFIX: process.env.OG_TITLE_SUFFIX,
   OG_HOMEPAGE_TITLE: process.env.OG_HOMEPAGE_TITLE,
@@ -63,7 +65,8 @@ const config = {
   ENABLE_MATURE: process.env.ENABLE_MATURE === 'true',
   CUSTOM_HOMEPAGE: process.env.CUSTOM_HOMEPAGE === 'true',
   SHOW_TAGS_INTRO: process.env.SHOW_TAGS_INTRO === 'true',
-  AVATAR_DEFAULT: process.env.AVATAR_DEFAULT,
+  LIGHTHOUSE_DEFAULT_TYPES: process.env.LIGHTHOUSE_DEFAULT_TYPES,
+  BRANDED_SITE: process.env.BRANDED_SITE,
 };
 
 config.URL_LOCAL = `http://localhost:${config.WEB_SERVER_PORT}`;

flow-typed/homepage.js

@@ -17,7 +17,7 @@ declare type RowDataItem = {
   help?: any,
   icon?: string,
   extra?: any,
-  pinUrls?: Array<string>,
+  pinnedUrls?: Array<string>,
   options?: {
     channelIds?: Array<string>,
     limitClaimsPerChannel?: number,

homepages/meme/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+  text: `This is LBRY`,
+  url: 'https://odysee.com/@Odysee:8?view=discussion',
+};

package.json

@@ -24,7 +24,7 @@
     "compile:electron": "node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js --config webpack.electron.config.js",
     "compile:web": "yarn copyenv && cd web && node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js --config webpack.config.js",
     "compile": "cross-env NODE_ENV=production yarn compile:electron && cross-env NODE_ENV=production yarn compile:web",
-    "copyenv": "cp ./.env* web/",
+    "copyenv": "copyfiles ./.env* web/",
     "dev": "yarn dev:electron",
     "dev:electron": "cross-env NODE_ENV=development node ./electron/devServer.js",
     "dev:web": "yarn copyenv && cd web && yarn dev",
@@ -107,6 +107,7 @@
     "concurrently": "^4.1.2",
     "connected-react-router": "^6.8.0",
     "copy-webpack-plugin": "^5.1.2",
+    "copyfiles": "^2.4.1",
     "country-data": "^0.0.31",
     "cross-env": "^7.0.3",
     "crypto-js": "^4.0.0",