IV: add support for hashtag pages (#3571)

* IV: add support for hashtag pages * add fallback support * remove locale strings
FreeTubeApp · May 26, 2023 · 8dbad61 · 8dbad61
1 parent a11533a
commit 8dbad61
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 73 deletions.
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
@@ -290,3 +290,15 @@ export function filterInvidiousFormats(formats, allowAv1 = false) {
   // }
   return [...audioFormats, ...h264Formats]
 }
+
+export async function getHashtagInvidious(hashtag, page) {
+  const payload = {
+    resource: 'hashtag',
+    id: hashtag,
+    params: {
+      page
+    }
+  }
+  const response = await invidiousAPICall(payload)
+  return response.results
+}
diff --git a/src/renderer/views/Hashtag/Hashtag.js b/src/renderer/views/Hashtag/Hashtag.js
@@ -5,7 +5,8 @@ import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import packageDetails from '../../../../package.json'
 import { getHashtagLocal, parseLocalListVideo } from '../../helpers/api/local'
-import { isNullOrEmpty } from '../../helpers/utils'
+import { copyToClipboard, isNullOrEmpty, showToast } from '../../helpers/utils'
+import { getHashtagInvidious } from '../../helpers/api/invidious'
 
 export default defineComponent({
   name: 'Hashtag',
@@ -21,6 +22,7 @@ export default defineComponent({
       hashtagContinuationData: null,
       videos: [],
       apiUsed: 'local',
+      pageNumber: 1,
       isLoading: true
     }
   },
@@ -34,66 +36,123 @@ export default defineComponent({
     },
 
     showFetchMoreButton() {
-      return !isNullOrEmpty(this.hashtagContinuationData)
+      return !isNullOrEmpty(this.hashtagContinuationData) || this.apiUsed === 'invidious'
     }
   },
   watch: {
     $route() {
-      this.isLoading = true
-      this.hashtag = ''
-      this.hashtagContinuationData = null
-      this.videos = []
-      this.apiUsed = 'local'
+      this.resetData()
       this.getHashtag()
     }
   },
   mounted: function() {
-    this.isLoading = true
+    this.resetData()
     this.getHashtag()
   },
   methods: {
+    resetData: function() {
+      this.isLoading = true
+      this.hashtag = ''
+      this.hashtagContinuationData = null
+      this.videos = []
+      this.apiUsed = 'local'
+      this.pageNumber = 1
+    },
+
     getHashtag: async function() {
       const hashtag = this.$route.params.hashtag
       if (this.backendFallback || this.backendPreference === 'local') {
         await this.getLocalHashtag(hashtag)
       } else {
-        this.getInvidiousHashtag(hashtag)
+        await this.getInvidiousHashtag(hashtag)
       }
       document.title = `${this.hashtag} - ${packageDetails.productName}`
     },
-    getInvidiousHashtag: function(hashtag) {
-      this.hashtag = '#' + hashtag
-      this.apiUsed = 'Invidious'
-      this.isLoading = false
+
+    getInvidiousHashtag: async function(hashtag, page) {
+      try {
+        const videos = await getHashtagInvidious(hashtag, page)
+        this.hashtag = '#' + hashtag
+        this.isLoading = false
+        this.apiUsed = 'invidious'
+        this.videos = this.videos.concat(videos)
+        this.pageNumber += 1
+      } catch (error) {
+        console.error(error)
+        const errorMessage = this.$t('Invidious API Error (Click to copy)')
+        showToast(`${errorMessage}: ${error}`, 10000, () => {
+          copyToClipboard(error)
+        })
+        if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+          showToast(this.$t('Falling back to Local API'))
+          this.resetData()
+          this.getLocalHashtag(hashtag)
+        } else {
+          this.isLoading = false
+        }
+      }
     },
 
     getLocalHashtag: async function(hashtag) {
-      const hashtagData = await getHashtagLocal(hashtag)
-      this.hashtag = hashtagData.header.hashtag
-      this.videos = hashtagData.contents.contents.filter(item =>
-        item.type !== 'ContinuationItem'
-      ).map(item =>
-        parseLocalListVideo(item.content)
-      )
-      this.apiUsed = 'local'
-      this.hashtagContinuationData = hashtagData.has_continuation ? hashtagData : null
-      this.isLoading = false
+      try {
+        const hashtagData = await getHashtagLocal(hashtag)
+        this.hashtag = hashtagData.header.hashtag
+        this.videos = hashtagData.contents.contents.filter(item =>
+          item.type !== 'ContinuationItem'
+        ).map(item =>
+          parseLocalListVideo(item.content)
+        )
+        this.apiUsed = 'local'
+        this.hashtagContinuationData = hashtagData.has_continuation ? hashtagData : null
+        this.isLoading = false
+      } catch (error) {
+        console.error(error)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${error}`, 10000, () => {
+          copyToClipboard(error)
+        })
+        if (this.backendPreference === 'local' && this.backendFallback) {
+          showToast(this.$t('Falling back to Invidious API'))
+          this.resetData()
+          this.getInvidiousHashtag(hashtag)
+        } else {
+          this.isLoading = false
+        }
+      }
     },
 
     getLocalHashtagMore: async function() {
-      const continuation = await this.hashtagContinuationData.getContinuationData()
-      const newVideos = continuation.on_response_received_actions[0].contents.filter(item =>
-        item.type !== 'ContinuationItem'
-      ).map(item =>
-        parseLocalListVideo(item.content)
-      )
-      this.hashtagContinuationData = continuation.has_continuation ? continuation : null
-      this.videos = this.videos.concat(newVideos)
+      try {
+        const continuation = await this.hashtagContinuationData.getContinuationData()
+        const newVideos = continuation.on_response_received_actions[0].contents.filter(item =>
+          item.type !== 'ContinuationItem'
+        ).map(item =>
+          parseLocalListVideo(item.content)
+        )
+        this.hashtagContinuationData = continuation.has_continuation ? continuation : null
+        this.videos = this.videos.concat(newVideos)
+      } catch (error) {
+        console.error(error)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${error}`, 10000, () => {
+          copyToClipboard(error)
+        })
+        if (this.backendPreference === 'local' && this.backendFallback) {
+          showToast(this.$t('Falling back to Invidious API'))
+          const hashtag = this.hashtag.substring(1)
+          this.resetData()
+          this.getLocalHashtag(hashtag)
+        } else {
+          this.isLoading = false
+        }
+      }
     },
 
     handleFetchMore: function() {
       if (this.apiUsed === 'local') {
         this.getLocalHashtagMore()
+      } else if (this.apiUsed === 'invidious') {
+        this.getInvidiousHashtag(this.hashtag.substring(1), this.pageNumber)
       }
     }
   }

diff --git a/src/renderer/views/Hashtag/Hashtag.vue b/src/renderer/views/Hashtag/Hashtag.vue
@@ -11,27 +11,18 @@
           class="elementList"
         >
           <ft-element-list
-            v-if="backendFallback || backendPreference === 'local' && videos.length > 0"
+            v-if="videos.length > 0"
             :data="videos"
           />
           <ft-flex-box
-            v-else-if="backendFallback || backendPreference === 'local' && videos.length === 0"
+            v-else-if="videos.length === 0"
           >
             <p
               class="message"
             >
               {{ $t("Hashtag.This hashtag does not currently have any videos") }}
             </p>
           </ft-flex-box>
-          <ft-flex-box
-            v-else
-          >
-            <p
-              class="message"
-            >
-              {{ $t("Hashtag.You can only view hashtag pages through the Local API") }}
-            </p>
-          </ft-flex-box>
         </div>
         <div
           v-if="showFetchMoreButton"

diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
@@ -977,5 +977,3 @@ Hashtag:
   This hashtag does not currently have any videos: هذا الهاشتاج ليس لديه حاليا أي
     مقاطع فيديو
   Hashtag: هاشتاج
-  You can only view hashtag pages through the Local API: يمكنك فقط عرض صفحات الهاشتاج
-    من خلال واجهة برمجة التطبيقات (API) المحلية
diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
@@ -1002,5 +1002,3 @@ Ok: Добре
 Hashtag:
   Hashtag: Хаштаг
   This hashtag does not currently have any videos: В момента този хаштаг няма видеа
-  You can only view hashtag pages through the Local API: Можете да разглеждате страници
-    с хаштагове само чрез локалния вътрешен интерфейс
diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
@@ -974,7 +974,5 @@ Chapters:
 Preferences: Předvolby
 Ok: Ok
 Hashtag:
-  You can only view hashtag pages through the Local API: Stránky hashtagů lze momentálně
-    procházet pouze s lokálním API
   Hashtag: Hashtag
   This hashtag does not currently have any videos: Tento hashtag nemá žádná videa
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
@@ -879,7 +879,6 @@ Hashtag:
   Hashtag: Hashtag
   This hashtag does not currently have any videos: This hashtag does not currently
       have any videos
-  You can only view hashtag pages through the Local API: You can only view hashtag pages through the Local API
 Yes: Yes
 No: No
 Ok: Ok
diff --git a/static/locales/es.yaml b/static/locales/es.yaml
@@ -1010,5 +1010,3 @@ Hashtag:
   Hashtag: Hashtag
   This hashtag does not currently have any videos: Este hashtag no tiene actualmente
     ningún vídeo
-  You can only view hashtag pages through the Local API: Sólo puedes ver las páginas
-    de los hashtags a través de la API local
diff --git a/static/locales/he.yaml b/static/locales/he.yaml
@@ -960,6 +960,4 @@ Preferences: העדפות
 Ok: אישור
 Hashtag:
   This hashtag does not currently have any videos: לתגית ההקבץ הזו אין סרטונים כרגע
-  You can only view hashtag pages through the Local API: אפשר לצפות בעמודי תגית הקבץ
-    דרך ה־API המקומי בלבד
   Hashtag: תגית הקבץ
diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
@@ -996,6 +996,4 @@ Preferences: Korisničke postavke
 Ok: U redu
 Hashtag:
   This hashtag does not currently have any videos: Ovaj hashtag trenutačno nema videa
-  You can only view hashtag pages through the Local API: Stranice s hashtagovima možeš
-    gledati samo putem lokalnog API-ja
   Hashtag: Hashtag
diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
@@ -1002,5 +1002,3 @@ Hashtag:
   Hashtag: Kettőskereszt
   This hashtag does not currently have any videos: Ez a kettőskereszt jelenleg nem
     rendelkezik videókkal
-  You can only view hashtag pages through the Local API: Kettőskereszt oldalait csak
-    a helyi API felületen keresztül tudja megtekinteni
diff --git a/static/locales/it.yaml b/static/locales/it.yaml
@@ -1021,5 +1021,3 @@ Hashtag:
   This hashtag does not currently have any videos: Questo hashtag attualmente non
     ha alcun video
   Hashtag: Hashtag
-  You can only view hashtag pages through the Local API: Puoi visualizzare le pagine
-    hashtag solo tramite l'API locale
diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
@@ -1020,8 +1020,6 @@ Chapters:
 Preferences: Preferencje
 Ok: Ok
 Hashtag:
-  You can only view hashtag pages through the Local API: Strony hashtagów są dostępne
-    jedynie poprzez lokalne API
   Hashtag: Hashtag
   This hashtag does not currently have any videos: Nie ma na razie żadnych filmów
     z takim hashtagiem
diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
@@ -947,7 +947,5 @@ Clipboard:
 Ok: Ok
 Hashtag:
   Hashtag: Marcador
-  You can only view hashtag pages through the Local API: Só é possível ver páginas
-    de hashtag através da API local
   This hashtag does not currently have any videos: Esta hashtag não tem atualmente
     quaisquer vídeos
diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
@@ -1001,5 +1001,3 @@ Hashtag:
   Hashtag: Marcador
   This hashtag does not currently have any videos: Esta hashtag não tem atualmente
     quaisquer vídeos
-  You can only view hashtag pages through the Local API: Só é possível ver páginas
-    de hashtag através da API local
diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
@@ -1007,5 +1007,3 @@ Hashtag:
   Hashtag: Распределительная метка
   This hashtag does not currently have any videos: Этой распределительной метки пока
     нет ни у одного видео
-  You can only view hashtag pages through the Local API: Ты можешь видеть страницы
-    с распределительными метками только через локальный набор функций
diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
@@ -1003,7 +1003,5 @@ Preferences: Tercihler
 Ok: Tamam
 Hashtag:
   Hashtag: Hashtag
-  You can only view hashtag pages through the Local API: Hashtag sayfalarını yalnızca
-    Yerel API aracılığıyla görüntüleyebilirsiniz
   This hashtag does not currently have any videos: Bu hashtag'in şu anda herhangi
     bir videosu yok
diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
@@ -940,6 +940,4 @@ Preferences: Налаштування
 Ok: Гаразд
 Hashtag:
   Hashtag: Хештег
-  You can only view hashtag pages through the Local API: Ви можете переглядати сторінки
-    з хештегами лише через локальний API
   This hashtag does not currently have any videos: За цим хештегом наразі немає відео
diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
@@ -878,5 +878,4 @@ Preferences: 选项
 Ok: 好
 Hashtag:
   Hashtag: 标签
-  You can only view hashtag pages through the Local API: 你只能通过本地 API 浏览标签页面
   This hashtag does not currently have any videos: 此标签下当前没有任何短视频
diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
@@ -890,4 +890,3 @@ Ok: 確定
 Hashtag:
   Hashtag: 主題標籤
   This hashtag does not currently have any videos: 此標籤目前沒有任何影片
-  You can only view hashtag pages through the Local API: 您僅能透過本機 API 檢視主題標籤頁面