Skip to content

Commit 3855f0f

Browse files
authored
Improve handling of varios reviewer types (#6509)
Part of #6090
1 parent 884227a commit 3855f0f

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

src/github/pullRequestModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
988988
input: {
989989
pullRequestId: this.graphNodeId,
990990
teamIds: teamReviewers,
991-
userIds: reviewers
991+
userIds: reviewers.filter(r => !r.startsWith('BOT')),
992992
},
993993
},
994994
});

src/github/queriesShared.gql

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,14 @@ fragment Review on PullRequestReview {
126126
login
127127
avatarUrl
128128
url
129+
... on Node {
130+
id
131+
}
129132
... on User {
130133
email
131-
id
132134
}
133135
... on Organization {
134136
email
135-
id
136137
}
137138
}
138139
state
@@ -318,20 +319,23 @@ query GetReviewRequestsAdditionalScopes($owner: String!, $name: String!, $number
318319
reviewRequests(first: 100) {
319320
nodes {
320321
requestedReviewer {
321-
... on User {
322+
... on Node {
323+
id
324+
}
325+
... on Actor {
322326
login
323327
avatarUrl
324-
id
328+
}
329+
... on User {
325330
url
326331
email
327332
name
328333
}
329-
... on Team {
334+
... on Team { # Team is not an Actor
330335
name
331336
avatarUrl
332337
url
333338
slug
334-
id
335339
}
336340
}
337341
}

0 commit comments

Comments
 (0)