feat: adapt the details page for discussions

Author: WarningImHack3r

src/lib/server/github-cache.ts

@@ -23,7 +23,15 @@ export type Member = Awaited<
 
 type OwnerKeyType = "members";
 
-type RepoKeyType = "releases" | "descriptions" | "issue" | "issues" | "pr" | "prs" | "discussions";
+type RepoKeyType =
+	| "releases"
+	| "descriptions"
+	| "issue"
+	| "issues"
+	| "pr"
+	| "prs"
+	| "discussion"
+	| "discussions";
 
 export type ItemDetails = {
 	comments: Awaited<ReturnType<Issues["listComments"]>>["data"];
@@ -44,6 +52,11 @@ export type PullRequestDetails = ItemDetails & {
 	linkedIssues: LinkedItem[];
 };
 
+export type DiscussionDetails = {
+	info: Discussion;
+	comments: DiscussionComment[];
+};
+
 type TeamDiscussion = Awaited<
 	ReturnType<InstanceType<typeof Octokit>["rest"]["teams"]["listDiscussionsInOrg"]>
 >["data"][number];
@@ -280,14 +293,16 @@ export class GitHubCache {
 		owner: string,
 		repo: string,
 		id: number,
-		type: ExtractStrict<RepoKeyType, "issue" | "pr"> | undefined = undefined
+		type: ExtractStrict<RepoKeyType, "issue" | "pr" | "discussions"> | undefined = undefined
 	) {
 		// Known type we assume the existence of
 		switch (type) {
 			case "issue":
 				return await this.getIssueDetails(owner, repo, id);
 			case "pr":
 				return await this.getPullRequestDetails(owner, repo, id);
+			case "discussions":
+				return await this.getDiscussionDetails(owner, repo, id);
 		}
 
 		// Unknown type, try to find or null otherwise
@@ -298,12 +313,18 @@ export class GitHubCache {
 		}
 
 		try {
-			// comes last because issues will also resolve for prs
+			// doesn't come first because issues will also resolve for prs
 			return await this.getIssueDetails(owner, repo, id);
 		} catch (err: unknown) {
 			console.error(`Error trying to get issue details for ${owner}/${repo}: ${err}`);
 		}
 
+		try {
+			return await this.getDiscussionDetails(owner, repo, id);
+		} catch (err: unknown) {
+			console.error(`Error trying to get discussion details for ${owner}/${repo}: ${err}`);
+		}
+
 		return null;
 	}
 
@@ -365,6 +386,43 @@ export class GitHubCache {
 		);
 	}
 
+	/**
+	 * Get the discussion from the specified info.
+	 *
+	 * @param owner the GitHub repository owner
+	 * @param repo the GitHub repository name
+	 * @param id the discussion number
+	 * @returns the matching discussion
+	 * @throws Error if the discussion is not found
+	 */
+	async getDiscussionDetails(owner: string, repo: string, id: number) {
+		return await this.#processCached<DiscussionDetails>()(
+			this.#getRepoKey(owner, repo, "discussion", id),
+			() =>
+				Promise.all([
+					this.#octokit.request("GET /repos/{owner}/{repo}/discussions/{number}", {
+						owner,
+						repo,
+						number: id
+					}),
+					this.#octokit.paginate<DiscussionComment>(
+						"GET /repos/{owner}/{repo}/discussions/{number}/comments",
+						{
+							owner,
+							repo,
+							number: id,
+							per_page
+						}
+					)
+				]),
+			([{ data: discussion }, comments]) => ({
+				info: discussion,
+				comments
+			}),
+			FULL_DETAILS_TTL
+		);
+	}
+
 	/**
 	 * Get the pull requests linked to the given issue number.
 	 *

src/params/pid.ts

@@ -1,3 +1,3 @@
 export function match(param: string) {
-	return param === "pull" || param === "issues" || param === "discussion";
+	return param === "pull" || param === "issues" || param === "discussions";
 }

src/routes/[pid=pid]/[org]/[repo]/[id=number]/+page.server.ts

@@ -10,17 +10,22 @@ export async function load({ params }) {
 		error(404, `${type} #${id} doesn't exist in repo ${org}/${repo}`);
 	}
 
-	const realType = "commits" in item ? "pull" : "issues";
+	const realType = "commits" in item ? "pull" : "category" in item.info ? "discussions" : "issues";
 	if (type !== realType) {
-		redirect(303, `/${realType}/${org}/${repo}/${id}`);
+		redirect(307, `/${realType}/${org}/${repo}/${id}`);
 	}
 
 	return {
 		itemMetadata: {
 			org,
 			repo,
 			id: numId,
-			type: type === "issues" ? ("issue" as const) : ("pull" as const)
+			type:
+				type === "issues"
+					? ("issue" as const)
+					: type === "discussions"
+						? ("discussion" as const)
+						: ("pull" as const)
 		},
 		item
 	};

src/routes/[pid=pid]/[org]/[repo]/[id=number]/+page.svelte

@@ -7,7 +7,11 @@
 	let commits = $derived("commits" in data.item ? data.item.commits : []);
 	let files = $derived("files" in data.item ? data.item.files : []);
 	let linkedEntities = $derived(
-		"linkedPrs" in data.item ? data.item.linkedPrs : data.item.linkedIssues
+		"linkedPrs" in data.item
+			? data.item.linkedPrs
+			: "linkedIssues" in data.item
+				? data.item.linkedIssues
+				: []
 	);
 </script>
 

src/routes/[pid=pid]/[org]/[repo]/[id=number]/PageRenderer.svelte

@@ -30,7 +30,12 @@
 	} from "@lucide/svelte";
 	import rehypeShikiFromHighlighter from "@shikijs/rehype/core";
 	import type { Plugin } from "svelte-exmarkdown";
-	import type { IssueDetails, LinkedItem, PullRequestDetails } from "$lib/server/github-cache";
+	import type {
+		DiscussionDetails,
+		IssueDetails,
+		LinkedItem,
+		PullRequestDetails
+	} from "$lib/server/github-cache";
 	import * as Accordion from "$lib/components/ui/accordion";
 	import * as Avatar from "$lib/components/ui/avatar";
 	import { Badge } from "$lib/components/ui/badge";
@@ -64,35 +69,49 @@
 		metadata: {
 			org: string;
 			repo: string;
-			type: "pull" | "issue";
+			type: "pull" | "issue" | "discussion";
 		};
-		info: IssueDetails["info"] | PullRequestDetails["info"];
-		comments: IssueDetails["comments"];
+		info: IssueDetails["info"] | PullRequestDetails["info"] | DiscussionDetails["info"];
+		comments: IssueDetails["comments"] | DiscussionDetails["comments"];
 		commits: PullRequestDetails["commits"];
 		files: PullRequestDetails["files"];
 		linkedEntities: LinkedItem[];
 	};
 
 	let { metadata, info, comments, commits, files, linkedEntities }: Props = $props();
 
-	let rightPartInfo = $derived([
-		...(info.closed_at
+	let rightPartInfo = $derived<{ title: string; value: string }[]>([
+		...("answer_chosen_at" in info && info.answer_chosen_at
+			? [{ title: "Answered at", value: formatToDateTime(info.answer_chosen_at) }]
+			: []),
+		...("answer_chosen_by" in info && info.answer_chosen_by
+			? [{ title: "Answered by", value: info.answer_chosen_by.login }]
+			: []),
+		...("category" in info ? [{ title: "Category", value: info.category.name }] : []),
+		...("closed_at" in info && info.closed_at
 			? [
 					{
 						title: "merged" in info && info.merged ? "Merged at" : "Closed at",
 						value: formatToDateTime(info.closed_at)
 					}
 				]
 			: []),
-		...(info.closed_at && "merged" in info && info.merged
+		...("closed_at" in info && info.closed_at && "merged" in info && info.merged
 			? [
 					{
 						title: "Merged by",
 						value: info.merged_by?.name ?? info.merged_by?.login ?? "Unknown"
 					}
 				]
 			: []),
-		{ title: "Assignees", value: info.assignees?.map(a => a.login).join(", ") || "None" },
+		...("assignees" in info
+			? [
+					{
+						title: "Assignees",
+						value: info.assignees?.map(a => a.login).join(", ") || "None"
+					}
+				]
+			: []),
 		...("requested_reviewers" in info
 			? [
 					{
@@ -105,7 +124,14 @@
 			title: "Labels",
 			value: info.labels?.map(l => (typeof l === "string" ? l : l.name)).join(", ") || "None"
 		},
-		{ title: "Milestone", value: info.milestone?.title || "None" }
+		...("milestone" in info
+			? [
+					{
+						title: "Milestone",
+						value: info.milestone?.title || "None"
+					}
+				]
+			: [])
 	]);
 </script>
 
@@ -180,7 +206,11 @@
 	{/if}
 	<div class="flex items-center">
 		<h3 class="text-2xl font-semibold tracking-tight">
-			{metadata.type === "pull" ? "Pull request" : "Issue"}
+			{metadata.type === "pull"
+				? "Pull request"
+				: metadata.type === "issue"
+					? "Issue"
+					: "Discussion"}
 		</h3>
 		{#if info.locked}
 			<div
@@ -200,7 +230,7 @@
 					: "state_reason" in info && info.state_reason === "completed"
 						? "solved"
 						: "closed"
-				: info.draft
+				: "draft" in info && info.draft
 					? "draft"
 					: "open"}
 			class={{ "ml-auto": !info.locked, "ml-3 xs:ml-4": info.locked }}