Skip to content

refactor(discussions): use API to get latest comment and reply #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2024
Merged

refactor(discussions): use API to get latest comment and reply #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions src/__mocks__/mockedData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,44 +404,6 @@ const mockDiscussionReplier: DiscussionAuthor = {

export const mockDiscussionComments: DiscussionComments = {
nodes: [
{
databaseId: 2215656,
createdAt: '2022-02-20T18:33:39Z',
author: mockDiscussionAuthor,
replies: {
nodes: [],
},
},
{
databaseId: 2217789,
createdAt: '2022-02-21T03:30:42Z',
author: mockDiscussionAuthor,
replies: {
nodes: [],
},
},
{
databaseId: 2223243,
createdAt: '2022-02-21T18:26:27Z',
author: mockDiscussionAuthor,
replies: {
nodes: [
{
databaseId: 2232922,
createdAt: '2022-02-23T00:57:58Z',
author: mockDiscussionReplier,
},
],
},
},
{
databaseId: 2232921,
createdAt: '2022-02-23T00:57:49Z',
author: mockDiscussionAuthor,
replies: {
nodes: [],
},
},
{
databaseId: 2258799,
createdAt: '2022-02-27T01:22:20Z',
Expand All @@ -456,35 +418,6 @@ export const mockDiscussionComments: DiscussionComments = {
],
},
},
{
databaseId: 2297637,
createdAt: '2022-03-04T20:39:44Z',
author: mockDiscussionAuthor,

replies: {
nodes: [
{
databaseId: 2300893,
createdAt: '2022-03-05T17:41:04Z',
author: mockDiscussionReplier,
},
],
},
},
{
databaseId: 2299763,
createdAt: '2022-03-05T11:05:42Z',
author: mockDiscussionAuthor,
replies: {
nodes: [
{
databaseId: 2300895,
createdAt: '2022-03-05T17:41:44Z',
author: mockDiscussionReplier,
},
],
},
},
],
};

Expand Down
2 changes: 1 addition & 1 deletion src/utils/api/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export async function searchDiscussions(
notification.updated_at,
),
firstDiscussions: 10,
lastComments: 100,
lastComments: 1,
lastReplies: 1,
},
});
Expand Down
20 changes: 12 additions & 8 deletions src/utils/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ async function getDiscussionUrl(

const comments = discussion.comments.nodes;

const latestCommentId = getLatestDiscussionComment(comments)?.databaseId;
const latestComment = getLatestDiscussionComment(comments);

if (latestCommentId) {
url += `#discussioncomment-${latestCommentId}`;
if (latestComment) {
url += `#discussioncomment-${latestComment.databaseId}`;
}
}

Expand All @@ -139,10 +139,11 @@ export async function fetchDiscussion(
(discussion) => discussion.title === notification.subject.title,
) || [];

if (discussions.length > 1)
if (discussions.length > 1) {
discussions = discussions.filter(
(discussion) => discussion.viewerSubscription === 'SUBSCRIBED',
);
}

return discussions[0];
} catch (err) {}
Expand All @@ -155,10 +156,13 @@ export function getLatestDiscussionComment(
return null;
}

return comments
.flatMap((comment) => comment.replies.nodes)
.concat([comments[comments.length - 1]])
.reduce((a, b) => (a.createdAt > b.createdAt ? a : b));
// Return latest reply if available
if (comments[0].replies.nodes.length === 1) {
return comments[0].replies.nodes[0];
}

// Return latest comment if no replies
return comments[0];
}

export async function generateGitHubWebUrl(
Expand Down