Last fixes

Author: WarningImHack3r

src/routes/+layout.svelte

@@ -82,7 +82,7 @@
 		</a>
 
 		<!-- Navigation -->
-		<!-- TODO: don't hardcode this? -->
+		<!-- TODO: don't hardcode scrollY? -->
 		{#if scrollY > 150 && $page.route.id === "/"}
 			<ul transition:fade={{ duration: 200 }} class="ml-6 hidden sm:block">
 				<li>

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

@@ -29,6 +29,7 @@
 		info: undefined,
 		comments: undefined
 	};
+	let prsToFetch: number[] = [];
 
 	$: info = prInfo.info || issueInfo.info;
 	$: pullOrIssue = data.pullOrIssue;
@@ -147,37 +148,50 @@
 				issue_number: data.id
 			})
 			.then(({ data: response }) => {
-				for (let event of response) {
-					if (event.event === "cross-referenced") {
+				prsToFetch = response
+					.filter(event => event.event === "cross-referenced")
+					.map(event => {
 						const anyEvent = event as any; // doesn't have the source property for some reason
-						const prNumber = anyEvent.source.issue.number;
-						data.octokit.rest.pulls
-							.get({
-								owner: data.org,
-								repo: data.repo,
-								pull_number: prNumber
-							})
-							.then(({ data }) => {
-								if (!linkedPRsOrIssues) {
-									linkedPRsOrIssues = [];
-								}
-								if (linkedPRsOrIssues.map(i => i.number).includes(data.number)) {
-									return;
-								}
-								linkedPRsOrIssues.push({
-									title: data.title,
-									author: {
-										login: data.user.login,
-										avatarUrl: data.user.avatar_url
-									},
-									body: data.body ?? "",
-									createdAt: data.created_at,
-									number: data.number
-								});
-								linkedPRsOrIssues = [...linkedPRsOrIssues];
-							});
+						return anyEvent.source.issue.number;
+					});
+			})
+			.catch(() => (linkedPRsOrIssues = []));
+	}
+	$: if (prsToFetch.length > 0) {
+		Promise.all(
+			prsToFetch.map(prNumber =>
+				data.octokit.rest.pulls.get({
+					owner: data.org,
+					repo: data.repo,
+					pull_number: prNumber
+				})
+			)
+		)
+			.then(prs => {
+				if (!linkedPRsOrIssues) {
+					linkedPRsOrIssues = [];
+				}
+				for (let { data } of prs) {
+					if (linkedPRsOrIssues.map(i => i.number).includes(data.number)) {
+						continue;
 					}
+					linkedPRsOrIssues.push({
+						title: data.title,
+						author: {
+							login: data.user.login,
+							avatarUrl: data.user.avatar_url
+						},
+						body: data.body ?? "",
+						createdAt: data.created_at,
+						number: data.number
+					});
 				}
+				linkedPRsOrIssues = linkedPRsOrIssues.sort(
+					(a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
+				);
+				prsToFetch = prsToFetch.filter(
+					prNumber => !prs.map(pr => pr.data.number).includes(prNumber)
+				);
 			})
 			.catch(() => (linkedPRsOrIssues = []));
 	}

src/routes/[pullOrIssue=poi]/[org]/[repo]/[id=number]/+page.ts

@@ -1,10 +1,21 @@
+import { dev } from "$app/environment";
+import { env } from "$env/dynamic/public";
 import { error } from "@sveltejs/kit";
 
 export async function load({ params, fetch }) {
 	const { pullOrIssue, org, repo, id } = params;
 
 	const poiName = pullOrIssue === "pull" ? "pulls" : "issues";
-	const isUrlOk = (await fetch(`https://api.github.com/repos/${org}/${repo}/${poiName}/${id}`)).ok;
+	const isUrlOk = (
+		await fetch(`https://api.github.com/repos/${org}/${repo}/${poiName}/${id}`, {
+			headers:
+				dev && env.PUBLIC_GITHUB_TOKEN
+					? {
+							Authorization: `token ${env.PUBLIC_GITHUB_TOKEN}`
+						}
+					: undefined
+		})
+	).ok;
 	if (!isUrlOk) {
 		error(404);
 	}

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

@@ -3,15 +3,17 @@
 	import type { Icon } from "lucide-svelte";
 	import * as Accordion from "$lib/components/ui/accordion";
 
+	const key = "collapsible";
+
 	export let icon: ComponentType<Icon> | null = null;
 	export let label: string;
 	export let secondaryLabel: string | undefined = undefined;
 	export let openByDefault = false;
 </script>
 
 <div class="rounded-xl border px-4">
-	<Accordion.Root value={openByDefault ? "comments" : undefined}>
-		<Accordion.Item value="comments" class="border-b-0">
+	<Accordion.Root value={openByDefault ? key : undefined}>
+		<Accordion.Item value={key} class="border-b-0">
 			<Accordion.Trigger
 				class="group hover:no-underline [&>svg:last-child]:flex-shrink-0 [&[data-state=open]>svg:last-child]:rotate-180 [&[data-state=open]>svg]:rotate-0"
 			>

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

@@ -12,7 +12,7 @@
 
 <span
 	class={cn(
-		"prose dark:prose-invert prose-a:no-underline prose-a:underline-offset-4 prose-a:[overflow-wrap:_anywhere] hover:prose-a:underline prose-li:my-1",
+		"prose dark:prose-invert prose-a:no-underline prose-a:underline-offset-4 prose-a:[overflow-wrap:_anywhere] hover:prose-a:underline prose-code:text-wrap prose-li:my-1",
 		inline && "*:inline",
 		className
 	)}

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

@@ -136,18 +136,16 @@
 		</h3>
 		<GHBadge
 			{type}
-			status={info.closed_at
-				? type === "pull" && "merged" in info
+			status={info.state === "closed"
+				? "merged" in info
 					? info.merged
 						? "merged"
 						: "closed"
-					: info.draft
-						? "draft"
-						: "open"
-				: info.state === "closed"
-					? "state_reason" in info && info.state_reason === "completed"
+					: "state_reason" in info && info.state_reason === "completed"
 						? "solved"
 						: "closed"
+				: info.draft
+					? "draft"
 					: "open"}
 		/>
 	</div>