feat(api): merge query

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/utils/notifications/handlers/default.ts

@@ -16,15 +16,19 @@ export class DefaultHandler implements NotificationTypeHandler {
     return null;
   }
 
-  async enrich(_fetchedData?: unknown): Promise<GitifySubject> {
+  async fetchAndEnrich(
+    _notification: Notification,
+    _settings: SettingsState,
+  ): Promise<GitifySubject> {
     return null;
   }
 
-  async fetchAndEnrich(
-    notification: Notification,
-    settings: SettingsState,
+  async enrich(
+    _notification: Notification,
+    _settings: SettingsState,
+    _fetchedData?: unknown,
   ): Promise<GitifySubject> {
-    return this.enrich(notification, settings, undefined);
+    return null;
   }
 
   iconType(_subject: Subject): FC<OcticonProps> | null {

src/renderer/utils/notifications/handlers/issue.ts

@@ -16,7 +16,6 @@ import type {
 } from '../../../types';
 import { IconColor } from '../../../types';
 import type { Notification, Subject } from '../../../typesGitHub';
-import { fetchIssueByNumber } from '../../api/client';
 import type { IssueDetailsFragment } from '../../api/graphql/generated/graphql';
 import { DefaultHandler, defaultHandler } from './default';
 import { getNotificationAuthor } from './utils';
@@ -25,7 +24,7 @@ class IssueHandler extends DefaultHandler {
   readonly type = 'Issue';
 
   async enrich(
-    notification: Notification,
+    _notification: Notification,
     _settings: SettingsState,
     fetchedData?: IssueDetailsFragment,
   ): Promise<GitifySubject> {

src/renderer/utils/notifications/handlers/types.ts

@@ -11,20 +11,20 @@ export interface NotificationTypeHandler<TFragment = unknown> {
   query(notification: Notification): { query; variables } | null;
 
   /**
-   * Enrich a notification. Settings may be unused for some handlers.
+   * Fetch remote data (if needed) and enrich a notification.
    */
-  enrich(
+  fetchAndEnrich(
     notification: Notification,
     settings: SettingsState,
-    fetchedData?: TFragment,
   ): Promise<GitifySubject>;
 
   /**
-   * Fetch remote data (if needed) and enrich a notification.
+   * Enrich a notification. Settings may be unused for some handlers.
    */
-  fetchAndEnrich(
+  enrich(
     notification: Notification,
-    settings: SettingsState,
+    settings?: SettingsState,
+    fetchedData?: TFragment,
   ): Promise<GitifySubject>;
 
   /**