Before Release v3.0.1

Author: TareHimself

release/app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wallpaperz",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A wallpaper app",
   "main": "./dist/main/main.js",
   "author": {

release/app/package.json

@@ -350,23 +350,32 @@ if (!gotTheLock) {
       const decryptedLoginData = safeStorage.decryptString(encryptedLoginData);
 
       const loginData = JSON.parse(decryptedLoginData) as ILoginData;
-      socket.once(
-        'verify-discord',
-        async (
-          payload: { account: IAccountData; discord: IDiscordData } | null
-        ) => {
-          if (!payload) {
-            if (fsSync.existsSync(loginDataPath)) {
-              await fs.unlink(loginDataPath);
-            }
-            event.reply('get-login', undefined);
-          }
 
-          event.reply('get-login', payload);
-        }
-      );
+      const loginFromServer = await Promise.race([
+        new Promise((resolve) => {
+          socket.once(
+            'verify-discord',
+            async (
+              payload: { account: IAccountData; discord: IDiscordData } | null
+            ) => {
+              if (!payload) {
+                if (fsSync.existsSync(loginDataPath)) {
+                  await fs.unlink(loginDataPath);
+                }
+                resolve(undefined);
+              }
 
-      socket.emit('verify-discord', loginData.discord);
+              resolve(payload);
+            }
+          );
+          socket.emit('verify-discord', loginData.discord);
+        }),
+        new Promise((resolve) => {
+          setTimeout(resolve, 8000, undefined);
+        }),
+      ]);
+
+      event.reply('get-login', loginFromServer);
     } else {
       event.reply('get-login', undefined);
     }

src/main/main.ts

@@ -203,7 +203,7 @@ export default function App() {
         fetchWallpapers({
           page: wallpapersData.currentPage,
           maxItems: userData.settings.maxItemsPerPage,
-          query: '',
+          query: wallpapersData.query,
         })
       );
     }
@@ -212,6 +212,7 @@ export default function App() {
     userData.settings,
     userData.settings?.maxItemsPerPage,
     wallpapersData.currentPage,
+    wallpapersData.query,
   ]);
 
   if (window.electron) {

src/renderer/App.tsx

@@ -34,6 +34,11 @@ async function getWallpapers(page: number, maxItems: number, query: string) {
   };
 
   if (maxItems > 0) {
+    console.log(
+      `${await getDatabaseUrl()}/wallpapers?o=${page * maxItems}&l=${
+        maxItems + 1
+      }&q=${query}`
+    );
     const response = (await axios
       .get(
         `${await getDatabaseUrl()}/wallpapers?o=${page * maxItems}&l=${
@@ -77,6 +82,7 @@ const fetchWallpapers = createAsyncThunk(
     maxItems: number;
     query: string;
   }) => {
+    console.log('Fetching');
     const fetchResult = await getWallpapers(page, maxItems, query);
 
     return { ...fetchResult, page, query, maxItems };