Cleaner code for requests

Author: kadiryazici

src/constants.ts

@@ -4,6 +4,11 @@ import { Icons } from './components/Icons'
 
 export const prefersDark = useMediaQuery('(prefers-color-scheme: dark)')
 
+export enum CheckedNotificationProcess {
+  Unsubscribe,
+  MarkAsRead,
+}
+
 export enum ColorPreference {
   System = 'system',
   Light = 'light',

src/pages/HomePage.vue

@@ -18,7 +18,7 @@ import { isRepository, isThread } from '../utils/notification'
 import Popover from '../components/Popover.vue'
 import MenuItems, { menuItem } from '../components/MenuItems.vue'
 import { type UseKeyOptions, useKey } from '../composables/useKey'
-import { notificationApiMutex } from '../constants'
+import { CheckedNotificationProcess, notificationApiMutex } from '../constants'
 import { everySome } from '../utils/array'
 
 const store = useStore()
@@ -150,7 +150,7 @@ async function handleSelectMarkAsRead(triggeredByKeyboard = false) {
   if (
     (triggeredByKeyboard && store.checkedItems.length > 0)
     || (contextMenuThread.value && isChecked(contextMenuThread.value))) {
-    store.markCheckedNotificationsAsRead(AppStorage.get('accessToken')!)
+    store.processCheckedNotifications(CheckedNotificationProcess.MarkAsRead)
     return
   }
 
@@ -182,9 +182,9 @@ async function handleSelectOpen(triggeredByKeyboard = false) {
     store.checkedItems.forEach(handleOpenNotification)
 
     if (AppStorage.get('markAsReadOnOpen'))
-      store.markCheckedNotificationsAsRead(AppStorage.get('accessToken')!)
-
-    store.checkedItems = []
+      store.processCheckedNotifications(CheckedNotificationProcess.MarkAsRead)
+    else
+      store.checkedItems = []
     return
   }
 
@@ -198,12 +198,7 @@ async function handleSelectUnsubscribe(triggeredByKeyboard = false) {
   if (
     (triggeredByKeyboard && store.checkedItems.length > 0)
     || (contextMenuThread.value && isChecked(contextMenuThread.value))) {
-    try {
-      await store.unsubscribeCheckedNotifications(AppStorage.get('accessToken')!)
-    }
-    catch (error) {
-      console.log(error)
-    }
+    store.processCheckedNotifications(CheckedNotificationProcess.Unsubscribe)
     return
   }
 

src/stores/store.ts

@@ -7,9 +7,9 @@ import { type UpdateManifest, installUpdate } from '@tauri-apps/api/updater'
 import { relaunch } from '@tauri-apps/api/process'
 import { computedEager } from '@vueuse/core'
 import { type Thread, getNotifications, markNotificationAsRead, unsubscribeNotification } from '../api/notifications'
-import { ColorPreference, InvokeCommand, Page, notificationApiMutex, prefersDark } from '../constants'
+import { CheckedNotificationProcess, ColorPreference, InvokeCommand, Page, notificationApiMutex, prefersDark } from '../constants'
 import { AppStorage } from '../storage'
-import type { AppStorageContext, NotificationList, Option, PageState } from '../types'
+import type { NotificationList, Option, PageState } from '../types'
 import { filterNewThreads, isRepository, isThread, toNotificationList } from '../utils/notification'
 
 export const useStore = defineStore('store', () => {
@@ -124,62 +124,40 @@ export const useStore = defineStore('store', () => {
     return notifications.value.findIndex(({ id }) => id === thread.id)
   }
 
-  async function markCheckedNotificationsAsRead(accessToken: NonNullable<AppStorageContext['accessToken']>) {
-    const deletedThreads: Thread['id'][] = []
-    const checkedThreads = checkedItems.value
-    const snapshot = notifications.value.slice(0)
-
-    checkedThreads.forEach(item => removeNotificationById(item.id))
-    triggerRef(notifications)
-
-    checkedItems.value = []
+  function processCheckedNotifications(process: CheckedNotificationProcess) {
+    return notificationApiMutex.runExclusive(async () => {
+      const deletedThreads: Thread['id'][] = []
+      const checkedThreads = checkedItems.value
+      const snapshot = notifications.value.slice(0)
+      const accessToken = AppStorage.get('accessToken')!
 
-    try {
-      await notificationApiMutex.runExclusive(() => pAll(
-        checkedThreads.map(thread => async () => {
-          await markNotificationAsRead(thread.id, accessToken)
-          deletedThreads.push(thread.id)
-        }),
-        {
-          stopOnError: false,
-          concurrency: 7,
-        },
-      ))
-    }
-    catch (error) {
-      notifications.value = snapshot
-      deletedThreads.forEach(id => removeNotificationById(id))
+      checkedThreads.forEach(item => removeNotificationById(item.id))
       triggerRef(notifications)
-    }
-  }
-
-  async function unsubscribeCheckedNotifications(accessToken: NonNullable<AppStorageContext['accessToken']>) {
-    const deletedThreads: Thread['id'][] = []
-    const checkedThreads = checkedItems.value
-    const snapshot = notifications.value.slice(0)
 
-    checkedItems.value = []
-
-    checkedThreads.forEach(item => removeNotificationById(item.id))
-    triggerRef(notifications)
+      checkedItems.value = []
 
-    try {
-      await notificationApiMutex.runExclusive(() => pAll(
-        checkedThreads.map(thread => async () => {
-          await unsubscribeNotification(thread.id, accessToken)
-          deletedThreads.push(thread.id)
-        }),
-        {
-          stopOnError: false,
-          concurrency: 7,
-        },
-      ))
-    }
-    catch (error) {
-      notifications.value = snapshot
-      deletedThreads.forEach(id => removeNotificationById(id))
-      triggerRef(notifications)
-    }
+      try {
+        await pAll(
+          checkedThreads.map(thread => async () => {
+            if (process === CheckedNotificationProcess.MarkAsRead)
+              await markNotificationAsRead(thread.id, accessToken)
+            else if (process === CheckedNotificationProcess.Unsubscribe)
+              await unsubscribeNotification(thread.id, accessToken)
+
+            deletedThreads.push(thread.id)
+          }),
+          {
+            stopOnError: false,
+            concurrency: 7,
+          },
+        )
+      }
+      catch (error) {
+        notifications.value = snapshot
+        deletedThreads.forEach(id => removeNotificationById(id))
+        triggerRef(notifications)
+      }
+    })
   }
 
   const newRelease = ref<Option<UpdateManifest>>(null)
@@ -229,12 +207,11 @@ export const useStore = defineStore('store', () => {
     installingUpate,
     theme,
     updateAndRestart,
-    unsubscribeCheckedNotifications,
     removeNotificationById,
     findThreadIndex,
-    markCheckedNotificationsAsRead,
     setPage,
     fetchNotifications,
+    processCheckedNotifications,
     logout,
   }
 })