Merge branch 'FreeTubeApp-development' into development

MarmadileManteater · Jun 21, 2022 · fdf1fc3 · fdf1fc3
2 parents 318a5b5 + f57b101
commit fdf1fc3
Show file tree

Hide file tree

Showing 47 changed files with 7,123 additions and 8,083 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.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

diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "js-yaml": "^4.1.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
-    "marked": "^4.0.15",
+    "marked": "^4.0.17",
     "nedb-promises": "^5.0.1",
     "opml-to-json": "^1.0.1",
     "rss-parser": "^3.12.0",
@@ -96,7 +96,7 @@
     "cordova": "^11.0.0",
     "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 +108,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",

diff --git a/src/main/index.js b/src/main/index.js
@@ -770,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',
@@ -802,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' }
         ]

diff --git a/src/renderer/App.css b/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 {

diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/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'
     ])
   }
 })
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/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>

diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.js b/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)
+    }
+  }
+})
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.sass b/src/renderer/components/ft-age-restricted/ft-age-restricted.sass
@@ -0,0 +1,14 @@
+.ft-age-restricted
+  color: var(--primary-text-color)
+  h2
+    width: 100%
+    text-align: center
+    background-color: var(--card-bg-color)
+    padding: 10px 0
+  .frown
+    width: 100%
+    text-align: center
+    background-color: var(--card-bg-color)
+    font-size: 10em
+    padding: 20px 0
+    height: 100%
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.vue b/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
@@ -0,0 +1,15 @@
+<template>
+  <div
+    class="ft-age-restricted"
+  >
+    <h2>
+      {{ restrictedMessage }}
+    </h2>
+    <div class="frown">
+      {{ emoji }}
+    </div>
+  </div>
+</template>
+
+<script src="./ft-age-restricted.js" />
+<style scoped lang="sass" src="./ft-age-restricted.sass" />
diff --git a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.css b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.css
@@ -1,9 +1,14 @@
 .bubblePadding {
   position: relative;
   width: 100px;
-  height: 115px;
+  height: 100px;
   padding: 10px;
   cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 16px;
+  overflow: hidden;
   -webkit-transition: background 0.2s ease-out;
   -moz-transition: background 0.2s ease-out;
   -o-transition: background 0.2s ease-out;
@@ -20,10 +25,8 @@
 .bubble {
   width: 50px;
   height: 50px;
-  margin-bottom: 5px;
-  margin-left: 25px;
-  border-radius: 200px 200px 200px 200px;
-  -webkit-border-radius: 200px 200px 200px 200px;
+  border-radius: 100%;
+  -webkit-border-radius: 100%;
 }
 
 .selected {
@@ -41,8 +44,10 @@
 }
 
 .channelName {
+  display: block;
   font-size: 13px;
-  height: 60px;
   overflow: hidden;
   text-align: center;
+  text-overflow: ellipsis;
+  width: 100%;
 }
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
@@ -33,6 +33,11 @@ export default Vue.extend({
       visible: this.firstScreen
     }
   },
+  computed: {
+    hideLiveStreams: function() {
+      return this.$store.getters.getHideLiveStreams
+    }
+  },
   methods: {
     onVisibilityChanged: function (visible) {
       this.visible = visible

diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
@@ -1,5 +1,6 @@
 <template>
   <div
+    v-if="data.type !== undefined && (data.type === 'video' ? ((!data.liveNow && (data.lengthSeconds != null)) || (!hideLiveStreams)) : true)"
     v-observe-visibility="firstScreen ? false : {
       callback: onVisibilityChanged,
       once: true,