feat(discussions): default to discussion author

src/components/__snapshots__/NotificationRow.test.tsx.snap

@@ -207,10 +207,10 @@ exports[`components/NotificationRow.tsx should render itself & its children with
   </div>
   <div
     className="flex-1 overflow-hidden"
+    onClick={[Function]}
   >
     <div
       className="mb-1 text-sm whitespace-nowrap overflow-ellipsis overflow-hidden cursor-pointer"
-      onClick={[Function]}
       role="main"
       title="I am a robot and this is a test!"
     >

src/hooks/useNotifications.test.ts

@@ -280,6 +280,13 @@ describe('hooks/useNotifications.ts', () => {
                     stateReason: null,
                     isAnswered: true,
                     url: 'https://github.com/manosim/notifications-test/discussions/612',
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/1?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [
                         {
@@ -290,6 +297,7 @@ describe('hooks/useNotifications.ts', () => {
                             url: 'https://github.com/comment-user',
                             avatar_url:
                               'https://avatars.githubusercontent.com/u/1?v=4',
+                            type: 'User',
                           },
                           replies: {
                             nodes: [],

src/routes/__snapshots__/Notifications.test.tsx.snap

@@ -90,6 +90,12 @@ exports[`routes/Notifications.tsx should render itself & its children (show acco
             "title": "I am a robot and this is a test!",
             "type": "Issue",
             "url": "https://api.github.com/repos/manosim/notifications-test/issues/1",
+            "user": {
+              "avatar_url": "https://avatars0.githubusercontent.com/u/6333409?v=3",
+              "html_url": "https://github.com/manosim",
+              "login": "manosim",
+              "type": "User",
+            },
           },
           "subscription_url": "https://api.github.com/notifications/threads/138661096/subscription",
           "unread": true,

src/typesGithub.ts

@@ -146,6 +146,7 @@ export interface DiscussionAuthor {
   login: string;
   url: string;
   avatar_url: string;
+  type: string;
 }
 
 export interface Repository {
@@ -338,18 +339,18 @@ export interface Discussion {
   stateReason: DiscussionStateType;
   isAnswered: boolean;
   url: string;
-  comments: {
-    nodes: DiscussionComment[];
-  };
+  author: DiscussionAuthor;
+  comments: DiscussionComments;
+}
+
+export interface DiscussionComments {
+  nodes: DiscussionComment[];
 }
 
 export interface DiscussionComment {
   databaseId: string | number;
   createdAt: string;
   author: DiscussionAuthor;
-  bot: {
-    login?: string;
-  };
   replies?: {
     nodes: DiscussionComment[];
   };

src/utils/helpers.ts

@@ -164,19 +164,18 @@ export async function fetchDiscussion(
     token,
     {
       query: `
+        fragment AuthorFields on Actor {
+          login
+          url
+          avatar_url: avatarUrl
+          type: __typename
+        }
+
         fragment CommentFields on DiscussionComment {
           databaseId
           createdAt
           author {
-            login
-            url
-            avatar_url: avatarUrl
-          }
-          bot: author {
-            ... on Bot {
-              login
-              avatar_url: avatarUrl
-            }
+            ...AuthorFields
           }
         }
 
@@ -195,6 +194,9 @@ export async function fetchDiscussion(
                 stateReason
                 isAnswered
                 url
+                author {
+                  ...AuthorFields
+                }
                 comments(last: $lastComments){
                   nodes {
                     ...CommentFields

src/utils/subject.test.ts

@@ -160,6 +160,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'SUBSCRIBED',
                     stateReason: null,
                     isAnswered: true,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -175,7 +182,12 @@ describe('utils/subject.ts', () => {
         );
 
         expect(result.state).toBe('ANSWERED');
-        expect(result.user).toBe(null);
+        expect(result.user).toEqual({
+          login: 'discussion-creator',
+          html_url: 'https://github.com/discussion-creator',
+          avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
+          type: 'User',
+        });
       });
 
       it('duplicate discussion state', async () => {
@@ -199,6 +211,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'SUBSCRIBED',
                     stateReason: 'DUPLICATE',
                     isAnswered: false,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -214,7 +233,12 @@ describe('utils/subject.ts', () => {
         );
 
         expect(result.state).toBe('DUPLICATE');
-        expect(result.user).toBe(null);
+        expect(result.user).toEqual({
+          login: 'discussion-creator',
+          html_url: 'https://github.com/discussion-creator',
+          avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
+          type: 'User',
+        });
       });
 
       it('open discussion state', async () => {
@@ -238,6 +262,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'SUBSCRIBED',
                     stateReason: null,
                     isAnswered: false,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -253,7 +284,12 @@ describe('utils/subject.ts', () => {
         );
 
         expect(result.state).toBe('OPEN');
-        expect(result.user).toBe(null);
+        expect(result.user).toEqual({
+          login: 'discussion-creator',
+          html_url: 'https://github.com/discussion-creator',
+          avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
+          type: 'User',
+        });
       });
 
       it('outdated discussion state', async () => {
@@ -277,6 +313,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'SUBSCRIBED',
                     stateReason: 'OUTDATED',
                     isAnswered: false,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -292,7 +335,12 @@ describe('utils/subject.ts', () => {
         );
 
         expect(result.state).toBe('OUTDATED');
-        expect(result.user).toBe(null);
+        expect(result.user).toEqual({
+          login: 'discussion-creator',
+          html_url: 'https://github.com/discussion-creator',
+          avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
+          type: 'User',
+        });
       });
 
       it('reopened discussion state', async () => {
@@ -316,6 +364,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'SUBSCRIBED',
                     stateReason: 'REOPENED',
                     isAnswered: false,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -331,7 +386,12 @@ describe('utils/subject.ts', () => {
         );
 
         expect(result.state).toBe('REOPENED');
-        expect(result.user).toBe(null);
+        expect(result.user).toEqual({
+          login: 'discussion-creator',
+          html_url: 'https://github.com/discussion-creator',
+          avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
+          type: 'User',
+        });
       });
 
       it('resolved discussion state', async () => {
@@ -355,6 +415,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'SUBSCRIBED',
                     stateReason: 'RESOLVED',
                     isAnswered: false,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -370,7 +437,12 @@ describe('utils/subject.ts', () => {
         );
 
         expect(result.state).toBe('RESOLVED');
-        expect(result.user).toBe(null);
+        expect(result.user).toEqual({
+          login: 'discussion-creator',
+          html_url: 'https://github.com/discussion-creator',
+          avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
+          type: 'User',
+        });
       });
 
       it('filtered response by subscribed', async () => {
@@ -394,6 +466,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'SUBSCRIBED',
                     stateReason: null,
                     isAnswered: false,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -403,6 +482,13 @@ describe('utils/subject.ts', () => {
                     viewerSubscription: 'IGNORED',
                     stateReason: null,
                     isAnswered: true,
+                    author: {
+                      login: 'discussion-creator',
+                      url: 'https://github.com/discussion-creator',
+                      avatar_url:
+                        'https://avatars.githubusercontent.com/u/583231?v=4',
+                      type: 'User',
+                    },
                     comments: {
                       nodes: [], //TODO - Update this to have real data
                     },
@@ -418,7 +504,12 @@ describe('utils/subject.ts', () => {
         );
 
         expect(result.state).toBe('OPEN');
-        expect(result.user).toBe(null);
+        expect(result.user).toEqual({
+          login: 'discussion-creator',
+          html_url: 'https://github.com/discussion-creator',
+          avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4',
+          type: 'User',
+        });
       });
     });
 

src/utils/subject.ts

@@ -111,13 +111,19 @@ async function getGitifySubjectForDiscussion(
   const latestDiscussionComment = getLatestDiscussionComment(
     discussion.comments.nodes,
   );
-  let discussionUser: SubjectUser = null;
+
+  let discussionUser: SubjectUser = {
+    login: discussion.author.login,
+    html_url: discussion.author.url,
+    avatar_url: discussion.author.avatar_url,
+    type: discussion.author.type,
+  };
   if (latestDiscussionComment) {
     discussionUser = {
       login: latestDiscussionComment.author.login,
       html_url: latestDiscussionComment.author.url,
       avatar_url: latestDiscussionComment.author.avatar_url,
-      type: latestDiscussionComment.bot?.login ? 'Bot' : 'User',
+      type: latestDiscussionComment.author.type,
     };
   }