Merge branch 'main' into better-sorting

SteamDeckHomebrew · Oct 17, 2023 · 28f9c2e · 28f9c2e
2 parents 3cd6894 + f53a3f3
commit 28f9c2e
Showing 1 changed file with 26 additions and 32 deletions.
diff --git a/frontend/src/store.tsx b/frontend/src/store.tsx
@@ -51,7 +51,7 @@ export async function getPluginList(
   sort_direction: SortDirections | null = null,
 ): Promise<StorePlugin[]> {
   let version = await window.DeckyPluginLoader.updateVersion();
-  let store = await getSetting<Store>('store', Store.Default);
+  let store = await getSetting<Store>('store', null);
   let customURL = await getSetting<string>('store-url', 'https://plugins.deckbrew.xyz/plugins');
 
   let query: URLSearchParams | string = new URLSearchParams();
@@ -60,38 +60,32 @@ export async function getPluginList(
   query = '?' + String(query);
 
   let storeURL;
-  if (!store) {
-    console.log('Could not get a default store, using Default.');
-    await setSetting('store-url', Store.Default);
-    return fetch('https://plugins.deckbrew.xyz/plugins' + query, {
-      method: 'GET',
-      headers: {
-        'X-Decky-Version': version.current,
-      },
-    }).then((r) => r.json());
-  } else {
-    switch (+store) {
-      case Store.Default:
-        storeURL = 'https://plugins.deckbrew.xyz/plugins';
-        break;
-      case Store.Testing:
-        storeURL = 'https://testing.deckbrew.xyz/plugins';
-        break;
-      case Store.Custom:
-        storeURL = customURL;
-        break;
-      default:
-        console.error('Somehow you ended up without a standard URL, using the default URL.');
-        storeURL = 'https://plugins.deckbrew.xyz/plugins';
-        break;
-    }
-    return fetch(storeURL + query, {
-      method: 'GET',
-      headers: {
-        'X-Decky-Version': version.current,
-      },
-    }).then((r) => r.json());
+  if (store === null) {
+    console.log('Could not get store, using Default.');
+    await setSetting('store', Store.Default);
+    store = Store.Default;
+  }
+  switch (+store) {
+    case Store.Default:
+      storeURL = 'https://plugins.deckbrew.xyz/plugins';
+      break;
+    case Store.Testing:
+      storeURL = 'https://testing.deckbrew.xyz/plugins';
+      break;
+    case Store.Custom:
+      storeURL = customURL;
+      break;
+    default:
+      console.error('Somehow you ended up without a standard URL, using the default URL.');
+      storeURL = 'https://plugins.deckbrew.xyz/plugins';
+      break;
   }
+  return fetch(storeURL + query, {
+    method: 'GET',
+    headers: {
+      'X-Decky-Version': version.current,
+    },
+  }).then((r) => r.json());
 }
 
 export async function installFromURL(url: string) {