Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "prism",
"private": true,
"version": "0.1.3",
"version": "0.1.4",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "prism"
version = "0.1.3"
version = "0.1.4"
description = "Desktop client for GitHub Pull Requests."
authors = ["Israel Araujo de Oliveira"]
license = "MIT"
Expand Down
41 changes: 39 additions & 2 deletions src-tauri/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,10 @@ query($owner: String!, $name: String!, $number: Int!) {
reviewRequests(first: 10) {
nodes {
requestedReviewer {
__typename
... on User { login avatarUrl }
... on Team { name avatarUrl }
... on Mannequin { login avatarUrl }
}
Comment on lines 516 to 519

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Include Bot in requestedReviewer fragments

requestedReviewer can also be a Bot, but this query only requests fields for User, Team, and Mannequin. In that case the response contains only __typename, which is decoded as GqlReviewer::Unknown and then dropped by reviewer_to_author, so bot review requests disappear from the Reviewers row instead of being shown. This affects PRs where a GitHub App/bot is requested for review.

Useful? React with 👍 / 👎.

}
}
Expand Down Expand Up @@ -725,7 +728,41 @@ struct GqlReviewRequestConnection {
#[serde(default)]
struct GqlReviewRequestNode {
#[serde(rename = "requestedReviewer")]
requested_reviewer: Option<GqlUser>,
requested_reviewer: Option<GqlReviewer>,
}

#[derive(Deserialize)]
#[serde(tag = "__typename")]
enum GqlReviewer {
User {
login: String,
#[serde(rename = "avatarUrl")]
avatar_url: String,
},
Team {
name: String,
#[serde(rename = "avatarUrl")]
avatar_url: String,
},
Mannequin {
login: String,
#[serde(rename = "avatarUrl")]
avatar_url: String,
},
#[serde(other)]
Unknown,
}

fn reviewer_to_author(r: GqlReviewer) -> Option<PrAuthor> {
match r {
GqlReviewer::User { login, avatar_url }
| GqlReviewer::Mannequin { login, avatar_url } => Some(PrAuthor { login, avatar_url }),
GqlReviewer::Team { name, avatar_url } => Some(PrAuthor {
login: name,
avatar_url,
}),
GqlReviewer::Unknown => None,
}
}

#[derive(Deserialize)]
Expand Down Expand Up @@ -882,7 +919,7 @@ pub async fn get_pr_details(
.review_requests
.nodes
.into_iter()
.filter_map(|n| n.requested_reviewer.map(user_to_author))
.filter_map(|n| n.requested_reviewer.and_then(reviewer_to_author))
.collect();

let mut timeline: Vec<TimelineEntry> = Vec::new();
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "Prism",
"version": "0.1.3",
"version": "0.1.4",
"identifier": "io.github.israelaraujo70.prism",
"build": {
"frontendDist": "../dist",
Expand Down
Loading