fix discussions-url in native notification

Author: Araxeus

src/hooks/useNotifications.ts

@@ -100,7 +100,7 @@ export const useNotifications = (): NotificationsState => {
               notifications,
               data,
               settings,
-              accounts.user
+              accounts
             );
             setNotifications(data);
             setIsFetching(false);

src/utils/notifications.test.ts

@@ -7,6 +7,7 @@ import {
   mockedSingleAccountNotifications,
   mockedUser,
 } from '../__mocks__/mockedData';
+import { mockAccounts } from '../__mocks__/mock-state';
 import * as comms from './comms';
 import * as notificationsHelpers from './notifications';
 import { SettingsState } from '../types';
@@ -27,7 +28,7 @@ describe('utils/notifications.ts', () => {
       [],
       mockedAccountNotifications,
       settings,
-      mockedUser
+      mockAccounts
     );
 
     expect(notificationsHelpers.raiseNativeNotification).toHaveBeenCalledTimes(
@@ -52,7 +53,7 @@ describe('utils/notifications.ts', () => {
       [],
       mockedAccountNotifications,
       settings,
-      mockedUser
+      mockAccounts
     );
 
     expect(notificationsHelpers.raiseNativeNotification).not.toHaveBeenCalled();
@@ -73,7 +74,7 @@ describe('utils/notifications.ts', () => {
       mockedSingleAccountNotifications,
       mockedSingleAccountNotifications,
       settings,
-      mockedUser
+      mockAccounts
     );
 
     expect(notificationsHelpers.raiseNativeNotification).not.toHaveBeenCalled();
@@ -94,7 +95,7 @@ describe('utils/notifications.ts', () => {
       [],
       [],
       settings,
-      mockedUser
+      mockAccounts
     );
 
     expect(notificationsHelpers.raiseNativeNotification).not.toHaveBeenCalled();
@@ -106,7 +107,7 @@ describe('utils/notifications.ts', () => {
 
     const nativeNotification: Notification = notificationsHelpers.raiseNativeNotification(
       [mockedGithubNotifications[0]],
-      mockedUser.id
+      mockAccounts
     );
     nativeNotification.onclick(null);
 
@@ -125,7 +126,7 @@ describe('utils/notifications.ts', () => {
 
     const nativeNotification = notificationsHelpers.raiseNativeNotification(
       mockedGithubNotifications,
-      mockedUser.id
+      mockAccounts
     );
     nativeNotification.onclick(null);
 

src/utils/notifications.ts

@@ -1,10 +1,10 @@
-const { remote } = require('electron');
+const { remote, shell } = require('electron');
 
-import { generateGitHubWebUrl } from './helpers';
+import { generateGitHubWebUrl, getDiscussionUrl } from './helpers';
 import { reOpenWindow, openExternalLink, updateTrayIcon } from './comms';
-import { Notification, User } from '../typesGithub';
+import { Notification } from '../typesGithub';
 
-import { AccountNotifications, SettingsState } from '../types';
+import { AccountNotifications, SettingsState, AuthState } from '../types';
 
 export const setTrayIconColor = (notifications: AccountNotifications[]) => {
   const allNotificationsCount = notifications.reduce(
@@ -19,7 +19,7 @@ export const triggerNativeNotifications = (
   previousNotifications: AccountNotifications[],
   newNotifications: AccountNotifications[],
   settings: SettingsState,
-  user: User
+  accounts: AuthState
 ) => {
   const diffNotifications = newNotifications
     .map((account) => {
@@ -55,13 +55,13 @@ export const triggerNativeNotifications = (
   }
 
   if (settings.showNotifications) {
-    raiseNativeNotification(diffNotifications, user?.id);
+    raiseNativeNotification(diffNotifications, accounts);
   }
 };
 
 export const raiseNativeNotification = (
   notifications: Notification[],
-  userId?: number
+  accounts: AuthState
 ) => {
   let title: string;
   let body: string;
@@ -87,11 +87,22 @@ export const raiseNativeNotification = (
       const appWindow = remote.getCurrentWindow();
       appWindow.hide();
 
+      const { subject, id, repository } = notifications[0];
+
       // Some Notification types from GitHub are missing urls in their subjects.
       if (notificationUrl) {
-        const { subject, id } = notifications[0];
-        const url = generateGitHubWebUrl(subject.url, id, userId);
+        const url = generateGitHubWebUrl(subject.url, id, accounts.user?.id);
         openExternalLink(url);
+      } else if (notifications[0].subject.type === 'Discussion') {
+        getDiscussionUrl(notifications[0], accounts.token).then(url =>
+          shell.openExternal(
+            generateGitHubWebUrl(
+              url || `${repository.url}/discussions`,
+              id,
+              accounts.user?.id
+            )
+          )
+        );
       }
     } else {
       reOpenWindow();