Merge branch 'main' into fix/inbox-flicker-during-loading

Signed-off-by: Adam Setch <adam.setch@outlook.com>

Author: setchy

src/renderer/hooks/useNotifications.ts

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 
 import type {
   Account,
@@ -94,8 +94,14 @@ export const useNotifications = (): NotificationsState => {
     [notifications],
   );
 
+  const isFetchingRef = useRef(false);
   const fetchNotifications = useCallback(
     async (state: GitifyState) => {
+      if (isFetchingRef.current) {
+        // Prevent overlapping fetches
+        return;
+      }
+      isFetchingRef.current = true;
       setStatus('loading');
       try {
         const previousNotifications = notifications;

src/renderer/utils/api/errors.test.ts

@@ -83,7 +83,7 @@ describe('renderer/utils/api/errors.ts', () => {
       });
 
       it('network error - no status', () => {
-        const mockError = new RequestError('Network error', 0, {
+        const mockError = new RequestError('Network error', 500, {
           request: {
             method: 'GET',
             url: 'https://api.github.com',
@@ -94,8 +94,8 @@ describe('renderer/utils/api/errors.ts', () => {
         expect(result).toBe(Errors.NETWORK);
       });
 
-      it('unknown error - unhandled 403', () => {
-        const mockError = new RequestError('Forbidden', 403, {
+      it('unknown error - unhandled 418', () => {
+        const mockError = new RequestError('Forbidden', 418, {
           request: {
             method: 'GET',
             url: 'https://api.github.com',

src/renderer/utils/api/errors.ts

@@ -29,26 +29,26 @@ export function determineFailureType(
   if (err instanceof RequestError) {
     const status = err.status;
 
-    if (status === 401) {
-      return Errors.BAD_CREDENTIALS;
-    }
-
-    if (status === 403) {
-      if (message.includes("Missing the 'notifications' scope")) {
-        return Errors.MISSING_SCOPES;
-      }
-
-      if (
-        message.includes('API rate limit exceeded') ||
-        message.includes('You have exceeded a secondary rate limit')
-      ) {
-        return Errors.RATE_LIMITED;
-      }
-    }
-
-    // Network-like errors for RequestError (no status or status 0)
-    if (status === 0 || status === undefined) {
-      return Errors.NETWORK;
+    switch (status) {
+      case 401:
+        return Errors.BAD_CREDENTIALS;
+      case 403:
+        if (message.includes("Missing the 'notifications' scope")) {
+          return Errors.MISSING_SCOPES;
+        }
+
+        if (
+          message.includes('API rate limit exceeded') ||
+          message.includes('You have exceeded a secondary rate limit')
+        ) {
+          return Errors.RATE_LIMITED;
+        }
+
+        break;
+      case 500:
+        return Errors.NETWORK;
+      default:
+        break;
     }
   }
 

src/renderer/utils/api/octokit.ts

@@ -83,8 +83,7 @@ export async function createOctokitClientUncached(
     baseUrl: baseUrl,
     userAgent: userAgent,
     retry: {
-      doNotRetry: ['400', '401', '403', '404', '422'],
-      retries: 3,
+      retries: 1,
     },
   });
 }