Add missing Electron guards after #4230 (#4311)

* Add missing Electron guards after #4230 * Fix logic issue
FreeTubeApp · Nov 11, 2023 · 61fc91f · 61fc91f
1 parent e7a1b8b
commit 61fc91f
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/renderer/helpers/channels.js b/src/renderer/helpers/channels.js
@@ -11,7 +11,7 @@ import { getLocalChannel } from './api/local'
 */
 async function findChannelById(id, backendOptions) {
   try {
-    if (backendOptions.preference === 'invidious') {
+    if (!process.env.IS_ELECTRON || backendOptions.preference === 'invidious') {
       return await invidiousGetChannelInfo(id)
     } else {
       return await getLocalChannel(id)
@@ -21,11 +21,15 @@ async function findChannelById(id, backendOptions) {
     if (err.message && err.message === 'This channel does not exist.') {
       return { invalid: true }
     }
-    if (backendOptions.fallback && backendOptions.preference === 'invidious') {
-      return await getLocalChannel(id)
-    }
-    if (backendOptions.fallback && backendOptions.preference === 'local') {
-      return await invidiousGetChannelInfo(id)
+    if (process.env.IS_ELECTRON && backendOptions.fallback) {
+      if (backendOptions.preference === 'invidious') {
+        return await getLocalChannel(id)
+      }
+      if (backendOptions.preference === 'local') {
+        return await invidiousGetChannelInfo(id)
+      }
+    } else {
+      throw err
     }
   }
 }
@@ -36,13 +40,13 @@ async function findChannelById(id, backendOptions) {
 *   preference: string,
 *   fallback: boolean,
 * }} backendOptions
-* @returns {Promise<{icon: string, iconHref: string, preferredName: string, invalidId: boolean}>}
+* @returns {Promise<{icon: string, iconHref: string, preferredName: string} | { invalidId: boolean }>}
 */
 export async function findChannelTagInfo(id, backendOptions) {
   if (!/UC\S{22}/.test(id)) return { invalidId: true }
   try {
     const channel = await findChannelById(id, backendOptions)
-    if (backendOptions.preference === 'invidious') {
+    if (!process.env.IS_ELECTRON || backendOptions.preference === 'invidious') {
       if (channel.invalid) return { invalidId: true }
       return {
         preferredName: channel.author,