Merge branch 'main' into feat/query-merging

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

Author: setchy

src/renderer/utils/api/client.ts

@@ -25,6 +25,7 @@ import {
   apiRequestAuth,
   type ExecutionResultWithHeaders,
   performGraphQLRequest,
+  performGraphQLRequestString,
 } from './request';
 import type {
   NotificationThreadSubscription,
@@ -194,6 +195,33 @@ export async function fetchAuthenticatedUserDetails(
   );
 }
 
+/**
+ * Fetch GitHub Discussion by Discussion Number.
+ */
+export async function fetchDiscussionByNumber(
+  notification: GitifyNotification,
+): Promise<ExecutionResult<FetchDiscussionByNumberQuery>> {
+  const url = getGitHubGraphQLUrl(notification.account.hostname);
+  const number = getNumberFromUrl(notification.subject.url);
+
+  return performGraphQLRequest(
+    url.toString() as Link,
+    notification.account.token,
+    FetchDiscussionByNumberDocument,
+    {
+      ownerINDEX: notification.repository.owner.login,
+      nameINDEX: notification.repository.name,
+      numberINDEX: number,
+      firstLabels: 100,
+      lastComments: 10,
+      lastReplies: 10,
+      includeIsAnswered: isAnsweredDiscussionFeatureSupported(
+        notification.account,
+      ),
+    },
+  );
+}
+
 /**
  * Fetch GitHub Issue by Issue Number.
  */
@@ -243,28 +271,19 @@ export async function fetchPullByNumber(
 }
 
 /**
- * Fetch GitHub Discussion by Discussion Number.
+ * Fetch Batched Details for Discussions, Issues and Pull Requests.
  */
-export async function fetchDiscussionByNumber(
+export async function fetchMergedQueryDetails(
   notification: GitifyNotification,
-): Promise<ExecutionResult<FetchDiscussionByNumberQuery>> {
+  mergedQuery: string,
+  mergedVariables: Record<string, string | number | boolean>,
+): Promise<ExecutionResult<Record<string, unknown>>> {
   const url = getGitHubGraphQLUrl(notification.account.hostname);
-  const number = getNumberFromUrl(notification.subject.url);
 
-  return performGraphQLRequest(
+  return performGraphQLRequestString(
     url.toString() as Link,
     notification.account.token,
-    FetchDiscussionByNumberDocument,
-    {
-      ownerINDEX: notification.repository.owner.login,
-      nameINDEX: notification.repository.name,
-      numberINDEX: number,
-      firstLabels: 100,
-      lastComments: 10,
-      lastReplies: 10,
-      includeIsAnswered: isAnsweredDiscussionFeatureSupported(
-        notification.account,
-      ),
-    },
+    mergedQuery,
+    mergedVariables,
   );
 }

src/renderer/utils/api/request.ts

@@ -121,6 +121,35 @@ export async function performGraphQLRequest<TResult, TVariables>(
   }) as Promise<ExecutionResultWithHeaders<TResult>>;
 }
 
+/**
+ * Perform a GraphQL API request using a raw query string instead of a TypedDocumentString.
+ *
+ * Useful for dynamically composed queries (e.g., merged queries built at runtime).
+ */
+export async function performGraphQLRequestString<TResult>(
+  url: Link,
+  token: Token,
+  query: string,
+  variables?: Record<string, unknown>,
+): Promise<ExecutionResultWithHeaders<TResult>> {
+  const headers = await getHeaders(url, token);
+
+  return axios({
+    method: 'POST',
+    url,
+    data: {
+      query,
+      variables,
+    },
+    headers: headers,
+  }).then((response) => {
+    return {
+      ...response.data,
+      headers: response.headers,
+    } as ExecutionResultWithHeaders<TResult>;
+  });
+}
+
 /**
  * Return true if the request should be made with no-cache
  *

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

@@ -16,6 +16,7 @@ import type {
   SettingsState,
 } from '../../../types';
 import { IconColor } from '../../../types';
+import { fetchIssueByNumber } from '../../api/client';
 import {
   type IssueDetailsFragment,
   IssueDetailsFragmentDoc,
@@ -41,11 +42,13 @@ class IssueHandler extends DefaultHandler {
   }
 
   async enrich(
-    _notification: GitifyNotification,
+    notification: GitifyNotification,
     _settings: SettingsState,
     fetchedData?: IssueDetailsFragment,
   ): Promise<Partial<GitifySubject>> {
-    const issue = fetchedData;
+    const issue =
+      fetchedData ??
+      (await fetchIssueByNumber(notification)).data.nodeINDEX.issue;
 
     const issueState = issue.stateReason ?? issue.state;
 

src/renderer/utils/notifications/notifications.ts

@@ -1,24 +1,23 @@
-import axios from 'axios';
-
 import type {
   AccountNotifications,
   GitifyNotification,
   GitifyState,
   GitifySubject,
-  Link,
   SettingsState,
 } from '../../types';
-import { listNotificationsForAuthenticatedUser } from '../api/client';
+import {
+  fetchMergedQueryDetails,
+  listNotificationsForAuthenticatedUser,
+} from '../api/client';
 import { determineFailureType } from '../api/errors';
 import type { TypedDocumentString } from '../api/graphql/generated/graphql';
 import {
   composeMergedQuery,
   extractFragments,
   getQueryFragmentBody,
 } from '../api/graphql/utils';
-import { getHeaders } from '../api/request';
 import { transformNotification } from '../api/transform';
-import { getGitHubGraphQLUrl, getNumberFromUrl } from '../api/utils';
+import { getNumberFromUrl } from '../api/utils';
 import { rendererLogError, rendererLogWarn } from '../logger';
 import {
   filterBaseNotifications,
@@ -237,22 +236,11 @@ export async function enrichNotifications(
   let mergedData: Record<string, unknown> | null = null;
 
   try {
-    const url = getGitHubGraphQLUrl(
-      notifications[0].account.hostname,
-    ).toString();
-    const token = notifications[0].account.token;
-
-    const headers = await getHeaders(url as Link, token);
-
-    const response = await axios({
-      method: 'POST',
-      url,
-      data: {
-        query: mergedQuery,
-        variables: queryVariables,
-      },
-      headers: headers,
-    });
+    const response = await fetchMergedQueryDetails(
+      notifications[0],
+      mergedQuery,
+      queryVariables,
+    );
 
     mergedData =
       (response.data as { data?: Record<string, unknown> })?.data ?? null;