Merge branch 'v0.13.1-hotfix'

Author: PrestonN

_scripts/build.js

@@ -69,6 +69,12 @@ const config = {
     icon: '_icons/icon.svg',
     target: ['deb', 'zip', 'apk', 'rpm', 'AppImage', 'pacman'],
   },
+  // See the following issues for more information
+  // https://github.com/jordansissel/fpm/issues/1503
+  // https://github.com/jgraph/drawio-desktop/issues/259
+  rpm: {
+    fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
+  },
   deb: {
     depends: [
       "libgtk-3-0",

package-lock.json

@@ -48,11 +48,11 @@
     "xml2json": "^0.12.0",
     "youtube-chat": "git+https://github.com/IcedCoffeee/youtube-chat.git",
     "youtube-suggest": "^1.1.2",
-    "yt-channel-info": "^2.1.1",
-    "yt-comment-scraper": "^4.0.1",
+    "yt-channel-info": "^2.2.0",
+    "yt-comment-scraper": "^4.0.3",
     "yt-dash-manifest-generator": "1.1.0",
     "yt-trending-scraper": "^2.0.0",
-    "ytdl-core": "^4.8.0",
+    "ytdl-core": "^4.8.2",
     "ytpl": "^2.2.1",
     "ytsr": "^3.5.0"
   },
@@ -148,5 +148,5 @@
     "test": "run-s rebuild:node pack:workers jest",
     "test:watch": "run-s rebuild:node pack:workers jest:watch"
   },
-  "version": "0.13.0"
+  "version": "0.13.1"
 }

package.json

@@ -241,6 +241,10 @@ export default Vue.extend({
           }, 200)
         }
 
+        if (this.useSponsorBlock) {
+          this.initializeSponsorBlock()
+        }
+
         $(document).on('keydown', this.keyboardShortcutHandler)
 
         this.player.on('mousemove', this.hideMouseTimeout)
@@ -286,18 +290,22 @@ export default Vue.extend({
           }
         })
       }
-      setTimeout(() => { this.fetchSponsorBlockInfo() }, 100)
     },
 
-    fetchSponsorBlockInfo() {
-      if (this.useSponsorBlock) {
-        this.$store.dispatch('sponsorBlockSkipSegments', {
-          videoId: this.videoId,
-          categories: ['sponsor']
-        }).then((skipSegments) => {
+    initializeSponsorBlock() {
+      this.$store.dispatch('sponsorBlockSkipSegments', {
+        videoId: this.videoId,
+        categories: ['sponsor']
+      }).then((skipSegments) => {
+        if (skipSegments.length === 0) {
+          return
+        }
+
+        this.player.ready(() => {
           this.player.on('timeupdate', () => {
             this.skipSponsorBlocks(skipSegments)
           })
+
           skipSegments.forEach(({
             category,
             segment: [startTime, endTime]
@@ -309,11 +317,12 @@ export default Vue.extend({
             })
           })
         })
-      }
+      })
     },
 
     skipSponsorBlocks(skipSegments) {
       const currentTime = this.player.currentTime()
+      const duration = this.player.duration()
       let newTime = null
       let skippedCategory = null
       skipSegments.forEach(({ category, segment: [startTime, endTime] }) => {
@@ -322,7 +331,7 @@ export default Vue.extend({
           skippedCategory = category
         }
       })
-      if (newTime !== null) {
+      if (newTime !== null && Math.abs(duration - currentTime) > 0.500) {
         if (this.sponsorBlockShowSkippedToast) {
           this.showSkippedSponsorSegmentInformation(skippedCategory)
         }

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

@@ -37,11 +37,15 @@
   cursor: pointer;
 }
 
-.commentAuthor {
+.commentAuthorWrapper {
   font-weight: bold;
   font-size: 14px;
   margin-left: 68px;
   margin-top: 0px;
+}
+
+
+.commentAuthor {
   cursor: pointer;
 }
 

src/renderer/components/watch-video-comments/watch-video-comments.css

@@ -48,10 +48,14 @@
           @click="goToChannel(comment.authorLink)"
         >
         <p
-          class="commentAuthor"
-          @click="goToChannel(comment.authorLink)"
+          class="commentAuthorWrapper"
         >
-          {{ comment.author }}
+          <span
+            class="commentAuthor"
+            @click="goToChannel(comment.authorLink)"
+          >
+            {{ comment.author }}
+          </span>
           <span class="commentDate">
             {{ comment.time }}
           </span>
@@ -108,8 +112,13 @@
               :src="reply.authorThumb"
               class="commentThumbnail"
             >
-            <p class="commentAuthor">
-              {{ reply.author }}
+            <p class="commentAuthorWrapper">
+              <span
+                class="commentAuthor"
+                @click="goToChannel(reply.authorLink)"
+              >
+                {{ reply.author }}
+              </span>
               <span class="commentDate">
                 {{ reply.time }}
               </span>

src/renderer/components/watch-video-comments/watch-video-comments.vue

@@ -200,9 +200,9 @@ const actions = {
     if (searchSettings.duration !== '') {
       let filterValue = null
       if (searchSettings.duration === 'short') {
-        filterValue = 'Short (< 4 minutes)'
+        filterValue = 'Under 4 minutes'
       } else if (searchSettings.duration === 'long') {
-        filterValue = 'Long (> 20 minutes)'
+        filterValue = 'Over 20 minutes'
       }
 
       filterUrl = filter.get('Duration').get(filterValue).url
@@ -216,7 +216,7 @@ const actions = {
 
       switch (searchSettings.time) {
         case 'hour':
-          filterValue = 'Last Hour'
+          filterValue = 'Last hour'
           break
         case 'today':
           filterValue = 'Today'

src/renderer/store/modules/ytdl.js

@@ -68,7 +68,13 @@ export default Vue.extend({
       this.isLoading = true
 
       console.log('getting local trending')
-      ytrend.scrape_trending_page(this.region).then((result) => {
+      const param = {
+        parseCreatorOnRise: false,
+        page: 'default',
+        geoLocation: this.region
+      }
+
+      ytrend.scrape_trending_page(param).then((result) => {
         const returnData = result.filter((item) => {
           return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
         })

src/renderer/views/Trending/Trending.js

@@ -309,6 +309,13 @@ Settings:
     Proxy Protocol: Protokol proxy
     Error getting network information. Is your proxy configured properly?: Chyba při
       získávání informací o síti. Je vaše proxy správně nakonfigurována?
+  SponsorBlock Settings:
+    Notify when sponsor segment is skipped: Upozornit, když je sponzorový segment
+      přeskočen
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Url SponsorBlock
+      API (Výchozí je https://sponsor.ajay.app)
+    Enable SponsorBlock: Zapnout SponsorBlock
+    SponsorBlock Settings: Nastavení SponsorBlock
 About:
   #On About page
   About: 'O aplikaci'
@@ -525,6 +532,14 @@ Video:
   Video has been removed from your saved list: Video bylo odstraněno z vašeho uloženého
     seznamu
   translated from English: přeloženo z angličtiny
+  Sponsor Block category:
+    music offtopic: hudební offtopic
+    interaction: interakce
+    self-promotion: self-promotion
+    outro: závěr
+    intro: úvod
+    sponsor: sponzor
+  Skipped segment: Přeskočený segment
 Videos:
   #& Sort By
   Sort By:

static/locales/cs.yaml

@@ -129,6 +129,7 @@ Settings:
     Check for Updates: Nach Aktualisierungen suchen
     View all Invidious instance information: Alle Informationen zur Invidious-Instanz
       anzeigen
+    System Default: Systemstandart
   Theme Settings:
     Theme Settings: Thema-Einstellungen
     Match Top Bar with Main Color: Obere Leiste an Hauptfarbe anpassen
@@ -190,6 +191,7 @@ Settings:
       4k: 4k
       8k: 8k
     Playlist Next Video Interval: Zeit zwischen automatischer Videowiedergabe
+    Next Video Interval: Zeit bis zum nächsten Video
   Subscription Settings:
     Subscription Settings: Abonnement-Einstellungen
     Hide Videos on Watch: Verstecke Videos bei Wiedergabe
@@ -317,6 +319,13 @@ Settings:
     Proxy Protocol: Proxy-Protokoll
     Enable Tor / Proxy: Tor / Proxy aktivieren
     Proxy Settings: Proxy-Einstellungen
+  SponsorBlock Settings:
+    Notify when sponsor segment is skipped: Melden, falls ein Sponsorsegment übersprungen
+      wird
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
+      URL (Standard ist https://sponsor.ajay.app)
+    Enable SponsorBlock: Aktiviere SponsorBlock
+    SponsorBlock Settings: SponsorBlock-Einstellungen
 About:
   #On About page
   About: Über
@@ -508,6 +517,14 @@ Video:
   Video has been saved: Video wurde gespeichert
   Save Video: Video speichern
   translated from English: Aus dem Englischen übersetzt
+  Sponsor Block category:
+    music offtopic: Musik (Offtopic)
+    interaction: Interaktion
+    self-promotion: Eigenwerbung
+    outro: Outro
+    intro: Intro
+    sponsor: Sponsor
+  Skipped segment: Segment übersprungen
 Videos:
   #& Sort By
   Sort By:
@@ -704,3 +721,4 @@ Hashtags have not yet been implemented, try again later: Hashtags wurden noch ni
   implementiert, bitte versuche es später noch einmal
 Unknown YouTube url type, cannot be opened in app: Unbekannte YouTube-Adresse, kann
   in FreeTube nicht geöffnet werden
+Open New Window: Neues Fenster öffnen