Add "Merged by" info, syntax highlighting in comments

Author: WarningImHack3r

src/lib/octokit.ts

@@ -5,16 +5,19 @@ import { persisted } from "svelte-persisted-store";
 import { plainTextSerializer } from "./stores";
 import { tokenKey } from "./types";
 
+let octokit: Octokit;
+
 /**
- * Creates an Octokit instance with the current user's access token.
+ * Creates or returns a shared {@link Octokit} instance with the current user's access token.
  * If the user is not logged in, the new instance will be created without authentication.
  * In development mode, the instance will be created with the access token
  * from the environment if it is available, overriding the user's access token.
  */
 export function getOctokit() {
+	if (octokit) return octokit;
 	// TODO: Invert the condition to make the logged in token take precedence over the environment token
 	const hasTokenInDev = dev && !!env.PUBLIC_GITHUB_TOKEN;
-	const octokit = new Octokit(
+	octokit = new Octokit(
 		hasTokenInDev
 			? {
 					auth: env.PUBLIC_GITHUB_TOKEN

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

@@ -79,33 +79,39 @@
 	});
 
 	let rightPartInfo = $derived.by(() => {
-		if (info) {
-			return [
-				...(info.closed_at
-					? [
-							{
-								title: "merged" in info && info.merged ? "Merged at" : "Closed at",
-								value: formatToDateTime(info.closed_at)
-							}
-						]
-					: []),
-				{ title: "Assignees", value: info.assignees?.map(a => a.login).join(", ") || "None" },
-				...("requested_reviewers" in info
-					? [
-							{
-								title: "Reviewers",
-								value: info.requested_reviewers?.map(r => r.login).join(", ") || "None"
-							}
-						]
-					: []),
-				{
-					title: "Labels",
-					value: info.labels?.map(l => (typeof l === "string" ? l : l.name)).join(", ") || "None"
-				},
-				{ title: "Milestone", value: info.milestone?.title || "None" }
-			];
-		}
-		return [];
+		if (!info) return [];
+		return [
+			...(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
+				? [
+						{
+							title: "Merged by",
+							value: info.merged_by?.name ?? info.merged_by?.login ?? "Unknown"
+						}
+					]
+				: []),
+			{ title: "Assignees", value: info.assignees?.map(a => a.login).join(", ") || "None" },
+			...("requested_reviewers" in info
+				? [
+						{
+							title: "Reviewers",
+							value: info.requested_reviewers?.map(r => r.login).join(", ") || "None"
+						}
+					]
+				: []),
+			{
+				title: "Labels",
+				value: info.labels?.map(l => (typeof l === "string" ? l : l.name)).join(", ") || "None"
+			},
+			{ title: "Milestone", value: info.milestone?.title || "None" }
+		];
 	});
 </script>
 
@@ -291,6 +297,7 @@
 							markdown={comment.body || "_Empty comment_"}
 							parseRawHtml
 							class="w-full"
+							additionalPlugins={[shikiPlugin]}
 						/>
 					</div>
 				</div>