refactor: use octokit client

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

Author: setchy

src/renderer/hooks/useNotifications.ts

@@ -143,10 +143,9 @@ export const useNotifications = (): NotificationsState => {
       try {
         await Promise.all(
           readNotifications.map((notification) =>
-            markNotificationThreadAsRead(
+            markNotificationThreadAsRead(notification.account,
               notification.id,
-              notification.account.hostname,
-              notification.account.token,
+
             ),
           ),
         );
@@ -183,10 +182,9 @@ export const useNotifications = (): NotificationsState => {
       try {
         await Promise.all(
           doneNotifications.map((notification) =>
-            markNotificationThreadAsDone(
+            markNotificationThreadAsDone(notification.account,
               notification.id,
-              notification.account.hostname,
-              notification.account.token,
+
             ),
           ),
         );
@@ -218,9 +216,9 @@ export const useNotifications = (): NotificationsState => {
 
       try {
         await ignoreNotificationThreadSubscription(
+          notification.account,
           notification.id,
-          notification.account.hostname,
-          notification.account.token,
+
         );
 
         if (state.settings.markAsDoneOnUnsubscribe) {

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

@@ -7,7 +7,7 @@ import { mockToken } from '../../__mocks__/state-mocks';
 
 import { Constants } from '../../constants';
 
-import type { Hostname, Link, SettingsState, Token } from '../../types';
+import type { Hostname, Link, SettingsState } from '../../types';
 import type { GitHubGraphQLResponse } from './graphql/types';
 
 import {
@@ -192,10 +192,9 @@ describe('renderer/utils/api/client.ts', () => {
   });
 
   it('markNotificationThreadAsRead - should mark notification thread as read', async () => {
-    await markNotificationThreadAsRead(
+    await markNotificationThreadAsRead(mockGitHubCloudAccount,
       mockThreadId,
-      mockGitHubHostname,
-      mockToken,
+
     );
 
     expect(performAuthenticatedRESTRequestSpy).toHaveBeenCalledWith(
@@ -207,10 +206,9 @@ describe('renderer/utils/api/client.ts', () => {
   });
 
   it('markNotificationThreadAsDone - should mark notification thread as done', async () => {
-    await markNotificationThreadAsDone(
+    await markNotificationThreadAsDone(mockGitHubCloudAccount,
       mockThreadId,
-      mockGitHubHostname,
-      mockToken,
+
     );
 
     expect(performAuthenticatedRESTRequestSpy).toHaveBeenCalledWith(
@@ -222,10 +220,9 @@ describe('renderer/utils/api/client.ts', () => {
   });
 
   it('ignoreNotificationThreadSubscription - should ignore notification thread subscription', async () => {
-    await ignoreNotificationThreadSubscription(
+    await ignoreNotificationThreadSubscription(mockGitHubCloudAccount,
       mockThreadId,
-      mockGitHubHostname,
-      mockToken,
+
     );
 
     expect(performAuthenticatedRESTRequestSpy).toHaveBeenCalledWith(
@@ -238,8 +235,9 @@ describe('renderer/utils/api/client.ts', () => {
 
   it('getHtmlUrl - should return the HTML URL', async () => {
     await getHtmlUrl(
+      mockGitHubCloudAccount,
       'https://api.github.com/repos/gitify-app/notifications-test/issues/785' as Link,
-      '123' as Token,
+
     );
 
     expect(performAuthenticatedRESTRequestSpy).toHaveBeenCalledWith(

src/renderer/utils/api/client.ts

@@ -102,11 +102,10 @@ export async function listNotificationsForAuthenticatedUser(
  * Endpoint documentation: https://docs.github.com/en/rest/activity/notifications#mark-a-thread-as-read
  */
 export async function markNotificationThreadAsRead(
+  account: Account,
   threadId: string,
-  hostname: Hostname,
-  token: Token,
 ): Promise<MarkNotificationThreadAsReadResponse> {
-  const octokit = await createOctokitClient(hostname, token);
+  const octokit = await createOctokitClient(account.hostname, account.token);
 
   const response = await octokit.rest.activity.markThreadAsRead({
     thread_id: Number(threadId),
@@ -124,11 +123,10 @@ export async function markNotificationThreadAsRead(
  * Endpoint documentation: https://docs.github.com/en/rest/activity/notifications#mark-a-thread-as-done
  */
 export async function markNotificationThreadAsDone(
+  account: Account,
   threadId: string,
-  hostname: Hostname,
-  token: Token,
 ): Promise<MarkNotificationThreadAsDoneResponse> {
-  const octokit = await createOctokitClient(hostname, token);
+  const octokit = await createOctokitClient(account.hostname, account.token);
 
   const response = await octokit.rest.activity.markThreadAsDone({
     thread_id: Number(threadId),
@@ -143,11 +141,10 @@ export async function markNotificationThreadAsDone(
  * Endpoint documentation: https://docs.github.com/en/rest/activity/notifications#delete-a-thread-subscription
  */
 export async function ignoreNotificationThreadSubscription(
+  account: Account,
   threadId: string,
-  hostname: Hostname,
-  token: Token,
 ): Promise<IgnoreNotificationThreadSubscriptionResponse> {
-  const octokit = await createOctokitClient(hostname, token);
+  const octokit = await createOctokitClient(account.hostname, account.token);
 
   const response = await octokit.rest.activity.setThreadSubscription({
     thread_id: Number(threadId),
@@ -163,31 +160,17 @@ export async function ignoreNotificationThreadSubscription(
  * Endpoint documentation: https://docs.github.com/en/rest/commits/commits#get-a-commit
  */
 export async function getCommit(
+  account: Account,
   url: Link,
-  token: Token,
 ): Promise<GetCommitResponse> {
-  // Parse URL: /repos/{owner}/{repo}/commits/{ref}
-  const urlObj = new URL(url);
-  const match = urlObj.pathname.match(
-    /^\/repos\/(?<owner>[^/]+)\/(?<repo>[^/]+)\/commits\/(?<ref>.+)$/,
-  );
+      const octokit = await createOctokitClient(account.hostname, account.token);
 
-  if (!match?.groups) {
-    throw new Error(`Invalid commit URL format: ${url}`);
-  }
-
-  const { owner, repo, ref } = match.groups;
-  const hostname = urlObj.hostname as Hostname;
-
-  const octokit = await createOctokitClient(hostname, token);
-
-  const response = await octokit.rest.repos.getCommit({
-    owner,
-    repo,
-    ref,
+  // Perform a generic GET request using Octokit's request method
+  const response = await octokit.request('GET {+url}', {
+    url: url,
   });
 
-  return response.data;
+  return response.data as GetCommitResponse;
 }
 
 /**
@@ -196,31 +179,17 @@ export async function getCommit(
  * Endpoint documentation: https://docs.github.com/en/rest/commits/comments#get-a-commit-comment
  */
 export async function getCommitComment(
+  account: Account,
   url: Link,
-  token: Token,
 ): Promise<GetCommitCommentResponse> {
-  // Parse URL: /repos/{owner}/{repo}/comments/{comment_id}
-  const urlObj = new URL(url);
-  const match = urlObj.pathname.match(
-    /^\/repos\/(?<owner>[^/]+)\/(?<repo>[^/]+)\/comments\/(?<commentId>\d+)$/,
-  );
-
-  if (!match?.groups) {
-    throw new Error(`Invalid commit comment URL format: ${url}`);
-  }
+    const octokit = await createOctokitClient(account.hostname, account.token);
 
-  const { owner, repo, commentId } = match.groups;
-  const hostname = urlObj.hostname as Hostname;
-
-  const octokit = await createOctokitClient(hostname, token);
-
-  const response = await octokit.rest.repos.getCommitComment({
-    owner: owner,
-    repo: repo,
-    comment_id: Number(commentId),
+  // Perform a generic GET request using Octokit's request method
+  const response = await octokit.request('GET {+url}', {
+    url: url,
   });
 
-  return response.data;
+  return response.data as GetCommitCommentResponse;
 }
 
 /**
@@ -229,45 +198,27 @@ export async function getCommitComment(
  * Endpoint documentation: https://docs.github.com/en/rest/releases/releases#get-a-release
  */
 export async function getRelease(
+  account: Account,
   url: Link,
-  token: Token,
 ): Promise<GetReleaseResponse> {
-  // Parse URL: /repos/{owner}/{repo}/releases/{release_id}
-  const urlObj = new URL(url);
-  const match = urlObj.pathname.match(
-    /^\/repos\/(?<owner>[^/]+)\/(?<repo>[^/]+)\/releases\/(?<releaseId>\d+)$/,
-  );
-
-  if (!match?.groups) {
-    throw new Error(`Invalid release URL format: ${url}`);
-  }
-
-  const { owner, repo, releaseId } = match.groups;
-  const hostname = urlObj.hostname as Hostname;
-
-  const octokit = await createOctokitClient(hostname, token);
+  const octokit = await createOctokitClient(account.hostname, account.token);
 
-  const response = await octokit.rest.repos.getRelease({
-    owner: owner,
-    repo: repo,
-    release_id: Number(releaseId),
+  // Perform a generic GET request using Octokit's request method
+  const response = await octokit.request('GET {+url}', {
+    url: url,
   });
 
-  return response.data;
+  return response.data as GetReleaseResponse;
 }
 
 /**
  * Get the `html_url` from the GitHub response
  */
 export async function getHtmlUrl(
+  account: Account,
   url: Link,
-  token: Token,
 ): Promise<GitHubHtmlUrlResponse> {
-  // Extract hostname from URL to determine which Octokit client to use
-  const urlObj = new URL(url);
-  const hostname = urlObj.hostname as Hostname;
-
-  const octokit = await createOctokitClient(hostname, token);
+  const octokit = await createOctokitClient(account.hostname, account.token);
 
   // Perform a generic GET request using Octokit's request method
   const response = await octokit.request('GET {+url}', {
@@ -277,6 +228,24 @@ export async function getHtmlUrl(
   return response.data as GitHubHtmlUrlResponse;
 }
 
+
+/**
+ * Follow GitHub Response URL
+ */
+export async function followUrl<TResult>(
+  account: Account,
+  url: Link,
+): Promise<TResult> {
+  const octokit = await createOctokitClient(account.hostname, account.token);
+
+  // Perform a generic GET request using Octokit's request method
+  const response = await octokit.request('GET {+url}', {
+    url: url,
+  });
+
+  return response.data as TResult;
+}
+
 /**
  * Fetch details of the currently authenticated GitHub user.
  */

src/renderer/utils/helpers.ts

@@ -62,16 +62,15 @@ export async function generateGitHubWebUrl(
   } else {
     try {
       if (notification.subject.latestCommentUrl) {
-        const response = await getHtmlUrl(
+        const response = await getHtmlUrl(notification.account,
           notification.subject.latestCommentUrl,
-          notification.account.token,
         );
 
         url.href = response.html_url;
       } else if (notification.subject.url) {
-        const response = await getHtmlUrl(
+        const response = await getHtmlUrl(notification.account,
           notification.subject.url,
-          notification.account.token,
+          
         );
 
         url.href = response.html_url;

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

@@ -12,10 +12,11 @@ import type {
   SettingsState,
 } from '../../../types';
 
-import { getCommit, getCommitComment } from '../../api/client';
+import { followUrl } from '../../api/client';
 import { isStateFilteredOut } from '../filters/filter';
 import { DefaultHandler } from './default';
 import { getNotificationAuthor } from './utils';
+import { GetCommitCommentResponse, GetCommitResponse } from '../../api/types';
 
 class CommitHandler extends DefaultHandler {
   readonly type = 'Commit';
@@ -35,9 +36,8 @@ class CommitHandler extends DefaultHandler {
 
     if (notification.subject.latestCommentUrl) {
       const commitComment = (
-        await getCommitComment(
+        await followUrl<GetCommitCommentResponse>(notification.account,
           notification.subject.latestCommentUrl,
-          notification.account.token,
         )
       );
 
@@ -48,10 +48,9 @@ class CommitHandler extends DefaultHandler {
         type: commitComment.user.type as GitifyNotificationUser['type'],
       };
     } else {
-      const commit = await getCommit(
-        notification.subject.url,
-        notification.account.token,
-      );
+            
+      
+      const commit = await followUrl<GetCommitResponse>(notification.account, notification.subject.url) 
 
       user = {
         login: commit.author.login,

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

@@ -13,10 +13,11 @@ import type {
   UserType,
 } from '../../../types';
 
-import { getRelease } from '../../api/client';
+import { followUrl } from '../../api/client';
 import { isStateFilteredOut } from '../filters/filter';
 import { DefaultHandler, defaultHandler } from './default';
 import { getNotificationAuthor } from './utils';
+import { GetReleaseResponse } from '../../api/types';
 
 class ReleaseHandler extends DefaultHandler {
   readonly type = 'Release';
@@ -33,7 +34,7 @@ class ReleaseHandler extends DefaultHandler {
     }
 
     const release = (
-      await getRelease(notification.subject.url, notification.account.token)
+      await followUrl<GetReleaseResponse>(notification.account, notification.subject.url)
     );
 
     const user: GitifyNotificationUser = release.author