Skip to content

Commit 7a945dd

Browse files
committed
Merge pull request 'fix(server): resolve relative Forgejo check URLs' (pingdotgg#29) from fix/forgejo-check-details-url into yu-v2
Reviewed-on: ⁨https://git.nepjua.org/yasinuslu/t3code/pulls/29⁩
2 parents de5c0ff + 59a4c94 commit 7a945dd

3 files changed

Lines changed: 56 additions & 2 deletions

File tree

‎apps/server/src/pullRequest/ForgejoPullRequestProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ export const make = Effect.gen(function* () {
272272
const actor = forgejoActor(user);
273273
return actor ? [actor] : [];
274274
}),
275-
checks: forgejoChecks(statuses.items),
275+
checks: forgejoChecks(statuses.items, pr.html_url),
276276
baseComparison: !pr.merge_base
277277
? "unknown"
278278
: pr.merge_base === pr.base.sha
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import { describe, expect, it } from "vitest";
2+
3+
import { forgejoChecks, resolveForgejoTargetUrl } from "./forgejoPullRequestJson.ts";
4+
5+
const PR_URL = "https://git.nepjua.org/Selfmerce/Selfmerce/pulls/9";
6+
7+
describe("resolveForgejoTargetUrl", () => {
8+
it("resolves a site-relative Actions URL against the forge origin", () => {
9+
expect(resolveForgejoTargetUrl("/Selfmerce/Selfmerce/actions/runs/31/jobs/4", PR_URL)).toBe(
10+
"https://git.nepjua.org/Selfmerce/Selfmerce/actions/runs/31/jobs/4",
11+
);
12+
});
13+
14+
it("keeps absolute URLs and drops empty ones", () => {
15+
expect(resolveForgejoTargetUrl("https://ci.example.com/run/1", PR_URL)).toBe(
16+
"https://ci.example.com/run/1",
17+
);
18+
expect(resolveForgejoTargetUrl("", PR_URL)).toBeNull();
19+
expect(resolveForgejoTargetUrl(null, PR_URL)).toBeNull();
20+
});
21+
});
22+
23+
describe("forgejoChecks", () => {
24+
it("emits absolute check URLs", () => {
25+
const [check] = forgejoChecks(
26+
[
27+
{
28+
context: "ci / test",
29+
status: "success",
30+
description: null,
31+
target_url: "/Selfmerce/Selfmerce/actions/runs/31/jobs/4",
32+
updated_at: "2026-10-19T10:00:00Z",
33+
},
34+
],
35+
PR_URL,
36+
);
37+
expect(check?.url).toBe("https://git.nepjua.org/Selfmerce/Selfmerce/actions/runs/31/jobs/4");
38+
});
39+
});

‎apps/server/src/pullRequest/forgejoPullRequestJson.ts‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,23 @@ export function forgejoCommit(commit: typeof ForgejoCommit.Type): PullRequestCom
208208
};
209209
}
210210

211+
// Forgejo returns Actions statuses with a site-relative target_url ("/owner/repo/actions/runs/1/jobs/0").
212+
export function resolveForgejoTargetUrl(
213+
targetUrl: string | null | undefined,
214+
baseUrl: string,
215+
): string | null {
216+
const trimmed = targetUrl?.trim();
217+
if (!trimmed) return null;
218+
try {
219+
return new URL(trimmed, baseUrl).href;
220+
} catch {
221+
return null;
222+
}
223+
}
224+
211225
export function forgejoChecks(
212226
statuses: ReadonlyArray<typeof ForgejoStatus.Type>,
227+
baseUrl: string,
213228
): ReadonlyArray<PullRequestCheck> {
214229
return dedupeChecks(
215230
statuses.map((status) => ({
@@ -218,7 +233,7 @@ export function forgejoChecks(
218233
check: {
219234
name: status.context || "check",
220235
description: status.description || null,
221-
url: status.target_url || null,
236+
url: resolveForgejoTargetUrl(status.target_url, baseUrl),
222237
status:
223238
status.status === "success"
224239
? "success"

0 commit comments

Comments
 (0)