Merge branch 'development' into feature/history/remember-search-query

* development: (273 commits) Translated using Weblate (Serbian) Translated using Weblate (Czech) Translated using Weblate (French) Translated using Weblate (German) Translated using Weblate (Spanish) Fix text colour in player overflow menu (#6213) Add warning message to proxy settings (#6099) Migrate SubscribedChannels view to Composition API (#6131) Translated using Weblate (Croatian) Translated using Weblate (English (United Kingdom)) Translated using Weblate (Afrikaans) Translated using Weblate (Afrikaans) Better player error handling (#6180) Translated using Weblate (Arabic) Translated using Weblate (Afrikaans) local API: Fix playlists and podcasts not appearing in search results (#6196) Translated using Weblate (Serbian) Translated using Weblate (Hungarian) Bump shaka-player from 4.11.11 to 4.12.1 (#6193) Translated using Weblate (French) ... # Conflicts: # src/renderer/views/SubscribedChannels/SubscribedChannels.js
FreeTubeApp · Nov 24, 2024 · a5f5a66 · a5f5a66
2 parents 03f887e + e5eaadf
commit a5f5a66
Show file tree

Hide file tree

Showing 196 changed files with 7,780 additions and 8,400 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discussions
-    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
+    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
     about: View discussions or start one yourself
   - name: Questions
-    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
+    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
     about: Ask and answer questions
   - name: Matrix Community
     url: https://matrix.to/#/+freetube:matrix.org

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -34,7 +34,7 @@ body:
   - type: textarea
     attributes:
       label: Alternatives Considered
-      description: A clear and concise description of any alternative solutions or features you've considered. 
+      description: A clear and concise description of any alternative solutions or features you've considered.
     validations:
       required: true
   - type: dropdown

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -20,6 +20,7 @@ updates:
           - "@eslint/*"
           - "yaml-eslint-parser"
           - "vue-eslint-parser"
+          - "neostandard"
       stylelint:
         patterns:
           - "stylelint"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -86,10 +86,9 @@ jobs:
       with:
         version: ${{ steps.versionNumber.outputs.result }}
 
-
     - name: Install libarchive-tools
       if: startsWith(matrix.os, 'ubuntu')
-      run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
+      run: sudo apt update; sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
 
     - name: Build x64 with Node.js ${{ matrix.node-version}}
       if: contains(matrix.runtime, 'x64')

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -37,11 +37,10 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -50,7 +49,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |

diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -20,4 +20,3 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
-
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -77,22 +77,22 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      uses: mikefarah/[email protected].3
+      uses: mikefarah/[email protected].5
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
-      uses: mikefarah/[email protected].3
+      uses: mikefarah/[email protected].5
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
     - name: Update ARM File Location in yml File
-      uses: mikefarah/[email protected].3
+      uses: mikefarah/[email protected].5
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
-      uses: mikefarah/[email protected].3
+      uses: mikefarah/[email protected].5
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -6,7 +6,7 @@ name: Linter
 # events but only for the master branch
 on:
   pull_request:
-    branches: [ master, development ]
+    branches: [ master, development, '**-RC' ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
@@ -1,24 +1,24 @@
-name: No Response
-
-# Both `issue_comment` and `scheduled` event types are required for this Action
-# to work properly.
-on:
-  issue_comment:
-    types: [created]
-  schedule:
-    # Run daily at midnight.
-    - cron: '0 0 * * *'
-
-jobs:
-  noResponse:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/[email protected]
-        with:
-          token: ${{ github.token }}
-          closeComment: >
-            This issue has been automatically closed because there has been no response to our request for more information from the original author. 
-            With only the information that is currently in the issue, we don't have enough information to take action. 
-            Please reach out if you have or find the answers we need so that we can investigate further.
-          daysUntilClose: 14
-          responseRequiredLabel: "U: Waiting for Response from Author"
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action
+# to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Run daily at midnight.
+    - cron: '0 0 * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/[email protected]
+        with:
+          token: ${{ github.token }}
+          closeComment: >
+            This issue has been automatically closed because there has been no response to our request for more information from the original author.
+            With only the information that is currently in the issue, we don't have enough information to take action.
+            Please reach out if you have or find the answers we need so that we can investigate further.
+          daysUntilClose: 14
+          responseRequiredLabel: "U: Waiting for Response from Author"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -349,4 +349,3 @@ jobs:
 #        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
 #        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
 #        asset_content_type: application/x-apple-diskimage
-
diff --git a/.github/workflows/remove-outdated-labels.yml b/.github/workflows/remove-outdated-labels.yml
@@ -1,61 +1,61 @@
-name: Remove outdated labels
-on:
-  pull_request_target:
-    types:
-      - closed
-      - converted_to_draft
-      - ready_for_review
-jobs:
-  remove-merged-pr-labels:
-    name: Remove merged pull request labels
-    if: github.event.pull_request.merged
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/[email protected]
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            PR: WIP
-            PR: changes requested
-            PR: merge conflicts / rebase needed
-            PR/Issue: dependent
-            PR: stale
-
-  remove-closed-pr-labels:
-    name: Remove closed pull request labels
-    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/[email protected]
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            PR: WIP
-            PR: changes requested
-            PR: merge conflicts / rebase needed
-            PR/Issue: dependent
-            PR: stale
-
-  remove-draft-pr-labels:
-    name: Remove labels from draft pull requests
-    if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/[email protected]
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            
-  remove-ready-pr-labels:
-    name: Remove labels when draft pr is marked ready for review
-    if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/[email protected]
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: WIP
+name: Remove outdated labels
+on:
+  pull_request_target:
+    types:
+      - closed
+      - converted_to_draft
+      - ready_for_review
+jobs:
+  remove-merged-pr-labels:
+    name: Remove merged pull request labels
+    if: github.event.pull_request.merged
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent
+            PR: stale
+
+  remove-closed-pr-labels:
+    name: Remove closed pull request labels
+    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent
+            PR: stale
+
+  remove-draft-pr-labels:
+    name: Remove labels from draft pull requests
+    if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+
+  remove-ready-pr-labels:
+    name: Remove labels when draft pr is marked ready for review
+    if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: WIP
diff --git a/.prettierrc b/.prettierrc
diff --git a/README.md b/README.md
@@ -59,7 +59,6 @@ longer track you using cookies or JavaScript. Your subscriptions and history are
 * Option to show only family friendly content
 * Show/hide functionality or elements within the app using the distraction free settings
 * View channel community posts
-* View most age restricted videos
 
 ### Browser Extension
 FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. 

diff --git a/_scripts/ProcessLocalesPlugin.js b/_scripts/ProcessLocalesPlugin.js
@@ -26,11 +26,11 @@ class ProcessLocalesPlugin {
     }
     this.outputDir = options.outputDir
 
-    /** @type {Map<str, any>} */
+    /** @type {Map<string, any>} */
     this.locales = new Map()
     this.localeNames = []
 
-    /** @type {Map<str, any>} */
+    /** @type {Map<string, any>} */
     this.cache = new Map()
 
     this.filePaths = []
@@ -45,7 +45,7 @@ class ProcessLocalesPlugin {
 
   /** @param {import('webpack').Compiler} compiler  */
   apply(compiler) {
-    const { CachedSource, RawSource } = compiler.webpack.sources;
+    const { CachedSource, RawSource } = compiler.webpack.sources
     const { Compilation, DefinePlugin } = compiler.webpack
 
     new DefinePlugin({
@@ -59,7 +59,6 @@ class ProcessLocalesPlugin {
         name: PLUGIN_NAME,
         stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
       }, async (_assets) => {
-
         // While running in the webpack dev server, this hook gets called for every incremental build.
         // For incremental builds we can return the already processed versions, which saves time
         // and makes webpack treat them as cached

diff --git a/_scripts/build.js b/_scripts/build.js
@@ -16,7 +16,7 @@ if (platform === 'darwin') {
     arch = Arch.arm64
   }
 
-  targets = Platform.MAC.createTarget(['DMG','zip', '7z'], arch)
+  targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
 } else if (platform === 'win32') {
   let arch = Arch.x64
 

diff --git a/_scripts/dev-runner.js b/_scripts/dev-runner.js
@@ -88,7 +88,7 @@ async function restartElectron() {
  */
 function setupNotifyLocaleUpdate(compiler, devServer) {
   const notifyLocaleChange = (updatedLocales) => {
-    devServer.sendMessage(devServer.webSocketServer.clients, "freetube-locale-update", updatedLocales)
+    devServer.sendMessage(devServer.webSocketServer.clients, 'freetube-locale-update', updatedLocales)
   }
 
   compiler.options.plugins

diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
@@ -11,9 +11,9 @@ const config = {
   },
   protocols: [
     {
-      name: "FreeTube",
+      name: 'FreeTube',
       schemes: [
-        "freetube"
+        'freetube'
       ]
     }
   ],
@@ -52,19 +52,19 @@ const config = {
   // https://github.com/jordansissel/fpm/issues/1503
   // https://github.com/jgraph/drawio-desktop/issues/259
   rpm: {
-    fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
+    fpm: ['--rpm-rpmbuild-define=_build_id_links none']
   },
   deb: {
     depends: [
-      "libgtk-3-0",
-      "libnotify4",
-      "libnss3",
-      "libxss1",
-      "libxtst6",
-      "xdg-utils",
-      "libatspi2.0-0",
-      "libuuid1",
-      "libsecret-1-0"
+      'libgtk-3-0',
+      'libnotify4',
+      'libnss3',
+      'libxss1',
+      'libxtst6',
+      'xdg-utils',
+      'libatspi2.0-0',
+      'libuuid1',
+      'libsecret-1-0'
     ]
   },
   mac: {