wip

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

Author: setchy

package.json

@@ -83,6 +83,7 @@
     "@discordapp/twemoji": "16.0.1",
     "@electron/notarize": "3.0.2",
     "@octokit/core": "^6.1.6",
+    "@octokit/plugin-rest-endpoint-methods": "^16.1.0",
     "@primer/octicons-react": "19.15.5",
     "@primer/primitives": "11.1.0",
     "@primer/react": "36.27.0",

pnpm-lock.yaml

@@ -64,20 +64,45 @@ export function headNotifications(
  *
  * Endpoint documentation: https://docs.github.com/en/rest/activity/notifications#list-notifications-for-the-authenticated-user
  */
-export function listNotificationsForAuthenticatedUser(
+export async function listNotificationsForAuthenticatedUser(
   account: Account,
   settings: SettingsState,
-): AxiosPromise<Notification[]> {
-  const url = getGitHubAPIBaseUrl(account.hostname);
-  url.pathname += 'notifications';
-  url.searchParams.append('participating', String(settings.participating));
-  return apiRequestAuth(
-    url.toString() as Link,
-    'GET',
-    account.token,
-    {},
-    settings.fetchAllNotifications,
-  );
+): Promise<AxiosPromise<Notification[]>> {
+  const octokit = await createOctokitClient(account.hostname, account.token);
+
+  let response: any;
+
+  if (settings.fetchAllNotifications) {
+    response = await octokit.paginate.iterator(
+      octokit.rest.activity.listNotificationsForAuthenticatedUser,
+      {
+        participating: settings.participating,
+      },
+    );
+  }
+
+  response = await octokit.rest.activity.listNotificationsForAuthenticatedUser({
+    participating: settings.participating,
+  });
+
+  // Return axios-like response format
+  return {
+    data: response,
+    status: 200,
+    statusText: 'OK',
+    headers: {},
+  } as any;
+
+  // const url = getGitHubAPIBaseUrl(account.hostname);
+  // url.pathname += 'notifications';
+  // url.searchParams.append('participating', String(settings.participating));
+  // return apiRequestAuth(
+  //   url.toString() as Link,
+  //   'GET',
+  //   account.token,
+  //   {},
+  //   settings.fetchAllNotifications,
+  // );
 }
 
 /**
@@ -239,7 +264,7 @@ export async function searchDiscussions(
     notification.account.hostname,
     notification.account.token,
   );
-  
+
   const result = await octokit.graphql(print(QUERY_SEARCH_DISCUSSIONS), {
     queryStatement: formatAsGitHubSearchSyntax(
       notification.repository.full_name,

src/renderer/components/fields/__snapshots__/Tooltip.test.tsx.snap

@@ -1,13 +1,14 @@
 import { Octokit } from '@octokit/core';
 import { paginateRest } from '@octokit/plugin-paginate-rest';
+import { restEndpointMethods } from '@octokit/plugin-rest-endpoint-methods';
 
 import { logWarn } from '../../../shared/logger';
 import type { Hostname, Token } from '../../types';
 import { decryptValue } from '../comms';
 import { getGitHubAPIBaseUrl } from './utils';
 
 // Create the Octokit class with pagination plugin
-const OctokitWithPagination = Octokit.plugin(paginateRest);
+const OctokitWithPagination = Octokit.plugin(restEndpointMethods, paginateRest);
 
 /**
  * Create an Octokit client instance for a given hostname and token
@@ -20,7 +21,7 @@ export async function createOctokitClient(
   // TODO - Remove this try-catch block in a future release
   try {
     apiToken = (await decryptValue(token)) as Token;
-  } catch (err) {
+  } catch (_err) {
     logWarn('createOctokitClient', 'Token is not yet encrypted');
   }
 
@@ -45,4 +46,4 @@ export function createOctokitClientFromToken(
     auth: token,
     baseUrl: baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl,
   });
-}
+}