Merge branch 'development' of https://github.com/FreeTubeApp/FreeTube into fix-blog-notification

Author: vallode

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -75,24 +75,24 @@ body:
       required: true
   - type: dropdown
     attributes:
-      label: 'Installation Method (If applicable)'
+      label: Installation Method
       options:
+        - .apk
         - .AppImage
+        - AUR
+        - Chocolatey
         - .deb
         - .dmg
         - .exe
         - Flathub
+        - .pacman
         - Portable
         - .rpm
+        - winget
         - .zip
         - other
     validations:
-      required: false
-  - type: input
-    attributes:
-      label: 'Last Known Working FreeTube Version (If Any)'
-      description: What is the last version of FreeTube this worked in, if applicable?
-      placeholder: v0.14.0
+      required: true
   - type: dropdown
     attributes: 
       label: Primary API used
@@ -102,7 +102,12 @@ body:
         - Local API
         - Invidious API
     validations:
-      required: false
+      required: true
+  - type: input
+    attributes:
+      label: 'Last Known Working FreeTube Version (If Any)'
+      description: What is the last version of FreeTube this worked in, if applicable?
+      placeholder: v0.14.0
   - type: textarea
     attributes:
       label: Additional Information

package.json

@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,
@@ -60,9 +60,7 @@
     "js-yaml": "^4.1.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
-    "lodash.uniqwith": "^4.5.0",
-    "marked": "^4.0.15",
-    "material-design-icons": "^3.0.1",
+    "marked": "^4.0.17",
     "nedb-promises": "^5.0.1",
     "opml-to-json": "^1.0.1",
     "rss-parser": "^3.12.0",
@@ -71,10 +69,8 @@
     "videojs-contrib-quality-levels": "^2.1.0",
     "videojs-http-source-selector": "^1.1.6",
     "videojs-overlay": "^2.1.4",
-    "videojs-replay": "^1.1.0",
     "videojs-vtt-thumbnails-freetube": "0.0.15",
     "vue": "^2.6.14",
-    "vue-electron": "^1.0.6",
     "vue-i18n": "^8.25.0",
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.5.2",
@@ -96,7 +92,7 @@
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "5.2.6",
     "electron": "^16.2.7",
-    "electron-builder": "^22.11.7",
+    "electron-builder": "^23.0.3",
     "electron-builder-squirrel-windows": "^22.13.1",
     "electron-debug": "^3.2.0",
     "eslint": "^7.32.0",
@@ -108,11 +104,9 @@
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
     "eslint-plugin-vue": "^7.17.0",
-    "fast-glob": "^3.2.7",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.3.2",
     "mini-css-extract-plugin": "^2.2.2",
-    "node-abi": "^2.30.1",
     "node-loader": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.3.2",

src/main/index.js

@@ -147,7 +147,8 @@ function runApp() {
       session.defaultSession.cookies.set({
         url: url,
         name: 'CONSENT',
-        value: 'YES+'
+        value: 'YES+',
+        sameSite: 'no_restriction'
       })
     })
 
@@ -769,7 +770,21 @@ function runApp() {
     const template = [
       {
         label: 'File',
-        submenu: [{ role: 'quit' }]
+        submenu: [
+          {
+            label: 'New Window',
+            accelerator: 'CmdOrCtrl+N',
+            click: (_menuItem, _browserWindow, _event) => {
+              createWindow({
+                replaceMainWindow: false,
+                showWindowNow: true
+              })
+            },
+            type: 'normal'
+          },
+          { type: 'separator' },
+          { role: 'quit' }
+        ]
       },
       {
         label: 'Edit',
@@ -801,8 +816,12 @@ function runApp() {
           { role: 'toggledevtools' },
           { type: 'separator' },
           { role: 'resetzoom' },
-          { role: 'zoomin' },
+          { role: 'resetzoom', accelerator: 'CmdOrCtrl+num0', visible: false },
+          { role: 'zoomin', accelerator: 'CmdOrCtrl+Plus' },
+          { role: 'zoomin', accelerator: 'CmdOrCtrl+=', visible: false },
+          { role: 'zoomin', accelerator: 'CmdOrCtrl+numadd', visible: false },
           { role: 'zoomout' },
+          { role: 'zoomout', accelerator: 'CmdOrCtrl+numsub', visible: false },
           { type: 'separator' },
           { role: 'togglefullscreen' }
         ]

src/renderer/App.css

@@ -6,7 +6,7 @@
 #app {
   display: flex;
   flex-wrap: wrap;
-  font-family: 'Roboto', sans-serif;
+  font-family: 'Roboto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }
 
 .routerView {

src/renderer/App.js

@@ -334,14 +334,17 @@ export default Vue.extend({
       })
 
       $(document).on('auxclick', 'a[href^="http"]', (event) => {
-        this.handleLinkClick(event)
+        // auxclick fires for all clicks not performed with the primary button
+        // only handle the link click if it was the middle button,
+        // otherwise the context menu breaks
+        if (event.button === 1) {
+          this.handleLinkClick(event)
+        }
       })
     },
 
     handleLinkClick: function (event) {
       const el = event.currentTarget
-      console.log(this.usingElectron)
-      console.log(el)
       event.preventDefault()
 
       // Check if it's a YouTube link

src/renderer/components/distraction-settings/distraction-settings.js

@@ -45,6 +45,18 @@ export default Vue.extend({
     },
     hideActiveSubscriptions: function () {
       return this.$store.getters.getHideActiveSubscriptions
+    },
+    hideVideoDescription: function () {
+      return this.$store.getters.getHideVideoDescription
+    },
+    hideComments: function () {
+      return this.$store.getters.getHideComments
+    },
+    hideLiveStreams: function() {
+      return this.$store.getters.getHideLiveStreams
+    },
+    hideSharingActions: function() {
+      return this.$store.getters.getHideSharingActions
     }
   },
   methods: {
@@ -68,7 +80,11 @@ export default Vue.extend({
       'updateHideLiveChat',
       'updateHideActiveSubscriptions',
       'updatePlayNextVideo',
-      'updateDefaultTheatreMode'
+      'updateDefaultTheatreMode',
+      'updateHideVideoDescription',
+      'updateHideComments',
+      'updateHideLiveStreams',
+      'updateHideSharingActions'
     ])
   }
 })

src/renderer/components/distraction-settings/distraction-settings.vue

@@ -38,6 +38,18 @@
           :default-value="hideActiveSubscriptions"
           @change="updateHideActiveSubscriptions"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Hide Video Description')"
+          :compact="true"
+          :default-value="hideVideoDescription"
+          @change="updateHideVideoDescription"
+        />
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Hide Sharing Actions')"
+          :compact="true"
+          :default-value="hideSharingActions"
+          @change="updateHideSharingActions"
+        />
       </div>
       <div class="switchColumn">
         <ft-toggle-switch
@@ -70,6 +82,18 @@
           :default-value="hideLiveChat"
           @change="updateHideLiveChat"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Hide Live Streams')"
+          :compact="true"
+          :default-value="hideLiveStreams"
+          @change="updateHideLiveStreams"
+        />
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Hide Comments')"
+          :compact="true"
+          :default-value="hideComments"
+          @change="updateHideComments"
+        />
       </div>
     </div>
     <br>

src/renderer/components/download-settings/download-settings.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+import FtSelect from '../ft-select/ft-select.vue'
 import FtButton from '../ft-button/ft-button.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import { mapActions } from 'vuex'
@@ -12,19 +13,36 @@ export default Vue.extend({
   components: {
     'ft-toggle-switch': FtToggleSwitch,
     'ft-flex-box': FtFlexBox,
+    'ft-select': FtSelect,
     'ft-button': FtButton,
     'ft-input': FtInput
   },
   data: function () {
     return {
-      askForDownloadPath: this.$store.getters.getDownloadFolderPath === ''
+      askForDownloadPath: false,
+      downloadBehaviorValues: [
+        'download',
+        'open'
+      ]
     }
   },
   computed: {
     downloadPath: function() {
       return this.$store.getters.getDownloadFolderPath
+    },
+    downloadBehaviorNames: function () {
+      return [
+        this.$t('Settings.Download Settings.Download in app'),
+        this.$t('Settings.Download Settings.Open in web browser')
+      ]
+    },
+    downloadBehavior: function () {
+      return this.$store.getters.getDownloadBehavior
     }
   },
+  mounted: function () {
+    this.askForDownloadPath = this.downloadPath === ''
+  },
   methods: {
     handleDownloadingSettingChange: function (value) {
       this.askForDownloadPath = value
@@ -42,7 +60,8 @@ export default Vue.extend({
       this.updateDownloadFolderPath(folder.filePaths[0])
     },
     ...mapActions([
-      'updateDownloadFolderPath'
+      'updateDownloadFolderPath',
+      'updateDownloadBehavior'
     ])
   }
 

src/renderer/components/download-settings/download-settings.vue

@@ -6,15 +6,27 @@
       </h3>
     </summary>
     <hr>
-    <ft-flex-box class="downloadSettingsFlexBox">
+    <ft-flex-box>
+      <ft-select
+        :placeholder="$t('Settings.Download Settings.Download Behavior')"
+        :value="downloadBehavior"
+        :select-names="downloadBehaviorNames"
+        :select-values="downloadBehaviorValues"
+        @change="updateDownloadBehavior"
+      />
+    </ft-flex-box>
+    <ft-flex-box
+      v-if="downloadBehavior === 'download'"
+      class="downloadSettingsFlexBox"
+    >
       <ft-toggle-switch
         :label="$t('Settings.Download Settings.Ask Download Path')"
         :default-value="askForDownloadPath"
         @change="handleDownloadingSettingChange"
       />
     </ft-flex-box>
     <ft-flex-box
-      v-if="!askForDownloadPath"
+      v-if="!askForDownloadPath && downloadBehavior === 'download'"
     >
       <ft-input
         class="folderDisplay"
@@ -25,7 +37,7 @@
       />
     </ft-flex-box>
     <ft-flex-box
-      v-if="!askForDownloadPath"
+      v-if="!askForDownloadPath && downloadBehavior === 'download'"
     >
       <ft-button
         :label="$t('Settings.Download Settings.Choose Path')"

src/renderer/components/ft-age-restricted/ft-age-restricted.js

@@ -0,0 +1,22 @@
+import Vue from 'vue'
+
+export default Vue.extend({
+  name: 'FtAgeRestricted',
+  props: {
+    contentTypeString: {
+      type: String,
+      required: true
+    }
+  },
+  computed: {
+    emoji: function () {
+      const emojis = ['😵', '😦', '🙁', '☹️', '😦', '🤫', '😕']
+      return emojis[Math.floor(Math.random() * emojis.length)]
+    },
+
+    restrictedMessage: function () {
+      const contentType = this.$t('Age Restricted.Type.' + this.contentTypeString)
+      return this.$t('Age Restricted.This $contentType is age restricted').replace('$contentType', contentType)
+    }
+  }
+})