Additional fixes

Author: WarningImHack3r

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

@@ -1,10 +1,52 @@
 <script lang="ts">
+	import { dev } from "$app/environment";
+	import { env } from "$env/dynamic/public";
 	import type { Issues, LinkedEntity, Pulls } from "./types";
 	import PageRenderer from "./PageRenderer.svelte";
 	import LoaderCircle from "lucide-svelte/icons/loader-circle";
 
 	export let data;
 
+	async function linkedIssuesForPR(
+		owner: string,
+		repo: string,
+		pr: number
+	): Promise<LinkedEntity[]> {
+		return data.octokit
+			.graphql(
+				`
+				query closingIssues($number: Int!, $owner: String!, $repo: String!) {
+					repository(owner: $owner, name: $repo) {
+						pullRequest(number: $number) {
+							closingIssuesReferences(first: 10) {
+								nodes {
+									createdAt
+									author {
+										login
+										avatarUrl
+									}
+									number
+									title
+									body
+								}
+							}
+						}
+					}
+				}
+				`,
+				{
+					owner,
+					repo,
+					number: pr
+				}
+			)
+			.then(
+				/* eslint-disable @typescript-eslint/no-explicit-any */ (response: any) =>
+					response.repository.pullRequest.closingIssuesReferences.nodes
+			)
+			.catch(() => []);
+	}
+
 	// PR issues or issue PRs
 	let linkedPRsOrIssues: LinkedEntity[] | undefined = undefined;
 
@@ -78,40 +120,9 @@
 			.then(({ data }) => (prInfo.files = data));
 
 		// Fetch closing issues
-		data.octokit
-			.graphql(
-				`
-				query closingIssues($number: Int!, $owner: String!, $repo: String!) {
-					repository(owner: $owner, name: $repo) {
-						pullRequest(number: $number) {
-							closingIssuesReferences(first: 10) {
-								nodes {
-									createdAt
-									author {
-										login
-										avatarUrl
-									}
-									number
-									title
-									body
-								}
-							}
-						}
-					}
-				}
-				`,
-				{
-					owner: data.org,
-					repo: data.repo,
-					number: data.id
-				}
-			)
-			.then(
-				/* eslint-disable @typescript-eslint/no-explicit-any */ (response: any) => {
-					linkedPRsOrIssues = response.repository.pullRequest.closingIssuesReferences.nodes;
-				}
-			)
-			.catch(() => (linkedPRsOrIssues = []));
+		linkedIssuesForPR(data.org, data.repo, data.id).then(response => {
+			linkedPRsOrIssues = response;
+		});
 	}
 	$: if (pullOrIssue === "issues") {
 		linkedPRsOrIssues = [];
@@ -147,13 +158,45 @@
 				repo: data.repo,
 				issue_number: data.id
 			})
-			.then(({ data: response }) => {
-				prsToFetch = response
-					.filter(event => event.event === "cross-referenced")
-					.map(event => {
-						const anyEvent = event as any; // doesn't have the source property for some reason
-						return anyEvent.source.issue.number;
-					});
+			.then(({ data: events }) =>
+				events.filter(
+					event =>
+						event.event === "cross-referenced" &&
+						"source" in event &&
+						event.source.issue?.repository?.owner.login === data.org &&
+						event.source.issue?.repository?.name === data.repo
+				)
+			)
+			.then(async crEvents => {
+				const prEvents = [];
+				for (let event of crEvents) {
+					const anyEvent = event as any;
+					const response = await fetch(
+						`https://api.github.com/repos/${data.org}/${data.repo}/pulls/${anyEvent.source.issue.number}`,
+						{
+							headers:
+								dev && env.PUBLIC_GITHUB_TOKEN
+									? {
+											Authorization: `token ${env.PUBLIC_GITHUB_TOKEN}`
+										}
+									: undefined
+						}
+					);
+					if (response.ok) {
+						const containedInPr = await linkedIssuesForPR(
+							data.org,
+							data.repo,
+							anyEvent.source.issue.number
+						);
+						if (containedInPr.map(pr => pr.number).includes(data.id)) {
+							prEvents.push(event);
+						}
+					}
+				}
+				return prEvents;
+			})
+			.then(prEvents => {
+				prsToFetch = prEvents.map(event => (event as any).source.issue.number);
 			})
 			.catch(() => (linkedPRsOrIssues = []));
 	}
@@ -193,7 +236,7 @@
 					prNumber => !prs.map(pr => pr.data.number).includes(prNumber)
 				);
 			})
-			.catch(() => (linkedPRsOrIssues = []));
+			.catch(() => (prsToFetch = []));
 	}
 </script>
 

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-code:text-wrap 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-code:[overflow-wrap:_anywhere] prose-li:my-1",
 		inline && "*:inline",
 		className
 	)}

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

@@ -64,7 +64,10 @@
 						}
 					]
 				: []),
-			{ title: "Labels", value: info.labels?.join(", ") || "None" },
+			{
+				title: "Labels",
+				value: info.labels?.map(l => (typeof l === "string" ? l : l.name)).join(", ") || "None"
+			},
 			{ title: "Milestone", value: info.milestone?.title || "None" }
 		];
 	}
@@ -370,14 +373,16 @@
 			Back to homepage
 		</Button>
 		<div class="flex flex-col-reverse items-end gap-4 md:flex-row md:items-center">
-			{#each linkedEntities as closingIssue}
-				<Button
-					href="/{type === 'pull' ? 'issues' : 'pull'}/{org}/{repo}/{closingIssue.number}"
-					variant="secondary"
-				>
-					Open {type === "pull" ? "issue" : "pull request"} #{closingIssue.number}
-				</Button>
-			{/each}
+			<div class="flex flex-wrap justify-end gap-4">
+				{#each linkedEntities as closingIssue}
+					<Button
+						href="/{type === 'pull' ? 'issues' : 'pull'}/{org}/{repo}/{closingIssue.number}"
+						variant="secondary"
+					>
+						Open {type === "pull" ? "issue" : "pull request"} #{closingIssue.number}
+					</Button>
+				{/each}
+			</div>
 			<Button href={info.html_url} target="_blank" class="group dark:text-black">
 				Open {type === "pull" ? "pull request" : "issue"} on GitHub
 				<ArrowUpRight