Merge branch 'master' into poe

.env.defaults

@@ -18,6 +18,7 @@ SITE_TITLE=lbry.tv
 SITE_NAME=LBRY
 SITE_DESCRIPTION=Meet LBRY, an open, free, and community-controlled content wonderland.
 LOGO_TITLE=lbry.tv
+SIMPLE_SITE=false
 # OG
 
 OG_TITLE_SUFFIX=| lbry.tv
@@ -30,6 +31,8 @@ DEFAULT_LANGUAGE=en
 # Custom Content
 # If the following is true, copy custom/homepage.example.js to custom/homepage.js and modify
 CUSTOM_HOMEPAGE=false
+# Add channels to auto-follow on first run
+AUTO_FOLLOW_CHANNELS=lbry://@lbrycast#4c29f8b013adea4d5cca1861fb2161d5089613ea lbry://@lbry#3fda836a92faaceedfe398225fb9b2ee2ed1f01a
 # Add up to 2 sidebar links:
 # PINNED_URI_1=@Lbrylatam#2/Integracionesporseguridad#4
 # PINNED_LABEL_1=LBRY LATAM

.flowconfig

@@ -8,6 +8,10 @@
 node_modules/lbry-redux/flow-typed/
 node_modules/lbryinc/flow-typed/
 
+[untyped]
+.*/node_modules/lbry-redux
+.*/node_modules/lbryinc
+
 [lints]
 
 [options]

CHANGELOG.md

@@ -7,8 +7,38 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased on desktop]
 
 ### Added
+- Block mature content when accessed directly from URL _community pr!_ ([#4560](https://github.com/lbryio/lbry-desktop/pull/4560))
 
-- Upload your files published via the desktop app to youtube ([#4491](https://github.com/lbryio/lbry-desktop/pull/4491))
+### Changed
+
+### Fixed
+- Fix sluggish Back button when navigation back to channels with lots of comments _community pr!_ ([#4576](https://github.com/lbryio/lbry-desktop/pull/4576))
+
+## [0.47.1] - [2020-07-23]
+
+### Added
+
+- Allow zooming on Desktop _community pr!_ ([#4513](https://github.com/lbryio/lbry-desktop/pull/4513))
+- Show "YT Creator" label in File Page as well _community pr!_ ([#4523](https://github.com/lbryio/lbry-desktop/pull/4523))
+- Add option to retry video stream on failure _community pr!_ ([#4541](https://github.com/lbryio/lbry-desktop/pull/4541))
+- Allow blocking channels from comments ([#4557](https://github.com/lbryio/lbry-desktop/pull/4557))
+
+### Changed
+
+- Updated lbry-sdk to [0.79.1](https://github.com/lbryio/lbry-sdk/releases/tag/v0.79.1)
+
+### Fixed
+
+- Fix 'transcoding' checkbox state when switching file types _community pr!_ ([#4529](https://github.com/lbryio/lbry-desktop/pull/4529))
+- Fix channel file-search not available in mobile _community pr!_ ([#4527](https://github.com/lbryio/lbry-desktop/pull/4527))
+- New Channel: Fix incorrect GUI configuration at entry _community pr!_ ([#4545](https://github.com/lbryio/lbry-desktop/pull/4545))
+- Hide blocked channels in comments ([#4557](https://github.com/lbryio/lbry-desktop/pull/4557))
+
+## [0.47.0] - [2020-07-13]
+
+### Added
+
+- Add ability to sign supports ([#4382](https://github.com/lbryio/lbry-desktop/pull/4382))
 - Add "tap to unmute" button for videos that start with audio muted _community pr!_ ([#4365](https://github.com/lbryio/lbry-desktop/pull/4365))
 - Allow upgrade bar to be dismissed per session _community pr!_ ([#4413](https://github.com/lbryio/lbry-desktop/pull/4413))
 - Pause the "autoplay next" timer when performing long operations such as Tipping, Supporting or commenting _community pr!_ ([4419](https://github.com/lbryio/lbry-desktop/pull/4419))
@@ -35,6 +65,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix "Refresh" on Publish page not showing the loading indicator when pressed _community pr!_ ([#4451](https://github.com/lbryio/lbry-desktop/pull/4451))
 - Fix video duration not appearing on Mobile with enough width _community pr!_ ([#4452](https://github.com/lbryio/lbry-desktop/pull/4452))
 - Fix video transcode setting not reflected correctly (MP3 incorrectly transcoded to MP4) _community pr!_ ([#4458](https://github.com/lbryio/lbry-desktop/pull/4458))
+- Fix scrolling glitch when results are exactly the page size _community pr!_ ([#4521](https://github.com/lbryio/lbry-desktop/pull/4521))
 - Fix search results not appearing when scrolling due to long Tags or Following list in the navigation bar _community pr!_ ([#4465](https://github.com/lbryio/lbry-desktop/pull/4465))
 - Fix unmuted state lost or reverted when playing a new video _community pr!_ ([#4483](https://github.com/lbryio/lbry-desktop/pull/4483))
 

README.md

@@ -113,6 +113,9 @@ nano .env
 - To specify your own OG-IMAGE
 You can either place a png named v2-og.png in the /custom folder or specify the OG_IMAGE_URL in .env
 
+- To specify your own channels to be followed on first run
+`AUTO_FOLLOW_URLS=lbry://@chan#123...a lbry://@chan2#456...a`
+
 - If you want to customize the homepage content
 
 1. add `CUSTOM_HOMEPAGE=true` to the '.env' file

build/signBuildFiles.js

@@ -126,16 +126,17 @@ function downloadAssets() {
     .then(({ data }) => {
       const release_id = data.id;
 
-      return octokit.repos.listAssetsForRelease({
+      return octokit.repos.listReleases({
         owner: 'lbryio',
         repo: 'lbry-desktop',
         release_id,
       });
     })
     .then(({ data }) => {
-      fileCountToDownload = data.length;
-
-      data
+      const releaseToDownload = data.filter(releaseData => releaseData.tag_name === versionToSign)[0];
+      const assets = releaseToDownload.assets;
+      fileCountToDownload = assets.length;
+      assets
         .map(({ browser_download_url, name }) => ({ download_url: browser_download_url, name }))
         .forEach(({ name, download_url }) => {
           const fileName = path.resolve(__dirname, `../dist/releaseDownloads/${name}`);

config.js

@@ -1,6 +1,6 @@
 // On Web, this will find .env.defaults and optional .env in web/
 // On Desktop App, this will find .env.defaults and optional .env in root dir
-require('dotenv-defaults').config({silent: false});
+require('dotenv-defaults').config({ silent: false });
 const config = {
   MATOMO_URL: process.env.MATOMO_URL,
   MATOMO_ID: process.env.MATOMO_ID,
@@ -21,7 +21,8 @@ const config = {
   OG_IMAGE_URL: process.env.OG_IMAGE_URL,
   SITE_CANONICAL_URL: process.env.SITE_CANONICAL_URL,
   DEFAULT_LANGUAGE: process.env.DEFAULT_LANGUAGE,
-
+  AUTO_FOLLOW_CHANNELS: process.env.AUTO_FOLLOW_CHANNELS,
+  SIMPLE_SITE: process.env.SIMPLE_SITE === 'true',
   PINNED_URI_1: process.env.PINNED_URI_1,
   PINNED_LABEL_1: process.env.PINNED_LABEL_1,
   PINNED_URI_2: process.env.PINNED_URI_2,

electron/menu/setupBarMenu.js

@@ -1,4 +1,5 @@
 import { app, Menu, shell } from 'electron';
+import { changeZoomFactor, ZOOM } from 'util/zoomWindow';
 
 export default () => {
   const template = [
@@ -22,6 +23,38 @@ export default () => {
       label: 'View',
       submenu: [
         { role: 'reload' },
+        {
+          label: 'Zoom',
+          submenu: [
+            {
+              label: 'Zoom In',
+              accelerator: 'CmdOrCtrl+=',
+              click: (menuItem, browserWindow) => {
+                if (browserWindow) {
+                  browserWindow.webContents.send('zoom-window', ZOOM.INCREMENT);
+                }
+              },
+            },
+            {
+              label: 'Zoom Out',
+              accelerator: 'CmdOrCtrl+-',
+              click: (menuItem, browserWindow) => {
+                if (browserWindow) {
+                  browserWindow.webContents.send('zoom-window', ZOOM.DECREMENT);
+                }
+              },
+            },
+            {
+              label: 'Reset Zoom',
+              accelerator: 'CmdOrCtrl+0',
+              click: (menuItem, browserWindow) => {
+                if (browserWindow) {
+                  browserWindow.webContents.send('zoom-window', ZOOM.RESET);
+                }
+              },
+            },
+          ],
+        },
         {
           label: 'Developer',
           submenu: [{ role: 'forcereload' }, { role: 'toggledevtools' }],

flow-typed/notification.js

@@ -0,0 +1,31 @@
+// @flow
+declare type WebNotification = {
+  active_at: string,
+  created_at: string,
+  id: number,
+  is_app_readable: boolean,
+  is_device_notified: boolean,
+  is_emailed: boolean,
+  is_read: boolean,
+  notification_parameters: {
+    device: {
+      analytics_label: string,
+      image_url: string,
+      is_data_only: boolean,
+      name: string,
+      placeholders: ?string,
+      target: string,
+      text: string,
+      title: string,
+      type: string,
+    },
+    dynamic: {
+      comment_author: string,
+    },
+    email: {},
+  },
+  notification_rule: string,
+  type: string,
+  updated_at: string,
+  user_id: number,
+};

flow-typed/user.js

@@ -27,4 +27,5 @@ declare type User = {
   youtube_channels: ?Array<string>,
   device_types: Array<DeviceType>,
   lbry_first_approved: boolean,
+  experimental_ui: boolean,
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.47.0-rc.3",
+  "version": "0.47.1",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
@@ -71,7 +71,6 @@
     "@datapunt/matomo-tracker-js": "^0.1.4",
     "@exponent/electron-cookies": "^2.0.0",
     "@hot-loader/react-dom": "^16.8",
-    "@lbry/components": "^4.2.5",
     "@reach/menu-button": "0.7.4",
     "@reach/rect": "^0.2.1",
     "@reach/tabs": "^0.1.5",
@@ -136,7 +135,7 @@
     "imagesloaded": "^4.1.4",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#e6d89b06909b7f3a280e25625669f64ce06f340d",
+    "lbry-redux": "lbryio/lbry-redux#a1d5ce7e7e854c1c11e630609ef06a98e3b100c1",
     "lbryinc": "lbryio/lbryinc#cff5dd60934c4c6080e135f47ebbece1548c658c",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
@@ -193,7 +192,7 @@
     "tiny-relative-date": "^1.3.0",
     "tree-kill": "^1.1.0",
     "unist-util-visit": "^1.4.1",
-    "video.js": "7.6.6",
+    "video.js": "7.8.4",
     "videojs-event-tracking": "^1.0.1",
     "villain-react": "^1.0.9",
     "wavesurfer.js": "^2.2.1",
@@ -214,11 +213,11 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.77.0",
+    "lbrynetDaemonVersion": "0.79.1",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet",
-    "LBRYFirstVersion": "0.0.19",
+    "LBRYFirstVersion": "0.0.20",
     "LBRYFirstUrlTemplate": "https://github.com/lbryio/lbry-first/releases/download/vLBRYFIRSTVER/lbry-first_OSNAME_amd64.zip",
     "LBRYFirstDir": "static/lbry-first",
     "LBRYFirstFileName": "lbry-first"