Update title/author search handling to not fail if only one of the ba…

…se values is invalid
FreeTubeApp · Apr 10, 2024 · 2b5422b · 2b5422b
1 parent 1767f4e
commit 2b5422b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/renderer/views/History/History.js b/src/renderer/views/History/History.js
@@ -93,11 +93,13 @@ export default defineComponent({
       } else {
         const lowerCaseQuery = this.query.toLowerCase()
         const filteredQuery = this.historyCacheSorted.filter((video) => {
-          if (typeof (video.title) !== 'string' || typeof (video.author) !== 'string') {
-            return false
-          } else {
-            return video.title.toLowerCase().includes(lowerCaseQuery) || video.author.toLowerCase().includes(lowerCaseQuery)
+          if (typeof (video.title) === 'string' && video.title.toLowerCase().includes(lowerCaseQuery)) {
+            return true
+          } else if (typeof (video.author) === 'string' && video.author.toLowerCase().includes(lowerCaseQuery)) {
+            return true
           }
+
+          return false
         }).sort((a, b) => {
           return b.timeWatched - a.timeWatched
         })

diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
@@ -142,11 +142,13 @@ export default defineComponent({
       if (this.processedVideoSearchQuery === '') { return this.playlistItems }
 
       return this.playlistItems.filter((v) => {
-        if (typeof (v.title) !== 'string' || typeof (v.author) !== 'string') {
-          return false
-        } else {
-          return v.title.toLowerCase().includes(this.processedVideoSearchQuery) || v.author.toLowerCase().includes(this.processedVideoSearchQuery)
+        if (typeof (v.title) === 'string' && v.title.toLowerCase().includes(this.processedVideoSearchQuery)) {
+          return true
+        } else if (typeof (v.author) === 'string' && v.author.toLowerCase().includes(this.processedVideoSearchQuery)) {
+          return true
         }
+
+        return false
       })
     },
     visiblePlaylistItems: function () {