Skip to content

Commit c3cfb5e

Browse files
saphidclaude
andauthored
fix(forgejo): dismissed reviews no longer read as requested changes or approvals (pingdotgg#29567)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 87e13d3 commit c3cfb5e

2 files changed

Lines changed: 36 additions & 6 deletions

File tree

‎packages/source-control-forgejo/src/server/forgejoPullRequestJson.test.ts‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
import { assert, describe, it } from "@effect/vitest";
22
import * as Schema from "effect/Schema";
33

4-
import { ForgejoComment, forgejoComment } from "./forgejoPullRequestJson.ts";
4+
import {
5+
ForgejoComment,
6+
ForgejoReview,
7+
forgejoComment,
8+
forgejoReview,
9+
} from "./forgejoPullRequestJson.ts";
510

611
const decodeForgejoComment = Schema.decodeSync(ForgejoComment);
12+
const decodeForgejoReview = Schema.decodeSync(ForgejoReview);
713

814
describe("forgejoComment", () => {
915
const createdAt = "2026-10-10T19:52:40Z";
@@ -34,3 +40,24 @@ describe("forgejoComment", () => {
3440
assert.strictEqual(mapped.editedAt, "2026-10-10T20:04:50.000Z");
3541
});
3642
});
43+
44+
describe("forgejoReview", () => {
45+
it.each([
46+
["REQUEST_CHANGES", false, "CHANGES_REQUESTED"],
47+
["REQUEST_CHANGES", true, "DISMISSED"],
48+
["APPROVED", true, "DISMISSED"],
49+
])("reads %s with dismissed %s as %s", (state, dismissed, reviewState) => {
50+
const mapped = forgejoReview(
51+
decodeForgejoReview({
52+
id: 8,
53+
body: "",
54+
user: { login: "maria" },
55+
state,
56+
dismissed,
57+
submitted_at: "2026-10-10T19:52:40Z",
58+
comments_count: 0,
59+
}),
60+
);
61+
assert.strictEqual(mapped.reviewState, reviewState);
62+
});
63+
});

‎packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export const ForgejoReview = Schema.Struct({
7777
body: Schema.String,
7878
user: Schema.NullOr(ForgejoUser),
7979
state: Schema.String,
80+
dismissed: Schema.optional(Schema.Boolean),
8081
submitted_at: Schema.String,
8182
html_url: Schema.optional(Schema.String),
8283
comments_count: Schema.Int,
@@ -173,11 +174,13 @@ export function forgejoReview(review: typeof ForgejoReview.Type): PullRequestCom
173174
url: review.html_url || null,
174175
path: null,
175176
reviewState:
176-
review.state === "REQUEST_CHANGES"
177-
? "CHANGES_REQUESTED"
178-
: review.state === "COMMENT"
179-
? "COMMENTED"
180-
: review.state,
177+
review.dismissed === true
178+
? "DISMISSED"
179+
: review.state === "REQUEST_CHANGES"
180+
? "CHANGES_REQUESTED"
181+
: review.state === "COMMENT"
182+
? "COMMENTED"
183+
: review.state,
181184
};
182185
}
183186

0 commit comments

Comments
 (0)