refactor(forges): read settings store inside the forge layer

src/renderer/utils/forges/gitea/adapter.test.ts

@@ -3,7 +3,9 @@ import { KeyIcon } from '@primer/octicons-react';
 import { mockGiteaAccount } from '../../../__mocks__/account-mocks';
 import { mockPartialGitifyNotification } from '../../../__mocks__/notifications-mocks';
 
-import type { Hostname, Link, SettingsState, Token } from '../../../types';
+import { useSettingsStore } from '../../../stores';
+
+import type { Hostname, Link, Token } from '../../../types';
 
 import { giteaAdapter } from './adapter';
 import * as client from './client';
@@ -129,10 +131,9 @@ describe('renderer/utils/forges/gitea/adapter.ts', () => {
         },
       ]);
 
-      const result = await giteaAdapter.listNotifications(mockGiteaAccount, {
-        fetchAllNotifications: false,
-        fetchReadNotifications: false,
-      } as SettingsState);
+      useSettingsStore.setState({ fetchAllNotifications: false, fetchReadNotifications: false });
+
+      const result = await giteaAdapter.listNotifications(mockGiteaAccount);
 
       expect(result).toHaveLength(1);
       expect(result[0].id).toBe('99');

src/renderer/utils/forges/gitea/adapter.ts

@@ -1,13 +1,6 @@
 import { KeyIcon, ServerIcon } from '@primer/octicons-react';
 
-import type {
-  Account,
-  Hostname,
-  Link,
-  RawGitifyNotification,
-  SettingsState,
-  Token,
-} from '../../../types';
+import type { Account, Hostname, Link, RawGitifyNotification, Token } from '../../../types';
 import type {
   ForgeAdapter,
   ForgeCapabilities,
@@ -43,11 +36,8 @@ async function fetchAuthenticatedUser(account: Account): Promise<RefreshAccountD
   };
 }
 
-async function listNotifications(
-  account: Account,
-  settings: SettingsState,
-): Promise<RawGitifyNotification[]> {
-  const raw = await listGiteaNotifications(account, settings);
+async function listNotifications(account: Account): Promise<RawGitifyNotification[]> {
+  const raw = await listGiteaNotifications(account);
   return transformGiteaNotifications(raw, account);
 }
 

src/renderer/utils/forges/gitea/client.test.ts

@@ -1,6 +1,8 @@
 import { mockGiteaAccount } from '../../../__mocks__/account-mocks';
 
-import type { Hostname, SettingsState } from '../../../types';
+import { useSettingsStore } from '../../../stores';
+
+import type { Hostname } from '../../../types';
 
 import * as comms from '../../system/comms';
 import {
@@ -37,10 +39,9 @@ describe('renderer/utils/forges/gitea/client.ts', () => {
     it('fetches a single page when fetchAllNotifications is false', async () => {
       fetchMock().mockResolvedValueOnce(jsonResponse([{ id: 1 }]));
 
-      const result = await listGiteaNotifications(mockGiteaAccount, {
-        fetchAllNotifications: false,
-        fetchReadNotifications: false,
-      } as SettingsState);
+      useSettingsStore.setState({ fetchAllNotifications: false, fetchReadNotifications: false });
+
+      const result = await listGiteaNotifications(mockGiteaAccount);
 
       expect(result).toEqual([{ id: 1 }]);
       expect(fetchMock()).toHaveBeenCalledTimes(1);
@@ -54,10 +55,9 @@ describe('renderer/utils/forges/gitea/client.ts', () => {
     it('includes read status when fetchReadNotifications is true', async () => {
       fetchMock().mockResolvedValueOnce(jsonResponse([]));
 
-      await listGiteaNotifications(mockGiteaAccount, {
-        fetchAllNotifications: false,
-        fetchReadNotifications: true,
-      } as SettingsState);
+      useSettingsStore.setState({ fetchAllNotifications: false, fetchReadNotifications: true });
+
+      await listGiteaNotifications(mockGiteaAccount);
 
       const calledUrl = fetchMock().mock.calls[0][0] as string;
       expect(calledUrl).toContain('status-types=unread');
@@ -70,10 +70,9 @@ describe('renderer/utils/forges/gitea/client.ts', () => {
         .mockResolvedValueOnce(jsonResponse([{ id: 100 }]))
         .mockResolvedValueOnce(jsonResponse([]));
 
-      const result = await listGiteaNotifications(mockGiteaAccount, {
-        fetchAllNotifications: true,
-        fetchReadNotifications: false,
-      } as SettingsState);
+      useSettingsStore.setState({ fetchAllNotifications: true, fetchReadNotifications: false });
+
+      const result = await listGiteaNotifications(mockGiteaAccount);
 
       expect(result).toHaveLength(101);
       expect(fetchMock()).toHaveBeenCalledTimes(2);
@@ -87,20 +86,14 @@ describe('renderer/utils/forges/gitea/client.ts', () => {
         }),
       );
 
-      await expect(
-        listGiteaNotifications(mockGiteaAccount, {
-          fetchAllNotifications: false,
-          fetchReadNotifications: false,
-        } as SettingsState),
-      ).rejects.toThrow(/^Gitea API 403 Forbidden$/);
+      useSettingsStore.setState({ fetchAllNotifications: false, fetchReadNotifications: false });
+
+      await expect(listGiteaNotifications(mockGiteaAccount)).rejects.toThrow(
+        /^Gitea API 403 Forbidden$/,
+      );
       // The thrown error must not include the response body — a hostile
       // server could echo back the Authorization header into logs.
-      await expect(
-        listGiteaNotifications(mockGiteaAccount, {
-          fetchAllNotifications: false,
-          fetchReadNotifications: false,
-        } as SettingsState),
-      ).rejects.toThrow();
+      await expect(listGiteaNotifications(mockGiteaAccount)).rejects.toThrow();
     });
   });
 

src/renderer/utils/forges/gitea/client.ts

@@ -1,4 +1,6 @@
-import type { Account, Hostname, SettingsState } from '../../../types';
+import useSettingsStore from '../../../stores/useSettingsStore';
+
+import type { Account, Hostname } from '../../../types';
 import type { GiteaNotificationThread, GiteaUser } from './types';
 
 import { isValidHostname } from '../../auth/utils';
@@ -53,7 +55,9 @@ async function giteaRequest<T>(account: Account, pathname: string, init?: Reques
   return response.json() as Promise<T>;
 }
 
-function buildNotificationQuery(settings: SettingsState): string {
+function buildNotificationQuery(): string {
+  const settings = useSettingsStore.getState();
+
   const params = new URLSearchParams();
   params.set('limit', String(PAGE_SIZE));
 
@@ -66,13 +70,10 @@ function buildNotificationQuery(settings: SettingsState): string {
   return params.toString();
 }
 
-export async function listGiteaNotifications(
-  account: Account,
-  settings: SettingsState,
-): Promise<GiteaNotificationThread[]> {
-  const query = buildNotificationQuery(settings);
+export async function listGiteaNotifications(account: Account): Promise<GiteaNotificationThread[]> {
+  const query = buildNotificationQuery();
 
-  if (!settings.fetchAllNotifications) {
+  if (!useSettingsStore.getState().fetchAllNotifications) {
     return giteaRequest<GiteaNotificationThread[]>(account, `notifications?${query}&page=1`);
   }
 

src/renderer/utils/forges/github/adapter.test.ts

@@ -2,7 +2,7 @@ import { AppsIcon, KeyIcon, PersonIcon } from '@primer/octicons-react';
 
 import { mockGitHubCloudAccount } from '../../../__mocks__/account-mocks';
 
-import type { Hostname, Link, SettingsState, Token } from '../../../types';
+import type { Hostname, Link, Token } from '../../../types';
 
 import { githubAdapter } from './adapter';
 import * as client from './client';
@@ -102,7 +102,6 @@ describe('renderer/utils/forges/github/adapter.ts', () => {
 
   describe('listNotifications', () => {
     it('lists notifications and transforms them to GitifyNotification', async () => {
-      const settings = {} as SettingsState;
       vi.spyOn(client, 'listNotificationsForAuthenticatedUser').mockResolvedValue([
         {
           id: '1',
@@ -128,7 +127,7 @@ describe('renderer/utils/forges/github/adapter.ts', () => {
         },
       ] as unknown as Awaited<ReturnType<typeof client.listNotificationsForAuthenticatedUser>>);
 
-      const result = await githubAdapter.listNotifications(mockGitHubCloudAccount, settings);
+      const result = await githubAdapter.listNotifications(mockGitHubCloudAccount);
 
       expect(result).toHaveLength(1);
       expect(result[0].id).toBe('1');

src/renderer/utils/forges/github/adapter.ts

@@ -2,7 +2,7 @@ import { AppsIcon, KeyIcon, MarkGithubIcon, PersonIcon } from '@primer/octicons-
 
 import { Constants } from '../../../constants';
 
-import type { Account, Link, RawGitifyNotification, SettingsState } from '../../../types';
+import type { Account, Link, RawGitifyNotification } from '../../../types';
 import type { AuthMethod } from '../../auth/types';
 import type { ForgeAdapter, NotificationDisplayHelpers, RefreshAccountData } from '../types';
 
@@ -52,11 +52,8 @@ async function fetchAuthenticatedUser(account: Account): Promise<RefreshAccountD
   };
 }
 
-async function listNotifications(
-  account: Account,
-  settings: SettingsState,
-): Promise<RawGitifyNotification[]> {
-  const raw = await listNotificationsForAuthenticatedUser(account, settings);
+async function listNotifications(account: Account): Promise<RawGitifyNotification[]> {
+  const raw = await listNotificationsForAuthenticatedUser(account);
   return transformNotifications(raw, account);
 }
 

src/renderer/utils/forges/github/client.test.ts

@@ -8,7 +8,9 @@ import {
 
 import { Constants } from '../../../constants';
 
-import type { Link, SettingsState } from '../../../types';
+import { useSettingsStore } from '../../../stores';
+
+import type { Link } from '../../../types';
 
 import {
   fetchAuthenticatedUserDetails,
@@ -125,16 +127,13 @@ describe('renderer/utils/forges/github/client.ts', () => {
 
   describe('listNotificationsForAuthenticatedUser', () => {
     it('should list only participating notifications for user', async () => {
-      const mockSettings: Partial<SettingsState> = {
+      useSettingsStore.setState({
         participating: true,
         fetchReadNotifications: false,
         fetchAllNotifications: false,
-      };
+      });
 
-      await listNotificationsForAuthenticatedUser(
-        mockGitHubCloudAccount,
-        mockSettings as SettingsState,
-      );
+      await listNotificationsForAuthenticatedUser(mockGitHubCloudAccount);
 
       expect(createOctokitClientSpy).toHaveBeenCalledWith(mockGitHubCloudAccount, 'rest');
       expect(mockOctokit.rest.activity.listNotificationsForAuthenticatedUser).toHaveBeenCalledWith({
@@ -148,16 +147,13 @@ describe('renderer/utils/forges/github/client.ts', () => {
     });
 
     it('should list participating and watching notifications for user', async () => {
-      const mockSettings: Partial<SettingsState> = {
+      useSettingsStore.setState({
         participating: false,
         fetchReadNotifications: false,
         fetchAllNotifications: false,
-      };
+      });
 
-      await listNotificationsForAuthenticatedUser(
-        mockGitHubCloudAccount,
-        mockSettings as SettingsState,
-      );
+      await listNotificationsForAuthenticatedUser(mockGitHubCloudAccount);
 
       expect(createOctokitClientSpy).toHaveBeenCalledWith(mockGitHubCloudAccount, 'rest');
       expect(mockOctokit.rest.activity.listNotificationsForAuthenticatedUser).toHaveBeenCalledWith({
@@ -171,16 +167,13 @@ describe('renderer/utils/forges/github/client.ts', () => {
     });
 
     it('should list read and done notifications for user', async () => {
-      const mockSettings: Partial<SettingsState> = {
+      useSettingsStore.setState({
         participating: false,
         fetchReadNotifications: true,
         fetchAllNotifications: false,
-      };
+      });
 
-      await listNotificationsForAuthenticatedUser(
-        mockGitHubCloudAccount,
-        mockSettings as SettingsState,
-      );
+      await listNotificationsForAuthenticatedUser(mockGitHubCloudAccount);
 
       expect(createOctokitClientSpy).toHaveBeenCalledWith(mockGitHubCloudAccount, 'rest');
       expect(mockOctokit.rest.activity.listNotificationsForAuthenticatedUser).toHaveBeenCalledWith({
@@ -194,16 +187,13 @@ describe('renderer/utils/forges/github/client.ts', () => {
     });
 
     it('should unpaginate notifications list for user', async () => {
-      const mockSettings: Partial<SettingsState> = {
+      useSettingsStore.setState({
         participating: false,
         fetchReadNotifications: false,
         fetchAllNotifications: true,
-      };
+      });
 
-      await listNotificationsForAuthenticatedUser(
-        mockGitHubCloudAccount,
-        mockSettings as SettingsState,
-      );
+      await listNotificationsForAuthenticatedUser(mockGitHubCloudAccount);
 
       expect(createOctokitClientSpy).toHaveBeenCalledWith(mockGitHubCloudAccount, 'rest');
       expect(mockOctokit.paginate).toHaveBeenCalledWith(

src/renderer/utils/forges/github/client.ts

@@ -1,6 +1,8 @@
 import { Constants } from '../../../constants';
 
-import type { Account, Link, RawGitifyNotification, SettingsState } from '../../../types';
+import useSettingsStore from '../../../stores/useSettingsStore';
+
+import type { Account, Link, RawGitifyNotification } from '../../../types';
 import type {
   GetCommitCommentResponse,
   GetCommitResponse,
@@ -49,8 +51,8 @@ export async function fetchAuthenticatedUserDetails(account: Account) {
  */
 export async function listNotificationsForAuthenticatedUser(
   account: Account,
-  settings: SettingsState,
 ): Promise<ListNotificationsForAuthenticatedUserResponse> {
+  const settings = useSettingsStore.getState();
   const octokit = await createOctokitClient(account, 'rest');
 
   if (settings.fetchAllNotifications) {

src/renderer/utils/forges/github/enrich.test.ts

@@ -1,5 +1,4 @@
 import { mockPartialGitifyNotification } from '../../../__mocks__/notifications-mocks';
-import { mockSettings } from '../../../__mocks__/state-mocks';
 
 import type { GitifyRepository, Link } from '../../../types';
 
@@ -45,7 +44,7 @@ describe('renderer/utils/forges/github/enrich.ts', () => {
 
     vi.mocked(client.fetchIssueByNumber).mockRejectedValue(mockError);
 
-    const [result] = await enrichGitHubNotifications([mockNotification], mockSettings);
+    const [result] = await enrichGitHubNotifications([mockNotification]);
 
     expect(result).toBeDefined();
     expect(rendererLogErrorSpy).toHaveBeenCalledWith(

src/renderer/utils/forges/github/enrich.ts

@@ -1,4 +1,4 @@
-import type { GitifySubject, RawGitifyNotification, SettingsState } from '../../../types';
+import type { GitifySubject, RawGitifyNotification } from '../../../types';
 
 import { rendererLogError, rendererLogWarn, toError } from '../../core/logger';
 import { fetchNotificationDetailsForList } from './client';
@@ -23,14 +23,11 @@ export const GITHUB_API_MERGE_BATCH_SIZE = 100;
  */
 export async function enrichGitHubNotifications(
   notifications: RawGitifyNotification[],
-  settings: SettingsState,
 ): Promise<RawGitifyNotification[]> {
   const fragments = await fetchInBatches(notifications);
 
   return Promise.all(
-    notifications.map((notification) =>
-      enrichSingle(notification, settings, fragments.get(notification)),
-    ),
+    notifications.map((notification) => enrichSingle(notification, fragments.get(notification))),
   );
 }
 
@@ -67,14 +64,13 @@ async function fetchInBatches(
 
 async function enrichSingle(
   notification: RawGitifyNotification,
-  settings: SettingsState,
   fetchedData: FetchMergedDetailsTemplateQuery['repository'] | undefined,
 ): Promise<RawGitifyNotification> {
   let additionalSubjectDetails: Partial<GitifySubject> = {};
 
   try {
     const handler = createNotificationHandler(notification);
-    additionalSubjectDetails = await handler.enrich(notification, settings, fetchedData);
+    additionalSubjectDetails = await handler.enrich(notification, fetchedData);
   } catch (err) {
     rendererLogError(
       'enrichGitHubNotifications',