Merge branch 'upstream_development' into development

# Conflicts:
#	.github/workflows/no-response.yml
#	yarn.lock

Author: MarmadileManteater

.eslintrc.js

@@ -38,6 +38,8 @@ module.exports = {
     'no-console': ['error', { allow: ['warn', 'error'] }],
     'no-unused-vars': 'warn',
     'no-undef': 'warn',
-    'vue/no-template-key': 'warn'
+    'vue/no-template-key': 'warn',
+    'vue/no-useless-template-attributes': 'off',
+    'vue/multi-word-component-names': 'off'
   }
 }

.github/workflows/no-response.yml

@@ -20,5 +20,5 @@ jobs:
             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: 21
+          daysUntilClose: 14
           responseRequiredLabel: "U: Waiting for Response from Author"

.github/workflows/stale.yml

@@ -0,0 +1,21 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v6
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
+          stale-pr-message: 'This PR is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
+          close-pr-message: 'This PR was closed because it has been stalled for 14 days with no activity.'
+          days-before-issue-stale: 28
+          days-before-pr-stale: 28
+          days-before-issue-close: 7
+          days-before-pr-close: 14
+          stale-issue-label: 'U: stale'
+          stale-pr-label: 'PR: stale'

package.json

@@ -62,11 +62,10 @@
     "electron-context-menu": "^3.5.0",
     "http-proxy-agent": "^4.0.1",
     "https-proxy-agent": "^5.0.0",
-    "jquery": "^3.6.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
     "marked": "^4.0.17",
-    "nedb-promises": "^5.0.1",
+    "nedb-promises": "^6.2.1",
     "opml-to-json": "^1.0.1",
     "process": "^0.11.10",
     "rss-parser": "^3.12.0",
@@ -109,7 +108,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^7.17.0",
+    "eslint-plugin-vue": "^9.6.0",
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
@@ -123,7 +122,7 @@
     "style-loader": "^3.2.1",
     "tree-kill": "1.2.2",
     "vue-devtools": "^5.1.4",
-    "vue-eslint-parser": "^7.10.0",
+    "vue-eslint-parser": "^9.1.0",
     "vue-loader": "^15.10.0",
     "vue-style-loader": "^4.1.3",
     "webpack": "^5.74.0",

src/renderer/App.js

@@ -315,7 +315,7 @@ export default Vue.extend({
     },
 
     openAllLinksExternally: function () {
-      const isExternalLink = (event) => event.target.tagName === 'A' && event.target.href.startsWith('http')
+      const isExternalLink = (event) => event.target.tagName === 'A' && !event.target.href.startsWith(window.location.origin)
 
       document.addEventListener('click', (event) => {
         if (isExternalLink(event)) {

src/renderer/components/ft-toast/ft-toast.js

@@ -28,7 +28,7 @@ export default Vue.extend({
     open: function (message, action, time) {
       const toast = { message: message, action: action || (() => { }), isOpen: false, timeout: null }
       toast.timeout = setTimeout(this.close, time || 3000, toast)
-      setImmediate(() => { toast.isOpen = true })
+      setTimeout(() => { toast.isOpen = true })
       if (this.toasts.length > 4) {
         this.remove(0)
       }

src/renderer/components/ft-video-player/ft-video-player.js

@@ -13,6 +13,7 @@ import 'videojs-contrib-quality-levels'
 import 'videojs-http-source-selector'
 
 import { IpcChannels } from '../../../constants'
+import { sponsorBlockSkipSegments } from '../../helpers/sponsorblock'
 
 export default Vue.extend({
   name: 'FtVideoPlayer',
@@ -547,32 +548,30 @@ export default Vue.extend({
     },
 
     initializeSponsorBlock() {
-      this.sponsorBlockSkipSegments({
-        videoId: this.videoId,
-        categories: this.sponsorSkips.seekBar
-      }).then((skipSegments) => {
-        if (skipSegments.length === 0) {
-          return
-        }
+      sponsorBlockSkipSegments(this.videoId, this.sponsorSkips.seekBar)
+        .then((skipSegments) => {
+          if (skipSegments.length === 0) {
+            return
+          }
 
-        this.player.ready(() => {
-          this.player.on('timeupdate', () => {
-            this.skipSponsorBlocks(skipSegments)
-          })
+          this.player.ready(() => {
+            this.player.on('timeupdate', () => {
+              this.skipSponsorBlocks(skipSegments)
+            })
 
-          skipSegments.forEach(({
-            category,
-            segment: [startTime, endTime]
-          }) => {
-            this.addSponsorBlockMarker({
-              time: startTime,
-              duration: endTime - startTime,
-              color: 'var(--primary-color)',
-              category: category
+            skipSegments.forEach(({
+              category,
+              segment: [startTime, endTime]
+            }) => {
+              this.addSponsorBlockMarker({
+                time: startTime,
+                duration: endTime - startTime,
+                color: 'var(--primary-color)',
+                category: category
+              })
             })
           })
         })
-      })
     },
 
     skipSponsorBlocks(skipSegments) {
@@ -1927,7 +1926,6 @@ export default Vue.extend({
       'calculateColorLuminance',
       'updateDefaultCaptionSettings',
       'showToast',
-      'sponsorBlockSkipSegments',
       'parseScreenshotCustomFileName',
       'updateScreenshotFolderPath',
       'getPicturesPath',

src/renderer/helpers/sponsorblock.js

@@ -0,0 +1,32 @@
+import store from '../store/index'
+
+export async function sponsorBlockSkipSegments(videoId, categories) {
+  const videoIdBuffer = new TextEncoder().encode(videoId)
+
+  const hashBuffer = await crypto.subtle.digest('SHA-256', videoIdBuffer)
+  const hashArray = Array.from(new Uint8Array(hashBuffer))
+
+  const videoIdHashPrefix = hashArray
+    .map(byte => byte.toString(16).padStart(2, '0'))
+    .slice(0, 4)
+    .join('')
+
+  const requestUrl = `${store.getters.getSponsorBlockUrl}/api/skipSegments/${videoIdHashPrefix}?categories=${JSON.stringify(categories)}`
+
+  try {
+    const response = await fetch(requestUrl)
+
+    // 404 means that there are no segments registered for the video
+    if (response.status === 404) {
+      return []
+    }
+
+    const json = await response.json()
+    return json
+      .filter((result) => result.videoID === videoId)
+      .flatMap((result) => result.segments)
+  } catch (error) {
+    console.error('failed to fetch SponsorBlock segments', requestUrl, error)
+    throw error
+  }
+}

src/renderer/store/modules/invidious.js

@@ -2,15 +2,10 @@ import fs from 'fs'
 
 const state = {
   currentInvidiousInstance: '',
-  invidiousInstancesList: null,
-  isGetChannelInfoRunning: false
+  invidiousInstancesList: null
 }
 
 const getters = {
-  getIsGetChannelInfoRunning(state) {
-    return state.isGetChannelInfoRunning
-  },
-
   getCurrentInvidiousInstance(state) {
     return state.currentInvidiousInstance
   },
@@ -98,8 +93,6 @@ const actions = {
 
   invidiousGetChannelInfo({ commit, dispatch }, channelId) {
     return new Promise((resolve, reject) => {
-      commit('toggleIsGetChannelInfoRunning')
-
       const payload = {
         resource: 'channels',
         id: channelId,
@@ -110,7 +103,6 @@ const actions = {
         resolve(response)
       }).catch((xhr) => {
         console.error(xhr)
-        commit('toggleIsGetChannelInfoRunning')
         reject(xhr)
       })
     })
@@ -122,7 +114,6 @@ const actions = {
         resolve(response)
       }).catch((xhr) => {
         console.error(xhr)
-        commit('toggleIsGetChannelInfoRunning')
         reject(xhr)
       })
     })
@@ -147,10 +138,6 @@ const actions = {
 }
 
 const mutations = {
-  toggleIsGetChannelInfoRunning(state) {
-    state.isGetChannelInfoRunning = !state.isGetChannelInfoRunning
-  },
-
   setCurrentInvidiousInstance(state, value) {
     state.currentInvidiousInstance = value
   },

src/renderer/store/modules/sponsorblock.js

@@ -2221,3 +2221,13 @@ video::-webkit-media-text-track-display {
     height: 100%;
   }
 }
+
+@media screen and (max-width: 680px) {
+  .vjs-control.vjs-disabled.vjs-picture-in-picture-control,
+  .vjs-control.vjs-button.vjs-button-fullwindow {
+    display: none;
+  }
+  .vjs-full-window .video-js.vjs-full-screen .vjs-control.vjs-button.vjs-button-fullwindow {
+    display: initial;
+  }
+}

src/renderer/videoJS.css

@@ -673,7 +673,7 @@ Video:
     OpeningTemplate: Otevřít $ v %...
     video: video
     OpenInTemplate: Otevřít v $
-  Premieres on: Premiéry zapnuty
+  Premieres on: Premiéra
   Stats:
     Mimetype: Typ int. média
     Video statistics are not available for legacy videos: Statistiky videí nejsou
@@ -748,7 +748,7 @@ Comments:
   Click to View Comments: 'Kliknutím zobrazíte komentáře'
   Getting comment replies, please wait: 'Dostáváte odpovědi na komentář, počkejte
     prosím'
-  There are no more comments for this video: 'K tomuto videu nejsou žádné další komentáře'
+  There are no more comments for this video: 'U tohoto videa nejsou žádné další komentáře'
   Show Comments: 'Zobrazit komentáře'
   Hide Comments: 'Skrýt komentáře'
   Sort by: 'Seřadit podle'

static/locales/cs.yaml

@@ -76,6 +76,7 @@ Subscriptions:
     profiililla on paljon tilauksia.  Pakotetaan RSS nopeuden rajoittamisen välttämiseksi
   Load More Videos: Lataa lisää videoita
   Error Channels: Kanavat, joissa on virheitä
+  Empty Channels: Tilaamillasi kanavilla ei ole videoita tällä hetkellä.
 Trending:
   Trending: 'Nousussa'
   Trending Tabs: Nousussa olevat välilehdet
@@ -269,6 +270,7 @@ Settings:
     Export Subscriptions: 'Vie tilauksia'
     How do I import my subscriptions?: 'Miten voin tuoda tilaukseni?'
     Fetch Feeds from RSS: Nouda RSS-syöte
+    Fetch Automatically: Nouda syöte automaattisesti
   Advanced Settings:
     Advanced Settings: 'Lisäasetukset'
     Enable Debug Mode (Prints data to the console): 'Ota virheenkorjaustila käyttöön
@@ -371,6 +373,7 @@ Settings:
     Hide Video Description: Piilota videon kuvaus
     Hide Live Streams: Piilota suorat lähetykset
     Hide Sharing Actions: Piilota jakamistoiminnot
+    Hide Chapters: Piilota kappaleet
   The app needs to restart for changes to take effect. Restart and apply change?: Sovellus
     on käynnistettävä uudelleen, jotta muutokset tulevat voimaan. Käynnistetäänkö
     uudelleen?
@@ -564,6 +567,7 @@ Video:
     Minutes: Minuuttia
     Minute: Minuutti
     Less than a minute: Vähemmän kuin minuutti
+    In less than a minute: Alle minuutin kuluessa
   Published on: 'Julkaistu'
   # $ is replaced with the number and % with the unit (days, hours, minutes...)
   Publicationtemplate: '$ % sitten'
@@ -876,3 +880,5 @@ Channels:
   Unsubscribe: Peruuta tilaus
   Unsubscribe Prompt: Oletko varma että haluat peruuttaa tilauksen kanavalle ”$”?
   Unsubscribed: $ on poistettu tilauksistasi
+Clipboard:
+  Copy failed: Kopiointi leikepöydälle epäonnistui