From 49da3e393573c46a3f59ddeb4e69c832d0f0871f Mon Sep 17 00:00:00 2001
From: circle-gon <14517910-circle-gon@users.noreply.gitlab.com>
Date: Thu, 20 Feb 2025 13:11:53 -0500
Subject: [PATCH 1/5] refactor comments

---
 src/components/Comment.svelte                 | 204 +++++++++++++-----
 src/components/CommentList.svelte             |  55 +++--
 src/components/GameComments.svelte            | 112 +++++++---
 src/components/GameDiscussion.svelte          |  37 +---
 src/components/GameEditor.svelte              |  13 --
 src/components/GameEditor/ForumLink.svelte    |  61 ------
 src/components/admin/modals/Comment.svelte    |  25 ---
 .../admin/panels/CommentFeed.svelte           |   5 -
 .../admin/panels/Housekeeping.svelte          |  58 +----
 src/components/forum/ThreadReader.svelte      |   8 -
 src/helper/fetchComments.ts                   |  58 ++++-
 src/helper/forum.ts                           |  51 +----
 src/models/categoryrequest.ts                 |  24 ---
 src/models/comment.ts                         |  35 ++-
 src/models/forumcategory.ts                   |   4 -
 src/models/forumpost.ts                       |   4 -
 src/models/forumthread.ts                     |   4 -
 src/pages/api/admin/edit/comment.ts           |   8 +-
 src/pages/api/admin/grantCategory.ts          |  42 ----
 src/pages/api/admin/housekeepingData.ts       |   4 +-
 src/pages/api/admin/nopeCategory.ts           |  17 --
 src/pages/api/comments/delete.ts              |   5 +-
 src/pages/api/comments/edit.ts                |  76 +++++++
 src/pages/api/comments/fetch.ts               |  49 +++++
 src/pages/api/comments/new.ts                 |  48 ++++-
 src/pages/api/comments/reply.ts               |  59 -----
 src/pages/api/forum/linkGame.ts               |  37 ----
 src/pages/api/forum/request.ts                |  66 ------
 src/pages/api/users/signup.ts                 |   4 +-
 src/pages/comments/[gameId].astro             |  50 ++++-
 src/pages/edit/[editId].astro                 |  22 --
 src/pages/forum/request.astro                 |  63 ------
 src/pages/forum/thread/[threadId].astro       |   6 -
 src/pages/play/[gameId].astro                 |  46 ----
 src/pages/rewind/developer.astro              |   4 -
 src/types.d.ts                                |  28 +--
 36 files changed, 588 insertions(+), 804 deletions(-)
 delete mode 100644 src/components/GameEditor/ForumLink.svelte
 delete mode 100644 src/models/categoryrequest.ts
 delete mode 100644 src/pages/api/admin/grantCategory.ts
 delete mode 100644 src/pages/api/admin/nopeCategory.ts
 create mode 100644 src/pages/api/comments/edit.ts
 create mode 100644 src/pages/api/comments/fetch.ts
 delete mode 100644 src/pages/api/comments/reply.ts
 delete mode 100644 src/pages/api/forum/linkGame.ts
 delete mode 100644 src/pages/api/forum/request.ts
 delete mode 100644 src/pages/forum/request.astro

diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index 97c1592a..5457e1a2 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -13,14 +13,20 @@
 		id: number;
 	}
 
-	export interface ReplyDetail {
+	export interface EditDetail {
 		id: number;
 		content: string;
+		rating: number;
+	}
+
+	export interface ShowDetail {
+		id: number;
 	}
 </script>
 
 <script lang="ts">
 	import { post, promptLogin, report } from "~/libgalaxy";
+	import CommentList from "./CommentList.svelte";
 	import DateTime from "./DateTime.svelte";
 	import Dropdown from "./Dropdown.svelte";
 	import type { INamedFrontendComment } from "~/types";
@@ -28,22 +34,36 @@
 	import UserChip from "./UserChip.svelte";
 	import { createEventDispatcher } from "svelte";
 	import { comment as md } from "~/helper/markdown";
+	import { onMount } from "svelte"
 
+	export let gameId: number;
 	export let comment: INamedFrontendComment;
 	export let userId: number;
-	export let isDev: boolean;
 	export let isLoggedIn: boolean;
 	export let isStaff: boolean;
+	export let loadDepth: number;
+	export let sort: "createdAt" | "score"
 
 	const dispatcher = createEventDispatcher<{
 		vote: VoteDetail;
 		delete: DeleteDetail;
 		reveal: RevealDetail;
-		reply: ReplyDetail;
+		edit: EditDetail;
+		show: ShowDetail;
 	}>();
 
-	let replying = false;
-	let composingReply = "";
+	let editing = false
+	let trueReplying = false
+	let thisComment = ""
+	let realReply = ""
+	let isLimited = false
+	let seenReplies: INamedFrontendComment[] | undefined 
+	let commentList: CommentList | undefined = undefined
+
+	// using export let turns it into a prop instead of an exported property
+	export function getCommentListInstance() {
+		return commentList
+	}
 
 	function cvote(id: number, vote: 1 | 0 | -1) {
 		return async () => {
@@ -79,9 +99,6 @@
 
 			comment.deleted = true;
 
-			replying = false;
-			composingReply = "";
-
 			dispatcher("delete", {
 				id,
 			});
@@ -98,32 +115,76 @@
 		};
 	}
 
-	function creply(id: number) {
+	function cedit(id: number) {
 		return async () => {
-			const content = composingReply;
+			const content = thisComment
+			const { rating } = await post("/api/comments/edit", {
+				id,
+				content
+			})
+
+			comment.content = content
+			comment.rating = rating
+			editing = false
+			thisComment = ""
 
-			await post(`/api/comments/reply`, {
+			dispatcher("edit", {
 				id,
 				content,
-			});
+				rating
+			})
+		}
+	}
 
-			// TODO: don't update reply if request fails + keep reply input box open so it can be fixed
-			comment.devResponse = composingReply;
+	function ctruereply(id: number) {
+		return async () => {
+			const result = await post("/api/comments/new", {
+				game: gameId,
+				parent: id,
+				type: "comment",
+				content: realReply
+			})
+			if (seenReplies === undefined) await loadReplies()
+			seenReplies = [...seenReplies, result.content]
+			trueReplying = false
+			comment.showMore = true // Don't hide your own response
+			realReply = ""
+		}
+	}
 
-			replying = false;
-			composingReply = "";
+	function cshow() {
+		comment.showMore = true
 
-			dispatcher("reply", {
-				id,
-				content,
-			});
-		};
+		dispatcher("show", {
+			id: comment.id
+		})
+	}
+
+	async function loadReplies() {
+		const resp = await post("/api/comments/fetch", {
+			sort,
+			id: comment.id,
+			game: gameId,
+			filter: "all"
+		})
+		seenReplies = resp.result
+		isLimited = resp.isLimited
 	}
 
-	function processReplyClick() {
-		replying = true;
-		composingReply = comment.devResponse ?? "";
+	function processEditClick() {
+		trueReplying = false
+		editing = true
+		thisComment = comment.content
 	}
+
+	function processTrueReplyClick() {
+		editing = false
+		trueReplying = true
+		realReply = ""
+	}
+
+	comment.showMore = loadDepth > 0
+	if (loadDepth > -1) onMount(() => loadReplies())
 </script>
 
 <div class="comment">
@@ -140,6 +201,15 @@
 			before="•"
 			style="date"
 		/>
+		<!-- TODO someone else can probably come up with a better UI scheme than this -->
+		{#if comment.type === "review"}
+			<!-- I love whitespace -->
+			{#each Array(comment.rating).fill(undefined) as _}<Icon
+				icon="material-symbols:star-rounded" width="16" inline 
+			/>{/each}{#each Array(5 - comment.rating).fill(undefined) as _}<Icon
+				icon="material-symbols:star-outline-rounded" width="16" inline
+			/>{/each}
+		{/if}
 		<div class="floatright">
 			<button
 				on:click={cvote(comment.id, 1)}
@@ -167,12 +237,9 @@
 			</button>
 			{#if isLoggedIn && !comment.deleted}
 				<Dropdown openLeft>
-					{#if isDev}
-						<button on:click={() => processReplyClick()}>
-							{comment.devResponse !== undefined
-								? "edit response"
-								: "respond as developer"}
-						</button>
+					<button on:click={() => processTrueReplyClick()}>reply</button>
+					{#if comment.author === userId}
+						<button on:click={() => processEditClick()}>edit comment</button>
 					{/if}
 					{#if comment.author !== userId}
 						<button on:click={() => report("comment", comment)}
@@ -199,27 +266,70 @@
 				>(reveal comment)</button
 			>
 		</div>
+	{:else if editing}
+		<textarea
+			id="reply"
+			placeholder="edit your comment..."
+			bind:value={thisComment}
+		/>
+		<button id="postreply" on:click={cedit(comment.id)}>send</button>
+		<button on:click={() => (editing = false)}>cancel</button>
 	{:else}
 		<div class="comment-content">
 			{@html md.render(comment.content)}
 		</div>
 	{/if}
-	{#if replying}
+	{#if trueReplying}
 		<textarea
 			id="reply"
-			placeholder="write your response..."
-			bind:value={composingReply}
+			style="margin-top: 20px"
+			placeholder="reply..."
+			bind:value={realReply}
 		/>
-		<button id="postreply" on:click={creply(comment.id)}>reply</button>
-		<button on:click={() => (replying = false)}>cancel</button>
-	{:else if comment.devResponse !== undefined && comment.devResponse !== null}
-		<div class="dev-reply">
-			{@html md.render("**developer response:** " + comment.devResponse)}
+		<button id="postreply" on:click={ctruereply(comment.id)}>reply</button>
+		<button on:click={() => (trueReplying = false)}>cancel</button>
+	{/if}
+	{#if seenReplies && comment.showMore}
+		<div class="replies">
+			<CommentList 
+				comments={seenReplies}
+				{sort}
+				loadDepth={loadDepth > 0 ? loadDepth - 1 : 2}
+				{gameId}
+				{userId}
+				{isLoggedIn}
+				{isStaff}
+				on:vote
+				on:delete
+				on:reveal
+				on:edit
+				on:show
+				bind:this={commentList}
+			/>
+			{#if isLimited}
+				<a
+					href="/comments/{gameId}?sort={sort === "createdAt" ? "time" : "top"}&parent={comment.id}"
+					class="button"
+					target="_blank"
+					rel="noreferrer"
+				>
+					read all replies
+				</a>		
+			{/if}
 		</div>
+	{:else if comment.showMore}
+		<span class="unimportant">loading...</span>
+	{:else if loadDepth > -1 && seenReplies && seenReplies.length > 0}
+		<button on:click={() => cshow()}>Show more</button>
 	{/if}
 </div>
 
 <style>
+	.replies {
+		margin-top: 10px;
+		margin-left: 20px;
+	}
+
 	.comment:not(:last-child) {
 		margin-bottom: 15px;
 	}
@@ -273,22 +383,6 @@
 		background: var(--background-red-1);
 	}
 
-	.dev-reply {
-		background-color: var(--background-blue-0);
-		margin: 0px 5px 5px 28px;
-		padding: 5px 10px 5px 10px;
-		border-radius: 0 0 3px 3px;
-		word-wrap: break-word;
-	}
-
-	.dev-reply > :global(:first-child) {
-		margin-top: 0;
-	}
-
-	.dev-reply > :global(:last-child) {
-		margin-bottom: 0;
-	}
-
 	#reply {
 		display: block;
 		width: calc(100% - 53px);
@@ -298,7 +392,7 @@
 		height: 40px;
 		font-size: 14px;
 		font-family: var(--content-font);
-		background-color: var(--background-blue-0);
+		background-color: var(--background-1);
 		color: var(--color-0);
 		outline: 1px solid #7770;
 		border-radius: 3px;
diff --git a/src/components/CommentList.svelte b/src/components/CommentList.svelte
index ec116b96..c0432003 100644
--- a/src/components/CommentList.svelte
+++ b/src/components/CommentList.svelte
@@ -1,62 +1,91 @@
 <script lang="ts">
 	import Comment, {
 		type DeleteDetail,
-		type ReplyDetail,
+		type EditDetail,
 		type RevealDetail,
+		type ShowDetail,
 		type VoteDetail,
 	} from "./Comment.svelte";
 	import type { INamedFrontendComment } from "~/types";
 
+	export let gameId: number;
 	export let comments: INamedFrontendComment[];
 	export let userId: number;
-	export let isDev: boolean;
 	export let isLoggedIn: boolean;
 	export let isStaff: boolean;
+	export let loadDepth: number;
+	export let sort: "createdAt" | "score"
 
-	export function doVote({ id, vote, score }: VoteDetail) {
+	// This has to be top 10 of the most inefficient code ever
+	const comps: Comment[] = []
+
+	export function doVote(voteDetail: VoteDetail) {
+		const { id, vote, score } = voteDetail
 		comments = comments.map(c => {
 			if (c.id !== id) return c;
 			c.yourVote = vote;
 			c.score = score;
 			return c;
 		});
+		for (const comp of comps) comp.getCommentListInstance()?.doVote(voteDetail)
 	}
 
-	export function doDelete({ id }: DeleteDetail) {
+	export function doDelete(deleteDetail: DeleteDetail) {
+		const { id } = deleteDetail
 		comments = comments.map(c => {
 			if (c.id !== id) return c;
 			c.deleted = true;
 			return c;
 		});
+		for (const comp of comps) comp.getCommentListInstance()?.doDelete(deleteDetail)
 	}
 
-	export function doReveal({ id }: RevealDetail) {
+	export function doReveal(revealDetail: RevealDetail) {
+		const { id } = revealDetail
 		comments = comments.map(c => {
 			if (c.id !== id) return c;
 			c.hidden = false;
 			return c;
 		});
+		for (const comp of comps) comp.getCommentListInstance()?.doReveal(revealDetail)
 	}
 
-	export function doReply({ id, content }: ReplyDetail) {
+	export function doEdit(editDetail: EditDetail) {
+		const { id, content, rating } = editDetail
 		comments = comments.map(c => {
-			if (c.id !== id) return c;
-			c.devResponse = content;
-			return c;
-		});
+			if (c.id !== id) return c
+			c.content = content
+			c.rating = rating
+			return c
+		})
+		for (const comp of comps) comp.getCommentListInstance()?.doEdit(editDetail)
+	}
+	
+	export function doShow(showDetail: ShowDetail) {
+		const { id } = showDetail
+		comments = comments.map(c => {
+			if (c.id !== id) return c
+			c.showMore = true
+			return c
+		})
+		for (const comp of comps) comp.getCommentListInstance()?.doShow(showDetail)
 	}
 </script>
 
-{#each comments as comment (comment.id)}
+{#each comments as comment, count (comment.id)}
 	<Comment
+		{gameId}
 		{comment}
 		{userId}
-		{isDev}
 		{isLoggedIn}
 		{isStaff}
+		{loadDepth}
+		{sort}
 		on:vote
 		on:delete
 		on:reveal
-		on:reply
+		on:edit
+		on:show
+		bind:this={comps[count]}
 	/>
 {/each}
diff --git a/src/components/GameComments.svelte b/src/components/GameComments.svelte
index ac588f99..9a1de084 100644
--- a/src/components/GameComments.svelte
+++ b/src/components/GameComments.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
 	import type {
 		DeleteDetail,
-		ReplyDetail,
+		EditDetail,
 		RevealDetail,
+		ShowDetail,
 		VoteDetail,
 	} from "./Comment.svelte";
 	import CommentList from "./CommentList.svelte";
@@ -16,32 +17,41 @@
 	export let isDev: boolean;
 	export let isLoggedIn: boolean;
 	export let isStaff: boolean;
-	export let newComments: INamedFrontendComment[];
-	export let topComments: INamedFrontendComment[];
+	export let filter: "all" | "review" | "comment"
 
 	let composingComment = "";
 	let newCommentDiv: CommentList;
 	let topCommentDiv: CommentList | undefined;
 
+	let newComments: INamedFrontendComment[] = [];
+	let topComments: INamedFrontendComment[] = [];
+	let loaded = false
+	$: name = `${filter === "all" ? "response" : filter}s`
+
 	$: single =
 		newComments.length < 5 ||
 		newComments.filter(({ id: nid }) =>
 			topComments.find(({ id: tid }) => nid === tid)
 		).length === 5;
 
-	async function publishComment() {
+	async function publishComment(type: string) {
 		const res = await post(`/api/comments/new`, {
 			game: gameId,
 			content: composingComment,
+			type,
+			parent: -1
 		});
 
 		if (res._resCode === 201) {
-			res.content.date = new Date(res.content.date);
-			newComments.unshift(res.content);
-			if (newComments.length > 5) newComments.pop();
-			if (topComments.length < 5) topComments.push(res.content);
-			newComments = newComments;
-			topComments = topComments;
+			// This might be confusing? Maybe emit an event to swap to a new tab to see the output?
+			if (type === filter || filter === "all") {
+				res.content.date = new Date(res.content.date);
+				newComments.unshift(res.content);
+				if (newComments.length > 5) newComments.pop();
+				if (topComments.length < 5) topComments.push(res.content);
+				newComments = newComments;
+				topComments = topComments;
+			}
 			composingComment = "";
 		}
 	}
@@ -61,10 +71,40 @@
 		topCommentDiv?.doReveal(detail);
 	}
 
-	function handleReply({ detail }: CustomEvent<ReplyDetail>) {
-		newCommentDiv.doReply(detail);
-		topCommentDiv?.doReply(detail);
+	function handleEdit({ detail }: CustomEvent<EditDetail>) {
+		newCommentDiv.doEdit(detail);
+		topCommentDiv?.doEdit(detail);
+	}
+
+	function handleShow({ detail }: CustomEvent<ShowDetail>) {
+		newCommentDiv.doShow(detail);
+		topCommentDiv?.doShow(detail);
+	}
+
+	async function getComments(filter: "all" | "comment" | "review") {
+		loaded = false
+
+		const newComm = await post("/api/comments/fetch", {
+			sort: "createdAt",
+			id: -1,
+			game: gameId,
+			filter
+		})
+
+		const topComm = await post("/api/comments/fetch", {
+			sort: "score",
+			id: -1,
+			game: gameId,
+			filter
+		})
+
+		newComments = newComm.result
+		topComments = topComm.result
+		loaded = true
 	}
+
+	// Don't run on server
+	$: if (typeof window !== "undefined") getComments(filter)
 </script>
 
 <div class="container">
@@ -78,74 +118,91 @@
 			/>
 			<div>
 				<button
-					on:click={publishComment}
+					on:click={() => publishComment("comment")}
 					disabled={!isLoggedIn || composingComment.length === 0}
 				>
 					submit comment
 				</button>
+				<button
+					on:click={() => publishComment("review")}
+					disabled={isDev || !isLoggedIn || composingComment.length === 0}
+				>
+					submit review
+				</button>
 			</div>
 		{:else}
 			<textarea disabled placeholder="log in to leave a comment" />
 		{/if}
 	</div>
 	<div id="comment-holder">
-		{#if newComments.length === 0}
+		{#if !loaded}
+			<div class="unimportant">loading...</div>
+		{:else if newComments.length === 0}
 			<div style="text-align: center; margin: 12px" class="unimportant">
-				there are no comments yet. be the first one to leave a response!
+				there are no {name} yet. be the first one to leave a response!
 			</div>
 		{:else if single}
 			<div class="single-list">
-				<h2>all comments</h2>
+				<h2>all {name}</h2>
 				<hr />
 				<CommentList
 					comments={newComments}
 					{userId}
-					{isDev}
 					{isLoggedIn}
 					{isStaff}
+					{gameId}
+					sort="createdAt"
+					loadDepth={2}
 					on:vote={handleVote}
 					on:delete={handleDelete}
 					on:reveal={handleReveal}
-					on:reply={handleReply}
+					on:edit={handleEdit}
+					on:show={handleShow}
 					bind:this={newCommentDiv}
 				/>
 			</div>
 		{:else}
 			<div>
-				<h2>newest comments</h2>
+				<h2>newest {name}</h2>
 				<hr />
 				<CommentList
 					comments={newComments}
 					{userId}
-					{isDev}
 					{isLoggedIn}
 					{isStaff}
+					{gameId}
+					sort="createdAt"
+					loadDepth={2}
 					on:vote={handleVote}
 					on:delete={handleDelete}
 					on:reveal={handleReveal}
-					on:reply={handleReply}
+					on:edit={handleEdit}
+					on:show={handleShow}
 					bind:this={newCommentDiv}
 				/>
 			</div>
 			<div>
-				<h2>top comments</h2>
+				<h2>top {name}</h2>
 				<hr />
 				<CommentList
 					comments={topComments}
 					{userId}
-					{isDev}
 					{isLoggedIn}
 					{isStaff}
+					{gameId}
+					sort="score"
+					loadDepth={2}
 					on:vote={handleVote}
 					on:delete={handleDelete}
 					on:reveal={handleReveal}
-					on:reply={handleReply}
+					on:edit={handleEdit}
+					on:show={handleShow}
 					bind:this={topCommentDiv}
 				/>
 			</div>
 		{/if}
 	</div>
-	{#if !single}
+	{#if !single && loaded}
 		<p style="text-align: center">
 			<a
 				href="/comments/{gameId}?sort=top"
@@ -153,7 +210,7 @@
 				target="_blank"
 				rel="noreferrer"
 			>
-				read all comments
+				read all
 			</a>
 		</p>
 	{/if}
@@ -172,6 +229,7 @@
 		outline: 1px solid #7770;
 		border-radius: 3px;
 	}
+	
 	#compose-comment :global(.markdown-editor) {
 		margin-top: 12px;
 	}
diff --git a/src/components/GameDiscussion.svelte b/src/components/GameDiscussion.svelte
index ad44c814..ea194fab 100644
--- a/src/components/GameDiscussion.svelte
+++ b/src/components/GameDiscussion.svelte
@@ -1,7 +1,5 @@
 <script lang="ts">
-	import type { IForumThread, INamedFrontendComment, IUser } from "~/types";
 	import GameComments from "./GameComments.svelte";
-	import ThreadCard from "./forum/ThreadCard.svelte";
 	// import ThreadCard from "./forum/ThreadCard.svelte";
 
 	export let gameId: number;
@@ -9,55 +7,40 @@
 	export let isDev: boolean;
 	export let isLoggedIn: boolean;
 	export let isStaff: boolean;
-	export let comments: [INamedFrontendComment[], INamedFrontendComment[]];
-	export let threads: IForumThread[];
-	export let users: { [id: number]: IUser };
 
-	let tab = "comments";
+	let tab: "all" | "comment" | "review" = "all";
 
-	function set(t: string) {
+	function set(t: typeof tab) {
 		return () => (tab = t);
 	}
 </script>
 
 <div>
 	<div id="discussion-options">
-		<button class:active={tab === "comments"} on:click={set("comments")}>
+		<button class:active={tab === "all"} on:click={set("all")}>
+			overview
+		</button>
+		<button class:active={tab === "comment"} on:click={set("comment")}>
 			comments
 		</button>
-		<button class:active={tab === "forums"} on:click={set("forums")}>
-			forum threads
+		<button class:active={tab === "review"} on:click={set("review")}>
+			reviews
 		</button>
 	</div>
-	{#if tab === "comments"}
 		<GameComments
+			filter={tab}
 			{gameId}
 			{userId}
 			{isDev}
 			{isLoggedIn}
 			{isStaff}
-			newComments={comments[0]}
-			topComments={comments[1]}
 		/>
-	{:else if tab === "forums"}
-		<div class="container" style="background: var(--background-1)">
-			{#each threads as thread}
-				<ThreadCard {thread} user={users[thread.author]} />
-			{:else}
-				<p>we weren't able to find any threads about this game.</p>
-				<p>
-					if this game has been verified, reload and a thread should
-					be automagically created!
-				</p>
-			{/each}
-		</div>
-	{/if}
 </div>
 
 <style>
 	#discussion-options {
 		display: grid;
-		grid-template-columns: 1fr 1fr;
+		grid-template-columns: 1fr 1fr 1fr;
 		width: 100%;
 		margin-top: 10px;
 		gap: 2px;
diff --git a/src/components/GameEditor.svelte b/src/components/GameEditor.svelte
index 36673d4e..b1bde22d 100644
--- a/src/components/GameEditor.svelte
+++ b/src/components/GameEditor.svelte
@@ -1,13 +1,10 @@
 <script lang="ts">
 	import type {
-		ICategoryModerator,
-		IForumCategory,
 		IGame,
 		TabList,
 	} from "~/types";
 	import Analytics from "./GameEditor/Analytics.svelte";
 	import Chat from "./GameEditor/Chat.svelte";
-	import ForumLink from "./GameEditor/ForumLink.svelte";
 	import MainInfo from "./GameEditor/MainInfo.svelte";
 	import Statistics from "./GameEditor/Statistics.svelte";
 	import TabbedMenu from "./TabbedMenu.svelte";
@@ -16,9 +13,6 @@
 	import Updates from "./GameEditor/Updates.svelte";
 
 	export let game: IGame;
-	export let linkedCategory: IForumCategory[];
-	export let moddedCategories: ICategoryModerator[];
-	export let categoryData: { [id: number]: IForumCategory };
 	export let tagCategories: { [category: string]: string[] };
 	export let tagData: { [tag: string]: string };
 
@@ -86,13 +80,6 @@
 		<Updates {id} />
 	{:else if activeTab === "social"}
 		<Chat {id} chatEnabled={game.chatEnabled} />
-		<hr />
-		<ForumLink
-			{linkedCategory}
-			{moddedCategories}
-			{categoryData}
-			gameId={id}
-		/>
 	{:else if activeTab === "team"}
 		<div>
 			<p>team management coming soon</p>
diff --git a/src/components/GameEditor/ForumLink.svelte b/src/components/GameEditor/ForumLink.svelte
deleted file mode 100644
index 463f23c7..00000000
--- a/src/components/GameEditor/ForumLink.svelte
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts">
-	import type { ICategoryModerator, IForumCategory } from "~/types";
-	import { post } from "~/libgalaxy";
-
-	export let linkedCategory: IForumCategory[];
-	export let moddedCategories: ICategoryModerator[];
-	export let categoryData: { [id: number]: IForumCategory };
-	export let gameId: number;
-
-	// we know it's number but TS casting is fuck
-	async function link(id: number | false) {
-		const { message } = await post("/api/forum/linkGame", {
-			category: id,
-			game: gameId,
-		});
-		if (message === "ok") {
-			linkedCategory.push(categoryData[id as number]);
-			linkedCategory = linkedCategory;
-		}
-	}
-</script>
-
-<h2>forum linking</h2>
-{#if linkedCategory.length >= 1}
-	<div>
-		<div>
-			your game is already linked to
-			<a href="/forum/category/{linkedCategory[0].slug}"
-				>{linkedCategory[0].name}</a
-			>.
-			<br />
-			if you would like to change this, please contact site staff
-		</div>
-	</div>
-{:else if moddedCategories.length >= 1}
-	<div>
-		<div>
-			which category would you like to link your game to?
-			<ul>
-				<li>you can link your game to one category (for now)</li>
-				<li>threads from that category appear on the game page</li>
-			</ul>
-			{#each moddedCategories as cat}
-				&nbsp;<button
-					on:click={() => link(categoryData[cat.category].id)}
-				>
-					#{categoryData[cat.category].slug}
-				</button>
-			{/each}
-			<a class="button" href="/forum/request">request a category</a>
-		</div>
-	</div>
-{:else}
-	<div>
-		<div>You are not an administrator or owner of any categories.</div>
-	</div>
-	<hr />
-	<div>
-		<a class="button" href="/forum/request">request a category</a>
-	</div>
-{/if}
diff --git a/src/components/admin/modals/Comment.svelte b/src/components/admin/modals/Comment.svelte
index ad126c20..60790e7e 100644
--- a/src/components/admin/modals/Comment.svelte
+++ b/src/components/admin/modals/Comment.svelte
@@ -18,7 +18,6 @@
 		await post("/api/admin/edit/comment", {
 			id: data.id,
 			content: data.content,
-			devResponse: data.devResponse,
 			// deleted: data.deleted,
 		});
 		hasEdited = false;
@@ -26,11 +25,6 @@
 		alert.success("Updated comment info");
 	}
 
-	function removeDevRespone() {
-		data.devResponse = undefined;
-		hasEdited = true;
-	}
-
 	async function deleteComment() {
 		await post("/api/comments/delete", { id: data.id });
 		alert.success("Comment deleted");
@@ -107,25 +101,6 @@
 		{/if}
 	</div>
 
-	<h6>dev response</h6>
-	{#if isEditing}
-		{#if data.devResponse === undefined}
-			<i>let's not fake dev responses, ok?</i>
-			<br />
-		{:else}
-			<textarea
-				bind:value={data.devResponse}
-				on:input={() => (hasEdited = true)}
-			></textarea>
-			<button on:click={removeDevRespone}> remove response </button>
-		{/if}
-	{:else if data.devResponse !== undefined}
-		<pre>{data.devResponse}</pre>
-	{:else}
-		<i>no dev response</i>
-		<br />
-	{/if}
-
 	<h6>votes</h6>
 	<div>
 		{data.upCount}
diff --git a/src/components/admin/panels/CommentFeed.svelte b/src/components/admin/panels/CommentFeed.svelte
index cac61148..47fc5c9d 100644
--- a/src/components/admin/panels/CommentFeed.svelte
+++ b/src/components/admin/panels/CommentFeed.svelte
@@ -87,11 +87,6 @@
 					if (str.length > 40) str = str.substring(0, 37) + "...";
 					return str;
 				})(),
-				response: (() => {
-					let str = String(x.devResponse ?? "");
-					if (str.length > 40) str = str.substring(0, 37) + "...";
-					return str;
-				})(),
 				deleted: x.deleted === true ? "yes" : "",
 			}))}
 			schema={{
diff --git a/src/components/admin/panels/Housekeeping.svelte b/src/components/admin/panels/Housekeeping.svelte
index 1aee7da5..7cc074ac 100644
--- a/src/components/admin/panels/Housekeeping.svelte
+++ b/src/components/admin/panels/Housekeeping.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { alert, json, post } from "~/libgalaxy";
 	import DataTable from "../DataTable.svelte";
+	import { json } from "~/libgalaxy";
 	// import GameCard from "../../GameCard.svelte";
 
 	export let adminOps;
@@ -28,46 +28,6 @@
 	// 	loadData();
 	// }
 
-	let parentSlug = "";
-
-	async function grantCategory(idx: number) {
-		const cat = data.crequests[idx];
-		const { message } = await post("/api/admin/grantCategory", {
-			parent: parentSlug,
-			slug: cat.slug,
-		});
-
-		if (message === "Done")
-			alert.success(
-				"Fucked up edge-case--we're using forum categories? Manually send a PM to the user that it was approved."
-			);
-
-		// 		if (message === "Done") {
-		// 			sendToEveryone = false;
-		// 			sendToUid = cat.requestAuthor;
-		// 			messageTitle = "Your category request was approved!";
-		// 			messageContent = `Your request to create the category ${cat.name} has been approved!
-
-		// You can find it [here](/forum/category/${cat.slug}), and customize it and appoint moderators [here](/forum/mod/${cat.slug}).
-
-		// If you have any more questions, feel free to join [the Discord server](/discord) or send an email to \`support@galaxy.click\`.`;
-
-		// 			loadData();
-		// 		}
-	}
-
-	async function nopeCategory(idx: number) {
-		const cat = data.crequests[idx];
-		const { message } = await post("/api/admin/nopeCategory", {
-			slug: cat.slug,
-		});
-
-		if (message === "Done")
-			alert.success(
-				"Fucked up edge-case--we're using forum categories? Manually send a PM to the user that it was denied."
-			);
-	}
-
 	loadData();
 </script>
 
@@ -96,22 +56,6 @@
 			/>
 		{/if}
 
-		<h2>forum category requests</h2>
-		{#each data.crequests as cat, i}
-			<details>
-				<summary>{cat.name}</summary>
-				slug: {cat.slug}<br />
-				desc: {cat.description}<br />
-				why? {cat.reason}<br />
-				<button on:click={() => grantCategory(i)}>grant</button> with
-				the parent
-				<input bind:value={parentSlug} placeholder="(slug)" /><br />
-				<button on:click={() => nopeCategory(i)}>nuh uh!</button>
-			</details>
-		{:else}
-			🎉
-		{/each}
-
 		<!-- <h2>game requests</h2>
 		{#each data.requests as request, i}
 			<div>
diff --git a/src/components/forum/ThreadReader.svelte b/src/components/forum/ThreadReader.svelte
index 4ff40da8..fa2a230f 100644
--- a/src/components/forum/ThreadReader.svelte
+++ b/src/components/forum/ThreadReader.svelte
@@ -3,7 +3,6 @@
 		FrontendForumPost,
 		IForumCategory,
 		IForumThread,
-		IGame,
 		IUser,
 	} from "~/types";
 	import { convertFormat, post, promptLogin, report } from "~/libgalaxy";
@@ -21,7 +20,6 @@
 	export let user: IUser | null;
 	export let level: number;
 	export let solution: FrontendForumPost | null;
-	export let linkedGame: IGame | null;
 	export let page: number;
 
 	let composing = "";
@@ -151,12 +149,6 @@
 			</Dropdown>
 		{/if}
 	</h1>
-	{#if linkedGame !== null}
-		<p>
-			this thread is linked to the game
-			<a href="/play/{linkedGame.id}">{linkedGame.name}</a>
-		</p>
-	{/if}
 	<div class="post-list">
 		{#each posts as post, i}
 			<article class="post">
diff --git a/src/helper/fetchComments.ts b/src/helper/fetchComments.ts
index b4352bb2..75d6eaf1 100644
--- a/src/helper/fetchComments.ts
+++ b/src/helper/fetchComments.ts
@@ -4,19 +4,23 @@ import type {
 	INamedFrontendComment,
 } from "~/types";
 import { Comment } from "~/models/comment";
+import { Game } from "~/models/game";
 import { User } from "~/models/user";
 import { tokenToUser } from "./auth";
 
-function frontendifyComments(
+export function frontendifyComments(
 	comments: IComment[],
 	userId?: number
 ): IFrontendComment[] {
 	return comments.map(c => ({
+		type: c.type,
+		rating: c.rating,
 		author: c.author,
+		parent: c.parent,
 		id: c.id,
 		content: c.content,
-		devResponse: c.devResponse,
 		score: c.score,
+		showMore: false,
 		// TODO: magic number :(
 		hidden: c.score <= -5,
 		deleted: c.deleted,
@@ -40,15 +44,45 @@ function frontendifyComments(
 export async function idToComments(
 	gameId: number,
 	sort: "createdAt" | "score",
-	userId?: number
+	filter: "all" | "comment" | "review",
+	parent: number,
+	sortDev: boolean,
+	userId?: number,
 ) {
 	// Wow I don't like that
-	const comments: IComment[] = await Comment.find({
+	const looky = {
 		game: gameId,
+		parent,
 		deleted: false,
-	})
-		.sort({ [sort]: -1 })
-		.limit(5);
+	}
+	if (filter !== "all") (looky as any).type = filter
+
+	let comments: IComment[] = []
+	if (sortDev) {
+		// TODO there is probably a better way for this
+		const devId = (await Game.findOne({ id: gameId })).author
+		comments = await Comment.find({
+			...looky,
+			author: devId
+		})
+			.sort({ [sort]: -1 })
+			.limit(5);
+		if (comments.length < 5) {
+			comments.push(...await Comment.find({
+				...looky,
+				author: {
+					$not: {
+						$eq: devId
+					}
+				}
+			}).sort({ [sort]: -1 })
+			.limit(5 - comments.length))
+		}
+	} else {
+		comments = await Comment.find(looky)
+			.sort({ [sort]: -1 })
+			.limit(5);
+	}
 
 	return frontendifyComments(comments, userId);
 }
@@ -56,13 +90,16 @@ export async function idToComments(
 export async function idAndTokenToComments(
 	gameId: number,
 	sort: "createdAt" | "score",
+	filter: "all" | "comment" | "review",
+	parent: number,
+	sortDev: boolean,
 	token?: string
 ) {
 	const { user, loggedIn } = await tokenToUser(token);
 	if (loggedIn) {
-		return idToComments(gameId, sort, user.id);
+		return idToComments(gameId, sort, filter, parent, sortDev, user.id);
 	} else {
-		return idToComments(gameId, sort);
+		return idToComments(gameId, sort, filter, parent, sortDev);
 	}
 }
 
@@ -85,11 +122,12 @@ export async function attachNamesToComments(
 export async function paginateComments(
 	gameId: number,
 	sort: "createdAt" | "score",
+	parent: number,
 	page: number,
 	userId?: number
 ) {
 	const paginated = await Comment.paginate(
-		{ game: gameId, deleted: false },
+		{ game: gameId, deleted: false, parent},
 		{ sort: "-" + sort, page, limit: 20 }
 	);
 
diff --git a/src/helper/forum.ts b/src/helper/forum.ts
index 8ac33e40..4f457616 100644
--- a/src/helper/forum.ts
+++ b/src/helper/forum.ts
@@ -1,11 +1,7 @@
 import type { IForumCategory, IUser } from "~/types";
 import { CategoryModerator } from "~/models/categorymod";
 import { ForumCategory } from "~/models/forumcategory";
-import { ForumPost } from "~/models/forumpost";
-import { ForumThread } from "~/models/forumthread";
-import { Game } from "~/models/game";
 import { hasStaffPerm } from "./adminHelper";
-import { keyv } from "~/models/keyv";
 
 async function forumModeratorLevelCore(
 	user: number,
@@ -45,49 +41,4 @@ export async function getCategoryModerators(category: IForumCategory) {
 		ForumCategory.findOne({ id: category.parent }),
 	]);
 	return [...mods, ...(await getCategoryModerators(parent))];
-}
-
-export async function createLinkedThread(id: number) {
-	const game = await Game.findOne({ id });
-
-	const timestamp = new Date();
-	const [threadId, postId, categoryId] = await Promise.all([
-		keyv.id("lastThreadId"),
-		keyv.id("lastPostId"),
-		keyv.get("autoGameCategory", 1),
-	]);
-
-	const thread = new ForumThread({
-		author: -1,
-		category: categoryId,
-		id: threadId,
-		when: timestamp,
-		lastPost: timestamp,
-		preview: `Auto-generated thread for ${game.name}`,
-		name: game.name,
-		postCount: 1,
-		linkedGame: id,
-	});
-	await thread.save();
-
-	const post = new ForumPost({
-		author: -1,
-		body: `This thread was automatically created to serve as a place to discuss ${game.name} on the forums. Feel free to ask questions, share your progress, or anything else related to the game!
-
-If you are the creator of this game and would like to upgrade this thread to a category, check your game's edit page.`,
-		id: postId,
-		when: timestamp,
-		thread: threadId,
-	});
-
-	await Promise.all([
-		post.save(),
-		ForumCategory.updateOne(
-			{ id: categoryId },
-			{
-				$set: { lastPost: timestamp, lastThread: timestamp },
-				$inc: { postCount: 1, threadCount: 1 },
-			}
-		),
-	]);
-}
+}
\ No newline at end of file
diff --git a/src/models/categoryrequest.ts b/src/models/categoryrequest.ts
deleted file mode 100644
index 378ca23a..00000000
--- a/src/models/categoryrequest.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Schema, model } from "mongoose";
-import type { ICategoryRequest } from "~/types";
-
-const CategoryRequestSchema = new Schema<ICategoryRequest>(
-	{
-		name: String,
-		slug: String,
-		description: String,
-		reason: String,
-		requestAuthor: Number,
-		resolved: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	{
-		timestamps: true,
-	}
-);
-
-export const CategoryRequest = model<ICategoryRequest>(
-	"CategoryRequests",
-	CategoryRequestSchema
-);
diff --git a/src/models/comment.ts b/src/models/comment.ts
index 22c091ac..7e3f72b5 100644
--- a/src/models/comment.ts
+++ b/src/models/comment.ts
@@ -9,18 +9,15 @@ const CommentSchema = new Schema<IComment>(
 		game: Number,
 		author: Number,
 		id: Number,
+		type: String,
+		rating: Number,
+		parent: Number,
 		content: {
 			type: String,
 			minLength: 1,
 			maxLength: 4096,
 			required: true,
 		},
-		devResponse: {
-			type: String,
-			minLength: 1,
-			maxLength: 8192,
-			required: false,
-		},
 		up: Array,
 		down: Array,
 		upCount: {
@@ -52,10 +49,26 @@ export const Comment = model<IComment, PaginateModel<IComment>>(
 	CommentSchema
 );
 
-export const commentSchema = z.object({
+export const commentSchema = z.object({ game: z.number().min(1).int(), parent: z.number().int() }).and(
+	z.object({
+		type: z.literal("comment"),
+		content: z
+			.string()
+			.min(3, "Minimum comment length is 3 characters")
+			.max(4096),
+	}).or(z.object({
+		type: z.literal("review"),
+		content: z
+			.string()
+			.min(10, "Minimum review length is 10 characters")
+			.max(4096)
+		}))
+)
+
+export const currentCommentSchema = z.object({
+	id: z.number().int(),
 	content: z
 		.string()
-		.min(3, "Minimum comment length is 3 characters")
-		.max(4096),
-	game: z.number().min(1).int(),
-});
+		.min(1, "Reply must not be empty")
+		.max(4096, "Reply is too long"),
+});
\ No newline at end of file
diff --git a/src/models/forumcategory.ts b/src/models/forumcategory.ts
index 9887a07b..39bdd299 100644
--- a/src/models/forumcategory.ts
+++ b/src/models/forumcategory.ts
@@ -46,10 +46,6 @@ const ForumCategorySchema = new Schema<IForumCategory>({
 		type: Boolean,
 		default: false,
 	},
-	linkedGames: {
-		type: [Number],
-		default: [],
-	},
 });
 
 export const ForumCategory = model<IForumCategory>(
diff --git a/src/models/forumpost.ts b/src/models/forumpost.ts
index 008c0145..deecddcc 100644
--- a/src/models/forumpost.ts
+++ b/src/models/forumpost.ts
@@ -27,10 +27,6 @@ const ForumPostSchema = new Schema<IForumPost>({
 		type: [[Number]],
 		default: () => new Array(8).fill([]),
 	},
-	linkedGame: {
-		type: Schema.Types.Mixed,
-		default: false,
-	},
 });
 
 ForumPostSchema.plugin(paginate);
diff --git a/src/models/forumthread.ts b/src/models/forumthread.ts
index 74926ad3..9a1507bd 100644
--- a/src/models/forumthread.ts
+++ b/src/models/forumthread.ts
@@ -32,10 +32,6 @@ const ForumThreadSchema = new Schema<IForumThread>({
 		type: Boolean,
 		default: false,
 	},
-	linkedGame: {
-		type: Schema.Types.Mixed,
-		default: false,
-	},
 	solution: {
 		type: Schema.Types.Mixed,
 		default: false,
diff --git a/src/pages/api/admin/edit/comment.ts b/src/pages/api/admin/edit/comment.ts
index 456e491c..1af8caff 100644
--- a/src/pages/api/admin/edit/comment.ts
+++ b/src/pages/api/admin/edit/comment.ts
@@ -9,7 +9,6 @@ import { z } from "zod";
 const schema = z.object({
 	id: z.number().int(),
 	content: z.string().max(4096),
-	devResponse: z.string().max(8096).optional(),
 });
 
 export const POST = adminRoute({ schema }, async (_request, editing, mod) => {
@@ -17,7 +16,7 @@ export const POST = adminRoute({ schema }, async (_request, editing, mod) => {
 	if (!c) return rmsg("Comment not found", 404);
 
 	// Nothing needs to be done here :>
-	if (editing.content === c.content && editing.devResponse === c.devResponse)
+	if (editing.content === c.content)
 		return;
 
 	let editedSummary = "";
@@ -31,11 +30,6 @@ export const POST = adminRoute({ schema }, async (_request, editing, mod) => {
 		c.content = editing.content;
 	}
 
-	if (editing.devResponse !== c.devResponse) {
-		editedSummary += `dev response: ${c.devResponse} -> ${editing.devResponse}`;
-		c.content = editing.content;
-	}
-
 	await c.save();
 
 	const user = await User.findOne({ id: c.author });
diff --git a/src/pages/api/admin/grantCategory.ts b/src/pages/api/admin/grantCategory.ts
deleted file mode 100644
index 3b43549f..00000000
--- a/src/pages/api/admin/grantCategory.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { CategoryModerator } from "~/models/categorymod";
-import { CategoryRequest } from "~/models/categoryrequest";
-import { ForumCategory } from "~/models/forumcategory";
-import { adminRoute } from "~/helper/route";
-import { keyv } from "~/models/keyv";
-import { rmsg } from "~/helper/res";
-import { z } from "zod";
-
-const schema = z.object({
-	slug: z.string(),
-	parent: z.string(),
-});
-
-export const POST = adminRoute(
-	{ schema },
-	async (_request, { slug, parent: parentSlug }) => {
-		const catReq = await CategoryRequest.findOne({ slug, resolved: false });
-		if (!catReq) return rmsg("Category request not found", 400);
-
-		const parent = await ForumCategory.findOne({ slug: parentSlug });
-		if (!parent) return rmsg("Parent category not found", 400);
-
-		const id = await keyv.id("lastCategoryId");
-		const cat = new ForumCategory({
-			id,
-			slug,
-			name: catReq.name,
-			description: catReq.description,
-			parent: parent.id,
-		});
-
-		const permissionNode = new CategoryModerator({
-			perms: 3,
-			user: catReq.requestAuthor,
-			category: id,
-		});
-
-		catReq.resolved = true;
-
-		await Promise.all([cat.save(), permissionNode.save(), catReq.save()]);
-	}
-);
diff --git a/src/pages/api/admin/housekeepingData.ts b/src/pages/api/admin/housekeepingData.ts
index cb66441d..e06909f7 100644
--- a/src/pages/api/admin/housekeepingData.ts
+++ b/src/pages/api/admin/housekeepingData.ts
@@ -1,4 +1,3 @@
-import { CategoryRequest } from "~/models/categoryrequest";
 import { Game } from "~/models/game";
 import { GameRequest } from "~/models/gamerequest";
 import { Report } from "~/models/report";
@@ -8,7 +7,6 @@ export const GET = adminDataRoute({ reqLevel: "any" }, async () => {
 	const unverified = await Game.find({ verified: { $ne: true } });
 	const unresolved = await Report.find({ resolved: { $ne: true } });
 	const requests = await GameRequest.find({ resolved: false });
-	const crequests = await CategoryRequest.find({ resolved: false });
 
-	return { unverified, unresolved, requests, crequests };
+	return { unverified, unresolved, requests };
 });
diff --git a/src/pages/api/admin/nopeCategory.ts b/src/pages/api/admin/nopeCategory.ts
deleted file mode 100644
index 72c76c27..00000000
--- a/src/pages/api/admin/nopeCategory.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { CategoryRequest } from "~/models/categoryrequest";
-import { adminRoute } from "~/helper/route";
-import { rmsg } from "~/helper/res";
-import { z } from "zod";
-
-const schema = z.object({
-	slug: z.string(),
-});
-
-export const POST = adminRoute({ schema }, async (_request, { slug }) => {
-	const catReq = await CategoryRequest.findOne({ slug, resolved: false });
-	if (!catReq) return rmsg("Category request not found", 400);
-
-	catReq.resolved = true;
-
-	await catReq.save();
-});
diff --git a/src/pages/api/comments/delete.ts b/src/pages/api/comments/delete.ts
index 4a94fc82..af982c71 100644
--- a/src/pages/api/comments/delete.ts
+++ b/src/pages/api/comments/delete.ts
@@ -40,10 +40,7 @@ export const POST = route(
 				"comment",
 				`deleted comment by ${author.name} (${author.id})`,
 				`comment content:
-${comment.content}
-
-developer reply?:
-${comment.devResponse}`,
+${comment.content}`,
 				{ userId: author.id, comment }
 			);
 		}
diff --git a/src/pages/api/comments/edit.ts b/src/pages/api/comments/edit.ts
new file mode 100644
index 00000000..78a29535
--- /dev/null
+++ b/src/pages/api/comments/edit.ts
@@ -0,0 +1,76 @@
+import { byLockdown, route } from "~/helper/route";
+import { rdata, rmsg } from "~/helper/res";
+import { currentCommentSchema, Comment } from "~/models/comment";
+import { convertFormat } from "~/libgalaxy";
+import { env } from "~/helper/env";
+import { sendFancyWebhook } from "~/helper/sendWebhook";
+import { Game } from "~/models/game";
+import { Rating } from "~/models/rating";
+
+export const POST = route(
+	{
+		disabled: byLockdown(
+			"commentsLocked",
+			"The editing of comments is disabled at this moment."
+		),
+		auth: true,
+		notMuted: true,
+		notUnderage: true,
+		schema: currentCommentSchema,
+	},
+	async ({ locals }, { id: commentId, content }) => {
+		const { user } = locals.auth;
+
+		const comment = await Comment.findOne({ id: commentId, deleted: false })
+		if (!comment) return rmsg("Comment not found", 404)
+		if (comment.author !== user.id) return rmsg("You are not the author of this comment", 403)
+
+		const prevContent = comment.content
+		let rating = -1
+		if (comment.type === "review") {
+			const rate = await Rating.findOne({ author: user.id, game: comment.game })
+			if (!rate) return rmsg("A game rating is required for a review", 403)
+			rating = rate.rating
+		}
+
+		comment.content = content
+		comment.rating = rating
+		await comment.save();
+
+		// this should always be non-null right
+		const game = await Game.findOne({ id: comment.game })
+		if (env.STAFF_COMMENT_WEBHOOK !== undefined && game !== null)
+			await sendFancyWebhook(env.STAFF_COMMENT_WEBHOOK, {
+				embeds: [
+					{
+						title: `user ${user.name} edited a comment on ${game.name}`,
+						description: `previously:
+>>> ${prevContent}
+currently: 
+>>> ${content}`.trim(),
+						url: `https://galaxy.click/play/${game.id}`,
+						// TODO no idea what the color of this should be
+						color: 4723016,
+						timestamp: new Date().toISOString(),
+						author: {
+							name: user.name,
+							url: `https://galaxy.click/user/${user.id}`,
+							icon_url: convertFormat(
+								"https://galaxy.click/pfp/large/",
+								user.id,
+								user.pfpTimestamp
+							),
+						},
+					},
+				],
+			});
+
+		return rdata(
+			{
+				message: "success",
+				rating
+			},
+			201
+		);
+	}
+);
diff --git a/src/pages/api/comments/fetch.ts b/src/pages/api/comments/fetch.ts
new file mode 100644
index 00000000..ec405f58
--- /dev/null
+++ b/src/pages/api/comments/fetch.ts
@@ -0,0 +1,49 @@
+import { attachNamesToComments, idToComments } from "~/helper/fetchComments";
+import { rdata, rmsg } from "~/helper/res";
+import { Comment } from "~/models/comment";
+import { Game } from "~/models/game";
+import { route } from "~/helper/route";
+import { z } from "zod";
+
+const schema = z.object({
+	sort: z.union([z.literal("createdAt"), z.literal("score")]),
+	game: z.number().int().min(1),
+	id: z.number().int(),
+	filter: z.union([z.literal("all"), z.literal("comment"), z.literal("review")])
+})
+	
+// This probably does not need to be POST
+export const POST = route(
+	{
+		schema
+	},
+	async ({ locals }, { game, id, sort, filter }) => {
+		const gameDB = await Game.findOne({ id: game })
+		if (!gameDB) return rmsg("Game does not exist", 404)
+
+		if (id !== -1) {
+			const comment = await Comment.findOne({ id, deleted: false })
+			if (!comment) return rmsg("Comment not found", 404)
+		}
+
+		const userId = locals.auth.user?.id
+		const isLimited = (await Comment.countDocuments({
+			game,
+			parent: id,
+			deleted: false,
+		})) > 5
+
+		// Double await seems cursed
+		const result = (await attachNamesToComments(await idToComments(game, sort, filter, id, id !== -1, userId)))
+			.map(i => ({
+				...i,
+				// Date does not work here :(
+				createdAt: +i.createdAt
+			}))
+		return rdata({
+			message: "success",
+			result,
+			isLimited
+		}, 200)
+	}
+);
diff --git a/src/pages/api/comments/new.ts b/src/pages/api/comments/new.ts
index 01e30dad..1c63f50d 100644
--- a/src/pages/api/comments/new.ts
+++ b/src/pages/api/comments/new.ts
@@ -2,6 +2,8 @@ import { byLockdown, route } from "~/helper/route";
 import { rdata, rmsg } from "~/helper/res";
 import { Comment } from "~/models/comment";
 import { Game } from "~/models/game";
+import { Message } from "~/models/message";
+import { Rating } from "~/models/rating";
 import { commentSchema } from "~/models/comment";
 import { convertFormat } from "~/libgalaxy";
 import { env } from "~/helper/env";
@@ -19,7 +21,7 @@ export const POST = route(
 		notUnderage: true,
 		schema: commentSchema,
 	},
-	async ({ locals }, { game: gameId, content }) => {
+	async ({ locals }, { game: gameId, content, type, parent }) => {
 		const { user } = locals.auth;
 
 		const game = await Game.findOne({ id: gameId });
@@ -30,12 +32,34 @@ export const POST = route(
 
 		const author = user.id;
 		const lastCommentId = await keyv.id("lastCommentId");
+		let rating = -1
+
+		if (type === "review") {
+			if (parent !== -1) return rmsg("You can't reply with a review", 403)
+			if (game.author === user.id) return rmsg("You can't submit a review on your own game", 403)
+
+			const has = await Comment.findOne({ author, game: gameId, type, deleted: false })
+			if (has) return rmsg("Only one review is allowed", 403)
+
+			const rate = await Rating.findOne({ author, game: gameId })
+			if (!rate) return rmsg("A game rating is required for a review", 403)
+			rating = rate.rating
+		}
+
+		let parentComment = undefined
+		if (parent !== -1) {
+			parentComment = await Comment.findOne({ id: parent })
+			if (!parentComment) return rmsg("Can't reply to a nonexistent comment", 404)
+		}
 
 		// TODO limit comments per user per game (10?)
 		const comment = new Comment({
+			type,
+			rating,
+			parent,
 			game: gameId,
 			author,
-			content: content,
+			content,
 			id: lastCommentId,
 			up: [author],
 			upCount: 1,
@@ -47,6 +71,23 @@ export const POST = route(
 		await comment.save();
 		await game.save();
 
+		if (parentComment && author !== parentComment.author) {
+			const message = new Message({
+				from: -1,
+				to: parentComment.author,
+				// TODO should this make it obvious if the replier is a developer?
+				title: `Someone replied to your comment on ${game.name}`,
+				content: `${user.name} replied to your comment!
+
+Your comment:
+> ${parentComment.content}
+ 
+${user.name}'${user.name.endsWith("s") ? "" : "s"} reply:
+> ${content}`
+			})
+			await message.save()
+		}
+
 		if (env.STAFF_COMMENT_WEBHOOK !== undefined)
 			await sendFancyWebhook(env.STAFF_COMMENT_WEBHOOK, {
 				embeds: [
@@ -81,6 +122,9 @@ export const POST = route(
 					deleted: false,
 					createdAt: +comment.createdAt,
 					yourVote: 1,
+					type,
+					rating,
+					parent,
 
 					name: user.name,
 					flair: user.equippedFlair,
diff --git a/src/pages/api/comments/reply.ts b/src/pages/api/comments/reply.ts
deleted file mode 100644
index b741d4e8..00000000
--- a/src/pages/api/comments/reply.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { rfu, rmsg } from "~/helper/res";
-import { Comment } from "~/models/comment";
-import { Game } from "~/models/game";
-import { Message } from "~/models/message";
-import { route } from "~/helper/route";
-import { z } from "zod";
-
-const schema = z.object({
-	id: z.number().int(),
-	content: z
-		.string()
-		.min(1, "Reply must not be empty")
-		.max(8192, "Reply is too long"),
-});
-
-export const POST = route(
-	{
-		auth: true,
-		notMuted: true,
-		schema,
-	},
-	async ({ locals }, { id: commentId, content: reply }) => {
-		const { user } = locals.auth;
-
-		const comment = await Comment.findOne({
-			id: commentId,
-			deleted: false,
-		});
-		if (!comment)
-			return rmsg("Attempted to reply to an unknown comment", 404);
-
-		const game = await Game.findOne({ id: comment.game });
-		if (!game) return rmsg("Attempted to reply to an unknown game", 404);
-		if (game.author !== user.id)
-			return rfu("You didn't make this game, silly!", 403);
-
-		comment.devResponse = reply;
-		await comment.save();
-
-		// Don't notify the dev if they reply to their own comment.
-		if (game.author !== comment.author) {
-			const msg = new Message({
-				from: -1,
-				to: comment.author,
-				title: `A developer replied to your comment on ${game.name}`,
-				content: `${user.name} replied to your comment!
-
-Your comment:
-> ${comment.content}
-
-${user.name}'${user.name.endsWith("s") ? "" : "s"} reply:
-> ${reply}`,
-			});
-			await msg.save();
-		}
-
-		return rmsg("success", 200);
-	}
-);
diff --git a/src/pages/api/forum/linkGame.ts b/src/pages/api/forum/linkGame.ts
deleted file mode 100644
index 9fd44097..00000000
--- a/src/pages/api/forum/linkGame.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ForumCategory } from "~/models/forumcategory";
-import { Game } from "~/models/game";
-import { forumModeratorLevel } from "~/helper/forum";
-import { rmsg } from "~/helper/res";
-import { route } from "~/helper/route";
-import { z } from "zod";
-
-const schema = z.object({
-	category: z.number().int().min(1),
-	game: z.number().int().min(1),
-});
-
-export const POST = route(
-	{ auth: true, notMuted: true, schema },
-	async ({ locals }, req) => {
-		const { user } = locals.auth;
-		const { category: categoryId, game: gameId } = req;
-
-		const category = await ForumCategory.findOne({ id: categoryId });
-		if (!category) return rmsg("Category not found", 400);
-
-		const modLevel = await forumModeratorLevel(user, category);
-		if (modLevel < 2) return rmsg("Insufficient permissions", 400);
-
-		const game = await Game.findOne({ id: gameId });
-
-		if (game.author !== user.id)
-			return rmsg("You are not the author of this game!", 400);
-
-		await ForumCategory.updateOne(
-			{ id: categoryId },
-			{ $push: { linkedGames: gameId } }
-		);
-
-		return rmsg("ok");
-	}
-);
diff --git a/src/pages/api/forum/request.ts b/src/pages/api/forum/request.ts
deleted file mode 100644
index ff8403cd..00000000
--- a/src/pages/api/forum/request.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { CategoryRequest } from "~/models/categoryrequest";
-import { ForumCategory } from "~/models/forumcategory";
-import { env } from "~/helper/env";
-import { rmsg } from "~/helper/res";
-import { route } from "~/helper/route";
-import sendWebhook from "~/helper/sendWebhook";
-import { z } from "zod";
-
-const schema = z.object({
-	name: z
-		.string()
-		.trim()
-		.nonempty("Please specify a name")
-		.max(128, "Category name too long"),
-	slug: z
-		.string()
-		.trim()
-		.nonempty("Please specify a slug")
-		.max(32, "Category slug too long"),
-	description: z
-		.string()
-		.nonempty("Please specify a description")
-		.max(512, "Description too long"),
-	reason: z.string().trim().nonempty("Please specify a reason").max(2048),
-});
-
-export const POST = route(
-	{ auth: true, notMuted: true, schema },
-	async ({ locals }, req) => {
-		const { user } = locals.auth;
-		const { name, slug, description, reason } = req;
-
-		const alreadyRequested = await CategoryRequest.findOne({
-			slug,
-			resolved: false,
-		});
-		if (alreadyRequested)
-			return rmsg(
-				"A category with this slug has already been requested.",
-				400
-			);
-
-		const alreadyExists = await ForumCategory.findOne({ slug });
-		if (alreadyExists)
-			return rmsg("A category with this slug already exists.", 400);
-
-		const doc = new CategoryRequest({
-			name,
-			slug,
-			description,
-			reason,
-			requestAuthor: user.id,
-		});
-
-		await doc.save();
-
-		if (env.STAFF_REPORT_WEBHOOK !== undefined)
-			await sendWebhook(env.STAFF_REPORT_WEBHOOK, {
-				content: `new category ${name} (${slug}) has been requested
-<https://galaxy.click/admin>`,
-				name: "category request",
-			});
-
-		return rmsg("success");
-	}
-);
diff --git a/src/pages/api/users/signup.ts b/src/pages/api/users/signup.ts
index 5013f9d9..e11e0f79 100644
--- a/src/pages/api/users/signup.ts
+++ b/src/pages/api/users/signup.ts
@@ -27,7 +27,7 @@ export const POST = route(
 		),
 		schema,
 	},
-	async ({ request, clientAddress, cookies }, req) => {
+	async ({ request, cookies }, req) => {
 		cookies.set("birth-info", req.year + "," + req.month, {
 			maxAge: 60 * 60 * 24 * 365 * 2,
 			path: "/",
@@ -38,7 +38,7 @@ export const POST = route(
 		formData.append("response", req.captcha);
 		formData.append(
 			"remoteip",
-			request.headers.get("CF-Connecting-IP") ?? clientAddress
+			request.headers.get("CF-Connecting-IP")
 		);
 
 		const url = "https://challenges.cloudflare.com/turnstile/v0/siteverify";
diff --git a/src/pages/comments/[gameId].astro b/src/pages/comments/[gameId].astro
index f2dbd2b9..a8d510bd 100644
--- a/src/pages/comments/[gameId].astro
+++ b/src/pages/comments/[gameId].astro
@@ -1,11 +1,13 @@
 ---
+import { attachNamesToComments, frontendifyComments, paginateComments } from "~/helper/fetchComments";
+import Comment from "~/components/Comment.svelte"
 import CommentList from "~/components/CommentList.svelte";
+import { Comment as CommentModel } from "~/models/comment";
 import { Game } from "~/models/game";
 import Layout from "~/layouts/Layout.astro";
 import Pagination from "~/components/Pagination.svelte";
 import { astroUnder13 } from "~/helper/coppa";
 import { hasStaffPerm } from "~/helper/adminHelper";
-import { paginateComments } from "~/helper/fetchComments";
 
 const { gameId } = Astro.params;
 
@@ -22,6 +24,9 @@ if (sortRaw === "time") sort = "createdAt";
 else if (sortRaw === "top") sort = "score";
 // Ignore invalid sorts
 
+let parent = parseInt(Astro.url.searchParams.get("parent"))
+if (isNaN(parent)) parent = undefined
+
 const { user, loggedIn, needsVerification } = Astro.locals.auth;
 
 const gameNum = parseInt(gameId.toString());
@@ -30,9 +35,19 @@ if (isNaN(gameNum)) return new Response(null, { status: 404 });
 const game = await Game.findOne({ id: gameId });
 if (!game) return new Response(null, { status: 404 });
 
+let thisComment = undefined
+let nextParent = ""
+if (parent !== undefined) {
+	const comment = await CommentModel.findOne({ id: parent })
+	if (!comment) return new Response(null, { status: 404 })
+	thisComment = (await attachNamesToComments(await frontendifyComments([comment], user?.id)))[0]
+	if (thisComment.parent !== undefined) nextParent = `&parent=${thisComment.parent}`
+}
+
 const { comments, pages } = await paginateComments(
 	gameNum,
 	sort,
+	parent,
 	page,
 	user?.id
 );
@@ -58,17 +73,34 @@ if (import.meta.env.PROD) {
 			<option value="top">most votes</option>
 			<option value="time"> most recent</option>
 		</select>
+		{parent !== undefined ? <a href={`/comments/${gameId}?sort=${sortRaw}${nextParent}`} class="button">go up</a> : null}
 		<a href={`/play/${game.id}`} class="button">go back</a>
 		<br />
 		<br />
-		<CommentList
-			client:load
-			{comments}
-			userId={user?.id}
-			isDev={user?.id === game.author}
-			isLoggedIn={loggedIn}
-			isStaff={hasStaffPerm(user?.modLevel, "mod")}
-		/>
+		{parent !== undefined ? (
+			<Comment 
+				gameId={gameNum}
+				comment={thisComment}
+				userId={user?.id}
+				isLoggedIn={loggedIn}
+				isStaff={hasStaffPerm(user?.modLevel, "mod")}
+				loadDepth={-1}
+				{sort}
+				client:only="svelte"
+			/>
+		) : null}
+		<div style={parent !== undefined ? "margin-left: 20px" : ""}>
+			<CommentList
+				client:load
+				gameId={gameNum}
+				loadDepth={2}
+				{comments}
+				{sort}
+				userId={user?.id}
+				isLoggedIn={loggedIn}
+				isStaff={hasStaffPerm(user?.modLevel, "mod")}
+			/>
+		</div>
 
 		<Pagination pages={pages} currentPage={page} client:only="svelte" />
 	</main>
diff --git a/src/pages/edit/[editId].astro b/src/pages/edit/[editId].astro
index caf276ec..3439fa3c 100644
--- a/src/pages/edit/[editId].astro
+++ b/src/pages/edit/[editId].astro
@@ -1,8 +1,6 @@
 ---
 import { getTagCategories, getTagData } from "~/helper/tags";
-import { CategoryModerator } from "~/models/categorymod";
 import Form from "~/components/Form.astro";
-import { ForumCategory } from "~/models/forumcategory";
 import { Game } from "~/models/game";
 import GameEditor from "~/components/GameEditor.svelte";
 import Layout from "~/layouts/Layout.astro";
@@ -20,23 +18,6 @@ const { user, loggedIn, needsVerification } = Astro.locals.auth;
 
 if (!loggedIn || game.author !== user.id) return Astro.redirect("/");
 
-const linkedCategory = await ForumCategory.find({
-	linkedGames: game.id,
-}).lean();
-const moddedCategories = await CategoryModerator.find({
-	user: user.id,
-	perms: { $gte: 2 },
-}).lean();
-const categoryData = {};
-if (moddedCategories.length >= 1) {
-	const categoryDocs = await ForumCategory.find({
-		id: { $in: moddedCategories.map(n => n.category) },
-	}).lean();
-	categoryDocs.forEach(category => {
-		categoryData[category.id as number] = category;
-	});
-}
-
 game.verified = game.verified === true;
 ---
 
@@ -44,9 +25,6 @@ game.verified = game.verified === true;
 	<main id="main" class="nomargin">
 		<GameEditor
 			game={game}
-			linkedCategory={linkedCategory}
-			moddedCategories={moddedCategories}
-			categoryData={categoryData}
 			tagCategories={getTagCategories()}
 			tagData={getTagData()}
 			client:only="svelte"
diff --git a/src/pages/forum/request.astro b/src/pages/forum/request.astro
deleted file mode 100644
index 54d1b57a..00000000
--- a/src/pages/forum/request.astro
+++ /dev/null
@@ -1,63 +0,0 @@
----
-import Form from "~/components/Form.astro";
-import Layout from "~/layouts/Layout.astro";
-
-if (!Astro.locals.auth.loggedIn) return Astro.redirect("/");
----
-
-<Layout title="request a forum category">
-	<main id="main">
-		<h1>request a forum category</h1>
-		<p>
-			You will be made the owner of the category if it gets created.
-			<br />
-			If you've made multiple games, consider one category for all of them
-			to reduce clutter on the forums.
-		</p>
-		<div id="request" data-action="/api/forum/request">
-			<Form>
-				<div data-label="category name">
-					<input type="text" name="name" placeholder="(required)" />
-				</div>
-				<div data-label="category slug">
-					<input type="text" name="slug" placeholder="(required)" />
-				</div>
-				<div data-label="category description">
-					<input
-						type="text"
-						name="description"
-						placeholder="(required)"
-					/>
-				</div>
-				<div data-label="reasoning">
-					<input
-						type="text"
-						name="reason"
-						placeholder="why is the thread not enough?"
-					/>
-				</div>
-				<div data-label="let's go">
-					<button type="submit" role="button">
-						request category
-					</button>
-				</div>
-			</Form>
-		</div>
-	</main>
-</Layout>
-
-<script>
-	import { alert, form } from "~/libgalaxy";
-
-	form(
-		"request",
-		["name", "slug", "description", "reason"],
-		res => {
-			if (res.message === "success") {
-				alert.success("Your request has been sent!");
-				setTimeout(() => (window.location.pathname = "/"), 1000);
-			}
-		},
-		false
-	);
-</script>
diff --git a/src/pages/forum/thread/[threadId].astro b/src/pages/forum/thread/[threadId].astro
index 1ea747a1..52ed8bbf 100644
--- a/src/pages/forum/thread/[threadId].astro
+++ b/src/pages/forum/thread/[threadId].astro
@@ -104,11 +104,6 @@ authorsArray.forEach(author => {
 });
 
 const modLevel = await forumModeratorLevel(user, category);
-
-let linkedGame: IGame | null = null;
-if (typeof thread.linkedGame === "number") {
-	linkedGame = await Game.findOne({ id: thread.linkedGame }).lean();
-}
 ---
 
 <Layout
@@ -124,7 +119,6 @@ if (typeof thread.linkedGame === "number") {
 			user={user?.toObject() ?? null}
 			level={modLevel}
 			solution={solution}
-			linkedGame={linkedGame}
 			page={currentPage}
 			client:load
 		/>
diff --git a/src/pages/play/[gameId].astro b/src/pages/play/[gameId].astro
index c5be6940..8f18c1a6 100644
--- a/src/pages/play/[gameId].astro
+++ b/src/pages/play/[gameId].astro
@@ -1,10 +1,7 @@
 ---
 import { type UserCompletedGameMap, getUserCompletedGames } from "~/helper/completed";
-import { attachNamesToComments, idToComments } from "~/helper/fetchComments";
 import DetailedGameCard from "~/components/DetailedGameCard.svelte";
 import { Favorite } from "~/models/favorite";
-import { ForumCategory } from "~/models/forumcategory";
-import { ForumThread } from "~/models/forumthread";
 import { Game } from "~/models/game";
 import GameDiscussion from "~/components/GameDiscussion.svelte";
 import GameInfo from "~/components/GameInfo.svelte";
@@ -17,7 +14,6 @@ import { Update } from "~/models/update";
 import { User } from "~/models/user";
 import { astroUnder13 } from "~/helper/coppa";
 import { convertFormat } from "~/libgalaxy";
-import { createLinkedThread } from "~/helper/forum";
 import { fromGame } from "~/helper/similar";
 import { getTagData } from "~/helper/tags";
 import { hasStaffPerm } from "~/helper/adminHelper";
@@ -51,9 +47,6 @@ let completedGames: UserCompletedGameMap = new Map();
 const [
 	author,
 	updates,
-	category,
-	plainNewComments,
-	plainTopComments,
 	similarGames,
 	...loggedInQueries
 ] = await Promise.all([
@@ -62,11 +55,6 @@ const [
 	// Game updates (just to find the most recent one)
 	// TODO is there a nice way to return just the first one?
 	Update.find({ game: gameNum }).sort({ id: -1 }).lean(),
-	// Game linked forum category
-	ForumCategory.findOne({ linkedGames: gameNum }),
-	// New/top comments
-	idToComments(gameNum, "createdAt", loggedIn ? user.id : undefined),
-	idToComments(gameNum, "score", loggedIn ? user.id : undefined),
 	// Game suggestions
 	fromGame(game, Astro.cookies.get("filters")?.value ?? ""),
 	// Favorited
@@ -79,42 +67,11 @@ const [
 
 const update = updates[0];
 
-let threads = [];
-if (category !== null) {
-	// A category is linked to the game
-	const [pinnedThreads, catThreads, linkedThreads] = await Promise.all([
-		ForumThread.find({ category: category.id, pinned: true }).lean(),
-		ForumThread.find({ category: category.id })
-			.limit(10)
-			.sort({ lastPost: -1 })
-			.lean(),
-		ForumThread.find({ linkedGame: gameNum }).lean(),
-	]);
-	threads = [...pinnedThreads, ...catThreads, ...linkedThreads];
-} else {
-	// No category is linked to the game
-	threads = await ForumThread.find({ linkedGame: gameNum }).lean();
-	if (threads.length === 0 && game.verified === true)
-		await createLinkedThread(gameNum);
-}
-
-const authorsArray = await User.find({
-	id: { $in: [...new Set(threads.map(t => t.author))] },
-});
-const forumUsers = {};
-authorsArray.forEach(author => {
-	forumUsers[author.id] = author.toJSON();
-});
-
 if (loggedIn) {
 	favorited = loggedInQueries[0] !== null;
 	if (loggedInQueries[1] !== null) rating = loggedInQueries[1].rating;
 	completedGames = loggedInQueries[2];
 }
-const [newComments, topComments] = await Promise.all([
-	attachNamesToComments(plainNewComments),
-	attachNamesToComments(plainTopComments),
-]);
 
 const greed = Astro.url.searchParams.has("greed");
 ---
@@ -180,9 +137,6 @@ ${game.description}`,
 					isDev={user?.id === game.author}
 					isLoggedIn={loggedIn}
 					isStaff={hasStaffPerm(user?.modLevel, "mod")}
-					comments={[newComments, topComments]}
-					threads={threads}
-					users={forumUsers}
 				/>
 			)
 		}
diff --git a/src/pages/rewind/developer.astro b/src/pages/rewind/developer.astro
index 2fcda628..3638e807 100644
--- a/src/pages/rewind/developer.astro
+++ b/src/pages/rewind/developer.astro
@@ -60,16 +60,12 @@ const comments = await Comment.aggregate([
 	{
 		$project: {
 			game: 1,
-			hasReply: {
-				$min: [{ $strLenCP: { $ifNull: ["$devResponse", ""] } }, 1],
-			},
 		},
 	},
 	{
 		$group: {
 			_id: "$game",
 			count: { $count: {} },
-			dev: { $sum: "$hasReply" },
 		},
 	},
 ]);
diff --git a/src/types.d.ts b/src/types.d.ts
index 12ef12f5..5c53ac28 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -8,8 +8,13 @@ interface IComment {
 	// user ID
 	author: number;
 
+	type: "comment" | "review"
+	rating: number;
+
+	// the parent comment
+	parent: number;
+
 	content: string;
-	devResponse?: string;
 	up: number[];
 	down: number[];
 	upCount: number;
@@ -26,13 +31,17 @@ interface IFrontendComment {
 
 	// user ID
 	author: number;
+	parent: number;
 
 	content: string;
-	devResponse?: string;
 	yourVote?: 0 | -1 | 1;
 	score: number;
 	hidden: boolean;
 	deleted: boolean;
+	showMore: boolean;
+	
+	type: "comment" | "review"
+	rating: number;
 
 	createdAt: Date;
 }
@@ -331,18 +340,6 @@ interface IGameRequest {
 	note: string;
 }
 
-interface ICategoryRequest {
-	// Submission data
-	name: string;
-	slug: string;
-	description: string;
-	reason: string;
-	requestAuthor: number;
-
-	// Should this be shown in the admin panel?
-	resolved: boolean;
-}
-
 interface IForumCategory {
 	id: number | false; // No forum should actually be false. It's just the parent categroy
 	slug: string;
@@ -358,7 +355,6 @@ interface IForumCategory {
 	order: number; // The order in the category list
 	giveXP: boolean; // Should posting give XP? (disabled for counting etc.)
 	locked: boolean; // Can new threads be made?
-	linkedGames: number[]; // Array of game IDs
 }
 
 interface ICategoryModerator {
@@ -379,7 +375,6 @@ interface IForumThread {
 	pinned: boolean;
 	locked: boolean;
 	deleted: boolean;
-	linkedGame: number | false;
 	solution: number | false;
 }
 
@@ -397,7 +392,6 @@ interface FrontendForumPost {
 	deleted: boolean;
 	reactions: number[];
 	selfReactions: number[];
-	linkedGame: number | false;
 }
 
 interface IForumPost extends FrontendForumPost {
-- 
GitLab


From d4e8419b912f9353f031bc86451c178808ac4213 Mon Sep 17 00:00:00 2001
From: circle-gon <14517910-circle-gon@users.noreply.gitlab.com>
Date: Thu, 20 Feb 2025 13:11:54 -0500
Subject: [PATCH 2/5] this should be it

---
 src/components/Comment.svelte                | 83 ++++++++++++++------
 src/components/CommentList.svelte            | 16 ++++
 src/components/GameComments.svelte           | 12 +++
 src/helper/fetchComments.ts                  |  1 +
 src/migrations/2025-02-19-migrateComments.md | 45 +++++++++++
 src/models/comment.ts                        | 28 +------
 src/pages/api/comments/convert.ts            | 61 ++++++++++++++
 src/pages/api/comments/edit.ts               | 21 ++++-
 src/pages/api/comments/new.ts                | 21 ++++-
 src/pages/comments/[gameId].astro            | 10 ++-
 src/types.d.ts                               |  2 +
 11 files changed, 243 insertions(+), 57 deletions(-)
 create mode 100644 src/migrations/2025-02-19-migrateComments.md
 create mode 100644 src/pages/api/comments/convert.ts

diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index 5457e1a2..a84c15cb 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -22,6 +22,11 @@
 	export interface ShowDetail {
 		id: number;
 	}
+
+	export interface ConvertDetail {
+		id: number;
+		rating: number;
+	}
 </script>
 
 <script lang="ts">
@@ -43,6 +48,7 @@
 	export let isStaff: boolean;
 	export let loadDepth: number;
 	export let sort: "createdAt" | "score"
+	export let isDev: boolean;
 
 	const dispatcher = createEventDispatcher<{
 		vote: VoteDetail;
@@ -50,6 +56,7 @@
 		reveal: RevealDetail;
 		edit: EditDetail;
 		show: ShowDetail;
+		convert: ConvertDetail;
 	}>();
 
 	let editing = false
@@ -118,21 +125,24 @@
 	function cedit(id: number) {
 		return async () => {
 			const content = thisComment
-			const { rating } = await post("/api/comments/edit", {
+			const res = await post("/api/comments/edit", {
 				id,
 				content
 			})
 
-			comment.content = content
-			comment.rating = rating
-			editing = false
-			thisComment = ""
-
-			dispatcher("edit", {
-				id,
-				content,
-				rating
-			})
+			if (res._resCode === 201) {
+				const { rating } = res
+				comment.content = content
+				comment.rating = rating
+				editing = false
+				thisComment = ""
+
+				dispatcher("edit", {
+					id,
+					content,
+					rating
+				})
+			}
 		}
 	}
 
@@ -144,11 +154,14 @@
 				type: "comment",
 				content: realReply
 			})
-			if (seenReplies === undefined) await loadReplies()
-			seenReplies = [...seenReplies, result.content]
-			trueReplying = false
-			comment.showMore = true // Don't hide your own response
-			realReply = ""
+
+			if (result._resCode === 201) {
+				if (seenReplies === undefined) await loadReplies()
+				seenReplies = [...seenReplies, result.content]
+				trueReplying = false
+				comment.showMore = true // Don't hide your own response
+				realReply = ""
+			}
 		}
 	}
 
@@ -160,6 +173,25 @@
 		})
 	}
 
+	function cconvert(id: number) {
+		return async () => {
+			const res = await post("/api/comments/convert", {
+				id
+			})
+
+			if (res._resCode === 200) {
+				comment.isOld = false
+				comment.type = "review"
+				comment.rating = res.rating
+
+				dispatcher("convert", {
+					id,
+					rating: res.rating
+				})
+			}
+		}
+	}
+
 	async function loadReplies() {
 		const resp = await post("/api/comments/fetch", {
 			sort,
@@ -203,12 +235,14 @@
 		/>
 		<!-- TODO someone else can probably come up with a better UI scheme than this -->
 		{#if comment.type === "review"}
-			<!-- I love whitespace -->
-			{#each Array(comment.rating).fill(undefined) as _}<Icon
-				icon="material-symbols:star-rounded" width="16" inline 
-			/>{/each}{#each Array(5 - comment.rating).fill(undefined) as _}<Icon
-				icon="material-symbols:star-outline-rounded" width="16" inline
-			/>{/each}
+			<span aria-label="{comment.rating} star{comment.rating > 1 ? "s" : ""}">
+				<!-- I love whitespace -->
+				{#each Array(comment.rating).fill(undefined) as _}<Icon
+					icon="material-symbols:star-rounded" width="16" inline 
+				/>{/each}{#each Array(5 - comment.rating).fill(undefined) as _}<Icon
+					icon="material-symbols:star-outline-rounded" width="16" inline
+				/>{/each}
+			</span>
 		{/if}
 		<div class="floatright">
 			<button
@@ -239,6 +273,9 @@
 				<Dropdown openLeft>
 					<button on:click={() => processTrueReplyClick()}>reply</button>
 					{#if comment.author === userId}
+						{#if comment.isOld && !isDev}
+							<button on:click={cconvert(comment.id)}>convert to review</button>
+						{/if}
 						<button on:click={() => processEditClick()}>edit comment</button>
 					{/if}
 					{#if comment.author !== userId}
@@ -299,11 +336,13 @@
 				{userId}
 				{isLoggedIn}
 				{isStaff}
+				{isDev}
 				on:vote
 				on:delete
 				on:reveal
 				on:edit
 				on:show
+				on:convert
 				bind:this={commentList}
 			/>
 			{#if isLimited}
diff --git a/src/components/CommentList.svelte b/src/components/CommentList.svelte
index c0432003..60c71636 100644
--- a/src/components/CommentList.svelte
+++ b/src/components/CommentList.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import Comment, {
+		type ConvertDetail,
 		type DeleteDetail,
 		type EditDetail,
 		type RevealDetail,
@@ -15,6 +16,7 @@
 	export let isStaff: boolean;
 	export let loadDepth: number;
 	export let sort: "createdAt" | "score"
+	export let isDev: boolean
 
 	// This has to be top 10 of the most inefficient code ever
 	const comps: Comment[] = []
@@ -70,6 +72,18 @@
 		})
 		for (const comp of comps) comp.getCommentListInstance()?.doShow(showDetail)
 	}
+
+	export function doConvert(convertDetail: ConvertDetail) {
+		const { id, rating } = convertDetail
+		comments = comments.map(c => {
+			if (c.id !== id) return c
+			c.isOld = false
+			c.type = "review"
+			c.rating = rating
+			return c
+		})
+		for (const comp of comps) comp.getCommentListInstance()?.doShow(convertDetail)
+	}
 </script>
 
 {#each comments as comment, count (comment.id)}
@@ -81,11 +95,13 @@
 		{isStaff}
 		{loadDepth}
 		{sort}
+		{isDev}
 		on:vote
 		on:delete
 		on:reveal
 		on:edit
 		on:show
+		on:convert
 		bind:this={comps[count]}
 	/>
 {/each}
diff --git a/src/components/GameComments.svelte b/src/components/GameComments.svelte
index 9a1de084..e7f6b58d 100644
--- a/src/components/GameComments.svelte
+++ b/src/components/GameComments.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import type {
+		ConvertDetail,
 		DeleteDetail,
 		EditDetail,
 		RevealDetail,
@@ -81,6 +82,11 @@
 		topCommentDiv?.doShow(detail);
 	}
 
+	function handleConvert({ detail }: CustomEvent<ConvertDetail>) {
+		newCommentDiv.doConvert(detail);
+		topCommentDiv?.doConvert(detail);
+	}
+
 	async function getComments(filter: "all" | "comment" | "review") {
 		loaded = false
 
@@ -151,6 +157,7 @@
 					{isLoggedIn}
 					{isStaff}
 					{gameId}
+					{isDev}
 					sort="createdAt"
 					loadDepth={2}
 					on:vote={handleVote}
@@ -158,6 +165,7 @@
 					on:reveal={handleReveal}
 					on:edit={handleEdit}
 					on:show={handleShow}
+					on:convert={handleConvert}
 					bind:this={newCommentDiv}
 				/>
 			</div>
@@ -171,6 +179,7 @@
 					{isLoggedIn}
 					{isStaff}
 					{gameId}
+					{isDev}
 					sort="createdAt"
 					loadDepth={2}
 					on:vote={handleVote}
@@ -178,6 +187,7 @@
 					on:reveal={handleReveal}
 					on:edit={handleEdit}
 					on:show={handleShow}
+					on:convert={handleConvert}
 					bind:this={newCommentDiv}
 				/>
 			</div>
@@ -190,6 +200,7 @@
 					{isLoggedIn}
 					{isStaff}
 					{gameId}
+					{isDev}
 					sort="score"
 					loadDepth={2}
 					on:vote={handleVote}
@@ -197,6 +208,7 @@
 					on:reveal={handleReveal}
 					on:edit={handleEdit}
 					on:show={handleShow}
+					on:convert={handleConvert}
 					bind:this={topCommentDiv}
 				/>
 			</div>
diff --git a/src/helper/fetchComments.ts b/src/helper/fetchComments.ts
index 75d6eaf1..32c3ac9c 100644
--- a/src/helper/fetchComments.ts
+++ b/src/helper/fetchComments.ts
@@ -17,6 +17,7 @@ export function frontendifyComments(
 		rating: c.rating,
 		author: c.author,
 		parent: c.parent,
+		isOld: c.isOld,
 		id: c.id,
 		content: c.content,
 		score: c.score,
diff --git a/src/migrations/2025-02-19-migrateComments.md b/src/migrations/2025-02-19-migrateComments.md
new file mode 100644
index 00000000..d073ed1a
--- /dev/null
+++ b/src/migrations/2025-02-19-migrateComments.md
@@ -0,0 +1,45 @@
+The comments model has been refactored to add nested comment support and remove developer replies.
+
+This code adds in the missing properties `type`, `rating`, `parent`, and `isOld`. Developer replies will be converted into comment replies.
+
+`use galaxy`
+
+```js
+db.comments.find({ isOld: { $exists: 0 }}).forEach((comment) => {
+  db.comments.updateOne({ id: comment.id }, {
+    type: "comment",
+    rating: -1,
+    parent: -1,
+    isOld: true
+  })
+  if (comment.devResponse !== undefined) {
+    const id = db.keyv.findOneAndUpdate(
+      { prop: "lastCommentId" },
+      { $inc: { val: 1 }},
+      { returnDocument: "after" }
+    )
+    const game = db.games.findOne({ id: comment.game })
+    if (game === null) {
+      console.warn("game not found?")
+      return
+    }
+    db.comments.insertOne({
+      game: comment.game,
+      author: comment.author,
+      id,
+      type: "comment",
+      rating: -1,
+      parent: comment.id,
+      // Don't let the user convert this into a review
+      isOld: false,
+      content: comment.devResponse,
+      up: [game.author],
+      down: [],
+      upCount: 1,
+      downCount: 0,
+      score: 1,
+      deleted: false
+    })
+  }
+})
+```
\ No newline at end of file
diff --git a/src/models/comment.ts b/src/models/comment.ts
index 7e3f72b5..0054d86d 100644
--- a/src/models/comment.ts
+++ b/src/models/comment.ts
@@ -2,7 +2,6 @@ import { Schema, model } from "mongoose";
 import type { IComment } from "~/types";
 import type { PaginateModel } from "mongoose";
 import paginate from "mongoose-paginate-v2";
-import { z } from "zod";
 
 const CommentSchema = new Schema<IComment>(
 	{
@@ -12,6 +11,7 @@ const CommentSchema = new Schema<IComment>(
 		type: String,
 		rating: Number,
 		parent: Number,
+		isOld: Boolean,
 		content: {
 			type: String,
 			minLength: 1,
@@ -47,28 +47,4 @@ CommentSchema.plugin(paginate);
 export const Comment = model<IComment, PaginateModel<IComment>>(
 	"Comments",
 	CommentSchema
-);
-
-export const commentSchema = z.object({ game: z.number().min(1).int(), parent: z.number().int() }).and(
-	z.object({
-		type: z.literal("comment"),
-		content: z
-			.string()
-			.min(3, "Minimum comment length is 3 characters")
-			.max(4096),
-	}).or(z.object({
-		type: z.literal("review"),
-		content: z
-			.string()
-			.min(10, "Minimum review length is 10 characters")
-			.max(4096)
-		}))
-)
-
-export const currentCommentSchema = z.object({
-	id: z.number().int(),
-	content: z
-		.string()
-		.min(1, "Reply must not be empty")
-		.max(4096, "Reply is too long"),
-});
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/src/pages/api/comments/convert.ts b/src/pages/api/comments/convert.ts
new file mode 100644
index 00000000..e21cb9bb
--- /dev/null
+++ b/src/pages/api/comments/convert.ts
@@ -0,0 +1,61 @@
+import { byLockdown, route } from "~/helper/route";
+import { Comment } from "~/models/comment";
+import { Game } from "~/models/game";
+import { Rating } from "~/models/rating";
+import { rdata, rmsg } from "~/helper/res";
+import { z } from "zod";
+
+const schema = z.object({
+	id: z.number().int(),
+});
+
+export const POST = route(
+	{
+		disabled: byLockdown(
+			"commentsLocked",
+			"The editing of comments is disabled at this moment."
+		),
+		auth: true,
+		notMuted: true,
+		notUnderage: true,
+		schema
+	},
+	async ({ locals }, { id: commentId }) => {
+		const { user } = locals.auth;
+
+		const comment = await Comment.findOne({
+			id: commentId,
+			deleted: false,
+		});
+		
+		// No check for parent / comment because isOld should only be applied to non-reply comments
+		if (!comment) return rmsg("Comment does not exist", 404);
+		if (comment.author !== user.id) return rmsg("You are not the author of this comment", 403)
+		if (!comment.isOld) return rmsg("This comment cannot be converted", 403)
+
+		const game = await Game.findOne({
+			id: comment.game
+		})
+		if (game.author === user.id) return rmsg("You can't submit a review on your own game", 403)
+
+		const has = await Comment.findOne({ author: user.id, game: game.id, type: "review", deleted: false })
+		if (has) return rmsg("Only one review is allowed", 403)
+		
+		const rate = await Rating.findOne({ author: user.id, game: game.id })
+		if (!rate) return rmsg("A game rating is required for a review", 403)
+
+		// Need to check length here
+		if (comment.content.length < 10) return rmsg("Minimum review length is 10 characters", 403)
+		const rating = rate.rating
+
+		comment.isOld = false
+		comment.type = "review"
+		comment.rating = rating
+		await comment.save()
+
+		return rdata({
+			msg: "success",
+			rating
+		}, 200);
+	}
+);
diff --git a/src/pages/api/comments/edit.ts b/src/pages/api/comments/edit.ts
index 78a29535..fd0ce448 100644
--- a/src/pages/api/comments/edit.ts
+++ b/src/pages/api/comments/edit.ts
@@ -1,11 +1,20 @@
 import { byLockdown, route } from "~/helper/route";
 import { rdata, rmsg } from "~/helper/res";
-import { currentCommentSchema, Comment } from "~/models/comment";
+import { Comment } from "~/models/comment";
+import { Game } from "~/models/game";
+import { Rating } from "~/models/rating";
 import { convertFormat } from "~/libgalaxy";
 import { env } from "~/helper/env";
 import { sendFancyWebhook } from "~/helper/sendWebhook";
-import { Game } from "~/models/game";
-import { Rating } from "~/models/rating";
+import { z } from "zod";
+
+const schema = z.object({
+	id: z.number().int(),
+	content: z
+		.string()
+		.min(1, "Comment must not be empty")
+		.max(4096, "Comment is too long"),
+});
 
 export const POST = route(
 	{
@@ -16,7 +25,7 @@ export const POST = route(
 		auth: true,
 		notMuted: true,
 		notUnderage: true,
-		schema: currentCommentSchema,
+		schema
 	},
 	async ({ locals }, { id: commentId, content }) => {
 		const { user } = locals.auth;
@@ -33,6 +42,10 @@ export const POST = route(
 			rating = rate.rating
 		}
 
+		// Need to check length here
+		const reqLength = comment.type === "review" ? 10 : 3
+		if (content.length < reqLength) return rmsg(`Minimum ${comment.type} length is ${reqLength} characters`, 403)
+
 		comment.content = content
 		comment.rating = rating
 		await comment.save();
diff --git a/src/pages/api/comments/new.ts b/src/pages/api/comments/new.ts
index 1c63f50d..09e3f71c 100644
--- a/src/pages/api/comments/new.ts
+++ b/src/pages/api/comments/new.ts
@@ -4,11 +4,27 @@ import { Comment } from "~/models/comment";
 import { Game } from "~/models/game";
 import { Message } from "~/models/message";
 import { Rating } from "~/models/rating";
-import { commentSchema } from "~/models/comment";
 import { convertFormat } from "~/libgalaxy";
 import { env } from "~/helper/env";
 import { keyv } from "~/models/keyv";
 import { sendFancyWebhook } from "~/helper/sendWebhook";
+import { z } from "zod";
+
+const schema = z.object({ game: z.number().min(1).int(), parent: z.number().int() }).and(
+	z.object({
+		type: z.literal("comment"),
+		content: z
+			.string()
+			.min(3, "Minimum comment length is 3 characters")
+			.max(4096),
+	}).or(z.object({
+		type: z.literal("review"),
+		content: z
+			.string()
+			.min(10, "Minimum review length is 10 characters")
+			.max(4096)
+		}))
+)
 
 export const POST = route(
 	{
@@ -19,7 +35,7 @@ export const POST = route(
 		auth: true,
 		notMuted: true,
 		notUnderage: true,
-		schema: commentSchema,
+		schema,
 	},
 	async ({ locals }, { game: gameId, content, type, parent }) => {
 		const { user } = locals.auth;
@@ -65,6 +81,7 @@ export const POST = route(
 			upCount: 1,
 			down: [],
 			score: 1,
+			isOld: false
 		});
 
 		game.comments++;
diff --git a/src/pages/comments/[gameId].astro b/src/pages/comments/[gameId].astro
index a8d510bd..de9c4543 100644
--- a/src/pages/comments/[gameId].astro
+++ b/src/pages/comments/[gameId].astro
@@ -25,7 +25,7 @@ else if (sortRaw === "top") sort = "score";
 // Ignore invalid sorts
 
 let parent = parseInt(Astro.url.searchParams.get("parent"))
-if (isNaN(parent)) parent = undefined
+if (isNaN(parent)) parent = -1
 
 const { user, loggedIn, needsVerification } = Astro.locals.auth;
 
@@ -37,13 +37,15 @@ if (!game) return new Response(null, { status: 404 });
 
 let thisComment = undefined
 let nextParent = ""
-if (parent !== undefined) {
+if (parent !== -1) {
 	const comment = await CommentModel.findOne({ id: parent })
 	if (!comment) return new Response(null, { status: 404 })
-	thisComment = (await attachNamesToComments(await frontendifyComments([comment], user?.id)))[0]
+	thisComment = (await attachNamesToComments(frontendifyComments([comment], user?.id)))[0]
 	if (thisComment.parent !== undefined) nextParent = `&parent=${thisComment.parent}`
 }
 
+const isDev = user?.id === game.author
+
 const { comments, pages } = await paginateComments(
 	gameNum,
 	sort,
@@ -86,6 +88,7 @@ if (import.meta.env.PROD) {
 				isStaff={hasStaffPerm(user?.modLevel, "mod")}
 				loadDepth={-1}
 				{sort}
+				{isDev}
 				client:only="svelte"
 			/>
 		) : null}
@@ -96,6 +99,7 @@ if (import.meta.env.PROD) {
 				loadDepth={2}
 				{comments}
 				{sort}
+				{isDev}
 				userId={user?.id}
 				isLoggedIn={loggedIn}
 				isStaff={hasStaffPerm(user?.modLevel, "mod")}
diff --git a/src/types.d.ts b/src/types.d.ts
index 5c53ac28..05e98ad5 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -10,6 +10,7 @@ interface IComment {
 
 	type: "comment" | "review"
 	rating: number;
+	isOld: boolean;
 
 	// the parent comment
 	parent: number;
@@ -42,6 +43,7 @@ interface IFrontendComment {
 	
 	type: "comment" | "review"
 	rating: number;
+	isOld: boolean;
 
 	createdAt: Date;
 }
-- 
GitLab


From 14947567a39da54f54fdd2f75c15faddcdc6b988 Mon Sep 17 00:00:00 2001
From: circle-gon <14517910-circle-gon@users.noreply.gitlab.com>
Date: Thu, 20 Feb 2025 13:11:55 -0500
Subject: [PATCH 3/5] do some formatting

---
 src/components/Comment.svelte      | 142 ++++++++++++++++-------------
 src/components/CommentList.svelte  |  68 +++++++-------
 src/components/GameComments.svelte |  32 ++++---
 src/helper/fetchComments.ts        |  35 +++----
 src/pages/api/comments/convert.ts  |  60 +++++++-----
 src/pages/api/comments/edit.ts     |  42 ++++++---
 src/pages/api/comments/fetch.ts    |  61 ++++++++-----
 src/pages/api/comments/new.ts      |  77 +++++++++-------
 src/pages/api/users/signup.ts      |   4 +-
 src/pages/comments/[gameId].astro  |  68 +++++++++-----
 src/types.d.ts                     |   6 +-
 11 files changed, 345 insertions(+), 250 deletions(-)

diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index a84c15cb..188cce34 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -39,7 +39,7 @@
 	import UserChip from "./UserChip.svelte";
 	import { createEventDispatcher } from "svelte";
 	import { comment as md } from "~/helper/markdown";
-	import { onMount } from "svelte"
+	import { onMount } from "svelte";
 
 	export let gameId: number;
 	export let comment: INamedFrontendComment;
@@ -47,7 +47,7 @@
 	export let isLoggedIn: boolean;
 	export let isStaff: boolean;
 	export let loadDepth: number;
-	export let sort: "createdAt" | "score"
+	export let sort: "createdAt" | "score";
 	export let isDev: boolean;
 
 	const dispatcher = createEventDispatcher<{
@@ -59,17 +59,17 @@
 		convert: ConvertDetail;
 	}>();
 
-	let editing = false
-	let trueReplying = false
-	let thisComment = ""
-	let realReply = ""
-	let isLimited = false
-	let seenReplies: INamedFrontendComment[] | undefined 
-	let commentList: CommentList | undefined = undefined
+	let editing = false;
+	let trueReplying = false;
+	let thisComment = "";
+	let realReply = "";
+	let isLimited = false;
+	let seenReplies: INamedFrontendComment[] | undefined;
+	let commentList: CommentList | undefined = undefined;
 
 	// using export let turns it into a prop instead of an exported property
 	export function getCommentListInstance() {
-		return commentList
+		return commentList;
 	}
 
 	function cvote(id: number, vote: 1 | 0 | -1) {
@@ -124,26 +124,26 @@
 
 	function cedit(id: number) {
 		return async () => {
-			const content = thisComment
+			const content = thisComment;
 			const res = await post("/api/comments/edit", {
 				id,
-				content
-			})
+				content,
+			});
 
 			if (res._resCode === 201) {
-				const { rating } = res
-				comment.content = content
-				comment.rating = rating
-				editing = false
-				thisComment = ""
+				const { rating } = res;
+				comment.content = content;
+				comment.rating = rating;
+				editing = false;
+				thisComment = "";
 
 				dispatcher("edit", {
 					id,
 					content,
-					rating
-				})
+					rating,
+				});
 			}
-		}
+		};
 	}
 
 	function ctruereply(id: number) {
@@ -152,44 +152,44 @@
 				game: gameId,
 				parent: id,
 				type: "comment",
-				content: realReply
-			})
+				content: realReply,
+			});
 
 			if (result._resCode === 201) {
-				if (seenReplies === undefined) await loadReplies()
-				seenReplies = [...seenReplies, result.content]
-				trueReplying = false
-				comment.showMore = true // Don't hide your own response
-				realReply = ""
+				if (seenReplies === undefined) await loadReplies();
+				seenReplies = [...seenReplies, result.content];
+				trueReplying = false;
+				comment.showMore = true; // Don't hide your own response
+				realReply = "";
 			}
-		}
+		};
 	}
 
 	function cshow() {
-		comment.showMore = true
+		comment.showMore = true;
 
 		dispatcher("show", {
-			id: comment.id
-		})
+			id: comment.id,
+		});
 	}
 
 	function cconvert(id: number) {
 		return async () => {
 			const res = await post("/api/comments/convert", {
-				id
-			})
+				id,
+			});
 
 			if (res._resCode === 200) {
-				comment.isOld = false
-				comment.type = "review"
-				comment.rating = res.rating
+				comment.isOld = false;
+				comment.type = "review";
+				comment.rating = res.rating;
 
 				dispatcher("convert", {
 					id,
-					rating: res.rating
-				})
+					rating: res.rating,
+				});
 			}
-		}
+		};
 	}
 
 	async function loadReplies() {
@@ -197,26 +197,26 @@
 			sort,
 			id: comment.id,
 			game: gameId,
-			filter: "all"
-		})
-		seenReplies = resp.result
-		isLimited = resp.isLimited
+			filter: "all",
+		});
+		seenReplies = resp.result;
+		isLimited = resp.isLimited;
 	}
 
 	function processEditClick() {
-		trueReplying = false
-		editing = true
-		thisComment = comment.content
+		trueReplying = false;
+		editing = true;
+		thisComment = comment.content;
 	}
 
 	function processTrueReplyClick() {
-		editing = false
-		trueReplying = true
-		realReply = ""
+		editing = false;
+		trueReplying = true;
+		realReply = "";
 	}
 
-	comment.showMore = loadDepth > 0
-	if (loadDepth > -1) onMount(() => loadReplies())
+	comment.showMore = loadDepth > 0;
+	if (loadDepth > -1) onMount(() => loadReplies());
 </script>
 
 <div class="comment">
@@ -235,13 +235,21 @@
 		/>
 		<!-- TODO someone else can probably come up with a better UI scheme than this -->
 		{#if comment.type === "review"}
-			<span aria-label="{comment.rating} star{comment.rating > 1 ? "s" : ""}">
+			<span
+				aria-label="{comment.rating} star{comment.rating > 1
+					? 's'
+					: ''}"
+			>
 				<!-- I love whitespace -->
 				{#each Array(comment.rating).fill(undefined) as _}<Icon
-					icon="material-symbols:star-rounded" width="16" inline 
-				/>{/each}{#each Array(5 - comment.rating).fill(undefined) as _}<Icon
-					icon="material-symbols:star-outline-rounded" width="16" inline
-				/>{/each}
+						icon="material-symbols:star-rounded"
+						width="16"
+						inline
+					/>{/each}{#each Array(5 - comment.rating).fill(undefined) as _}<Icon
+						icon="material-symbols:star-outline-rounded"
+						width="16"
+						inline
+					/>{/each}
 			</span>
 		{/if}
 		<div class="floatright">
@@ -271,12 +279,18 @@
 			</button>
 			{#if isLoggedIn && !comment.deleted}
 				<Dropdown openLeft>
-					<button on:click={() => processTrueReplyClick()}>reply</button>
+					<button on:click={() => processTrueReplyClick()}
+						>reply</button
+					>
 					{#if comment.author === userId}
 						{#if comment.isOld && !isDev}
-							<button on:click={cconvert(comment.id)}>convert to review</button>
+							<button on:click={cconvert(comment.id)}
+								>convert to review</button
+							>
 						{/if}
-						<button on:click={() => processEditClick()}>edit comment</button>
+						<button on:click={() => processEditClick()}
+							>edit comment</button
+						>
 					{/if}
 					{#if comment.author !== userId}
 						<button on:click={() => report("comment", comment)}
@@ -328,7 +342,7 @@
 	{/if}
 	{#if seenReplies && comment.showMore}
 		<div class="replies">
-			<CommentList 
+			<CommentList
 				comments={seenReplies}
 				{sort}
 				loadDepth={loadDepth > 0 ? loadDepth - 1 : 2}
@@ -347,13 +361,15 @@
 			/>
 			{#if isLimited}
 				<a
-					href="/comments/{gameId}?sort={sort === "createdAt" ? "time" : "top"}&parent={comment.id}"
+					href="/comments/{gameId}?sort={sort === 'createdAt'
+						? 'time'
+						: 'top'}&parent={comment.id}"
 					class="button"
 					target="_blank"
 					rel="noreferrer"
 				>
 					read all replies
-				</a>		
+				</a>
 			{/if}
 		</div>
 	{:else if comment.showMore}
diff --git a/src/components/CommentList.svelte b/src/components/CommentList.svelte
index 60c71636..16535a18 100644
--- a/src/components/CommentList.svelte
+++ b/src/components/CommentList.svelte
@@ -15,74 +15,80 @@
 	export let isLoggedIn: boolean;
 	export let isStaff: boolean;
 	export let loadDepth: number;
-	export let sort: "createdAt" | "score"
-	export let isDev: boolean
+	export let sort: "createdAt" | "score";
+	export let isDev: boolean;
 
 	// This has to be top 10 of the most inefficient code ever
-	const comps: Comment[] = []
+	const comps: Comment[] = [];
 
 	export function doVote(voteDetail: VoteDetail) {
-		const { id, vote, score } = voteDetail
+		const { id, vote, score } = voteDetail;
 		comments = comments.map(c => {
 			if (c.id !== id) return c;
 			c.yourVote = vote;
 			c.score = score;
 			return c;
 		});
-		for (const comp of comps) comp.getCommentListInstance()?.doVote(voteDetail)
+		for (const comp of comps)
+			comp.getCommentListInstance()?.doVote(voteDetail);
 	}
 
 	export function doDelete(deleteDetail: DeleteDetail) {
-		const { id } = deleteDetail
+		const { id } = deleteDetail;
 		comments = comments.map(c => {
 			if (c.id !== id) return c;
 			c.deleted = true;
 			return c;
 		});
-		for (const comp of comps) comp.getCommentListInstance()?.doDelete(deleteDetail)
+		for (const comp of comps)
+			comp.getCommentListInstance()?.doDelete(deleteDetail);
 	}
 
 	export function doReveal(revealDetail: RevealDetail) {
-		const { id } = revealDetail
+		const { id } = revealDetail;
 		comments = comments.map(c => {
 			if (c.id !== id) return c;
 			c.hidden = false;
 			return c;
 		});
-		for (const comp of comps) comp.getCommentListInstance()?.doReveal(revealDetail)
+		for (const comp of comps)
+			comp.getCommentListInstance()?.doReveal(revealDetail);
 	}
 
 	export function doEdit(editDetail: EditDetail) {
-		const { id, content, rating } = editDetail
+		const { id, content, rating } = editDetail;
 		comments = comments.map(c => {
-			if (c.id !== id) return c
-			c.content = content
-			c.rating = rating
-			return c
-		})
-		for (const comp of comps) comp.getCommentListInstance()?.doEdit(editDetail)
+			if (c.id !== id) return c;
+			c.content = content;
+			c.rating = rating;
+			return c;
+		});
+		for (const comp of comps)
+			comp.getCommentListInstance()?.doEdit(editDetail);
 	}
-	
+
 	export function doShow(showDetail: ShowDetail) {
-		const { id } = showDetail
+		const { id } = showDetail;
 		comments = comments.map(c => {
-			if (c.id !== id) return c
-			c.showMore = true
-			return c
-		})
-		for (const comp of comps) comp.getCommentListInstance()?.doShow(showDetail)
+			if (c.id !== id) return c;
+			c.showMore = true;
+			return c;
+		});
+		for (const comp of comps)
+			comp.getCommentListInstance()?.doShow(showDetail);
 	}
 
 	export function doConvert(convertDetail: ConvertDetail) {
-		const { id, rating } = convertDetail
+		const { id, rating } = convertDetail;
 		comments = comments.map(c => {
-			if (c.id !== id) return c
-			c.isOld = false
-			c.type = "review"
-			c.rating = rating
-			return c
-		})
-		for (const comp of comps) comp.getCommentListInstance()?.doShow(convertDetail)
+			if (c.id !== id) return c;
+			c.isOld = false;
+			c.type = "review";
+			c.rating = rating;
+			return c;
+		});
+		for (const comp of comps)
+			comp.getCommentListInstance()?.doShow(convertDetail);
 	}
 </script>
 
diff --git a/src/components/GameComments.svelte b/src/components/GameComments.svelte
index e7f6b58d..9df5e7b3 100644
--- a/src/components/GameComments.svelte
+++ b/src/components/GameComments.svelte
@@ -18,7 +18,7 @@
 	export let isDev: boolean;
 	export let isLoggedIn: boolean;
 	export let isStaff: boolean;
-	export let filter: "all" | "review" | "comment"
+	export let filter: "all" | "review" | "comment";
 
 	let composingComment = "";
 	let newCommentDiv: CommentList;
@@ -26,8 +26,8 @@
 
 	let newComments: INamedFrontendComment[] = [];
 	let topComments: INamedFrontendComment[] = [];
-	let loaded = false
-	$: name = `${filter === "all" ? "response" : filter}s`
+	let loaded = false;
+	$: name = `${filter === "all" ? "response" : filter}s`;
 
 	$: single =
 		newComments.length < 5 ||
@@ -40,7 +40,7 @@
 			game: gameId,
 			content: composingComment,
 			type,
-			parent: -1
+			parent: -1,
 		});
 
 		if (res._resCode === 201) {
@@ -88,29 +88,29 @@
 	}
 
 	async function getComments(filter: "all" | "comment" | "review") {
-		loaded = false
+		loaded = false;
 
 		const newComm = await post("/api/comments/fetch", {
 			sort: "createdAt",
 			id: -1,
 			game: gameId,
-			filter
-		})
+			filter,
+		});
 
 		const topComm = await post("/api/comments/fetch", {
 			sort: "score",
 			id: -1,
 			game: gameId,
-			filter
-		})
+			filter,
+		});
 
-		newComments = newComm.result
-		topComments = topComm.result
-		loaded = true
+		newComments = newComm.result;
+		topComments = topComm.result;
+		loaded = true;
 	}
 
 	// Don't run on server
-	$: if (typeof window !== "undefined") getComments(filter)
+	$: if (typeof window !== "undefined") getComments(filter);
 </script>
 
 <div class="container">
@@ -131,7 +131,9 @@
 				</button>
 				<button
 					on:click={() => publishComment("review")}
-					disabled={isDev || !isLoggedIn || composingComment.length === 0}
+					disabled={isDev ||
+						!isLoggedIn ||
+						composingComment.length === 0}
 				>
 					submit review
 				</button>
@@ -241,7 +243,7 @@
 		outline: 1px solid #7770;
 		border-radius: 3px;
 	}
-	
+
 	#compose-comment :global(.markdown-editor) {
 		margin-top: 12px;
 	}
diff --git a/src/helper/fetchComments.ts b/src/helper/fetchComments.ts
index 32c3ac9c..1ae8272e 100644
--- a/src/helper/fetchComments.ts
+++ b/src/helper/fetchComments.ts
@@ -48,36 +48,39 @@ export async function idToComments(
 	filter: "all" | "comment" | "review",
 	parent: number,
 	sortDev: boolean,
-	userId?: number,
+	userId?: number
 ) {
 	// Wow I don't like that
 	const looky = {
 		game: gameId,
 		parent,
 		deleted: false,
-	}
-	if (filter !== "all") (looky as any).type = filter
+	};
+	if (filter !== "all") (looky as any).type = filter;
 
-	let comments: IComment[] = []
+	let comments: IComment[] = [];
 	if (sortDev) {
 		// TODO there is probably a better way for this
-		const devId = (await Game.findOne({ id: gameId })).author
+		const devId = (await Game.findOne({ id: gameId })).author;
 		comments = await Comment.find({
 			...looky,
-			author: devId
+			author: devId,
 		})
 			.sort({ [sort]: -1 })
 			.limit(5);
 		if (comments.length < 5) {
-			comments.push(...await Comment.find({
-				...looky,
-				author: {
-					$not: {
-						$eq: devId
-					}
-				}
-			}).sort({ [sort]: -1 })
-			.limit(5 - comments.length))
+			comments.push(
+				...(await Comment.find({
+					...looky,
+					author: {
+						$not: {
+							$eq: devId,
+						},
+					},
+				})
+					.sort({ [sort]: -1 })
+					.limit(5 - comments.length))
+			);
 		}
 	} else {
 		comments = await Comment.find(looky)
@@ -128,7 +131,7 @@ export async function paginateComments(
 	userId?: number
 ) {
 	const paginated = await Comment.paginate(
-		{ game: gameId, deleted: false, parent},
+		{ game: gameId, deleted: false, parent },
 		{ sort: "-" + sort, page, limit: 20 }
 	);
 
diff --git a/src/pages/api/comments/convert.ts b/src/pages/api/comments/convert.ts
index e21cb9bb..bac7193c 100644
--- a/src/pages/api/comments/convert.ts
+++ b/src/pages/api/comments/convert.ts
@@ -18,7 +18,7 @@ export const POST = route(
 		auth: true,
 		notMuted: true,
 		notUnderage: true,
-		schema
+		schema,
 	},
 	async ({ locals }, { id: commentId }) => {
 		const { user } = locals.auth;
@@ -27,35 +27,47 @@ export const POST = route(
 			id: commentId,
 			deleted: false,
 		});
-		
+
 		// No check for parent / comment because isOld should only be applied to non-reply comments
 		if (!comment) return rmsg("Comment does not exist", 404);
-		if (comment.author !== user.id) return rmsg("You are not the author of this comment", 403)
-		if (!comment.isOld) return rmsg("This comment cannot be converted", 403)
+		if (comment.author !== user.id)
+			return rmsg("You are not the author of this comment", 403);
+		if (!comment.isOld)
+			return rmsg("This comment cannot be converted", 403);
 
 		const game = await Game.findOne({
-			id: comment.game
-		})
-		if (game.author === user.id) return rmsg("You can't submit a review on your own game", 403)
+			id: comment.game,
+		});
+		if (game.author === user.id)
+			return rmsg("You can't submit a review on your own game", 403);
 
-		const has = await Comment.findOne({ author: user.id, game: game.id, type: "review", deleted: false })
-		if (has) return rmsg("Only one review is allowed", 403)
-		
-		const rate = await Rating.findOne({ author: user.id, game: game.id })
-		if (!rate) return rmsg("A game rating is required for a review", 403)
+		const has = await Comment.findOne({
+			author: user.id,
+			game: game.id,
+			type: "review",
+			deleted: false,
+		});
+		if (has) return rmsg("Only one review is allowed", 403);
+
+		const rate = await Rating.findOne({ author: user.id, game: game.id });
+		if (!rate) return rmsg("A game rating is required for a review", 403);
 
 		// Need to check length here
-		if (comment.content.length < 10) return rmsg("Minimum review length is 10 characters", 403)
-		const rating = rate.rating
-
-		comment.isOld = false
-		comment.type = "review"
-		comment.rating = rating
-		await comment.save()
-
-		return rdata({
-			msg: "success",
-			rating
-		}, 200);
+		if (comment.content.length < 10)
+			return rmsg("Minimum review length is 10 characters", 403);
+		const rating = rate.rating;
+
+		comment.isOld = false;
+		comment.type = "review";
+		comment.rating = rating;
+		await comment.save();
+
+		return rdata(
+			{
+				msg: "success",
+				rating,
+			},
+			200
+		);
 	}
 );
diff --git a/src/pages/api/comments/edit.ts b/src/pages/api/comments/edit.ts
index fd0ce448..c6b9c016 100644
--- a/src/pages/api/comments/edit.ts
+++ b/src/pages/api/comments/edit.ts
@@ -25,33 +25,45 @@ export const POST = route(
 		auth: true,
 		notMuted: true,
 		notUnderage: true,
-		schema
+		schema,
 	},
 	async ({ locals }, { id: commentId, content }) => {
 		const { user } = locals.auth;
 
-		const comment = await Comment.findOne({ id: commentId, deleted: false })
-		if (!comment) return rmsg("Comment not found", 404)
-		if (comment.author !== user.id) return rmsg("You are not the author of this comment", 403)
+		const comment = await Comment.findOne({
+			id: commentId,
+			deleted: false,
+		});
+		if (!comment) return rmsg("Comment not found", 404);
+		if (comment.author !== user.id)
+			return rmsg("You are not the author of this comment", 403);
 
-		const prevContent = comment.content
-		let rating = -1
+		const prevContent = comment.content;
+		let rating = -1;
 		if (comment.type === "review") {
-			const rate = await Rating.findOne({ author: user.id, game: comment.game })
-			if (!rate) return rmsg("A game rating is required for a review", 403)
-			rating = rate.rating
+			const rate = await Rating.findOne({
+				author: user.id,
+				game: comment.game,
+			});
+			if (!rate)
+				return rmsg("A game rating is required for a review", 403);
+			rating = rate.rating;
 		}
 
 		// Need to check length here
-		const reqLength = comment.type === "review" ? 10 : 3
-		if (content.length < reqLength) return rmsg(`Minimum ${comment.type} length is ${reqLength} characters`, 403)
+		const reqLength = comment.type === "review" ? 10 : 3;
+		if (content.length < reqLength)
+			return rmsg(
+				`Minimum ${comment.type} length is ${reqLength} characters`,
+				403
+			);
 
-		comment.content = content
-		comment.rating = rating
+		comment.content = content;
+		comment.rating = rating;
 		await comment.save();
 
 		// this should always be non-null right
-		const game = await Game.findOne({ id: comment.game })
+		const game = await Game.findOne({ id: comment.game });
 		if (env.STAFF_COMMENT_WEBHOOK !== undefined && game !== null)
 			await sendFancyWebhook(env.STAFF_COMMENT_WEBHOOK, {
 				embeds: [
@@ -81,7 +93,7 @@ currently:
 		return rdata(
 			{
 				message: "success",
-				rating
+				rating,
 			},
 			201
 		);
diff --git a/src/pages/api/comments/fetch.ts b/src/pages/api/comments/fetch.ts
index ec405f58..ee43f50b 100644
--- a/src/pages/api/comments/fetch.ts
+++ b/src/pages/api/comments/fetch.ts
@@ -9,41 +9,52 @@ const schema = z.object({
 	sort: z.union([z.literal("createdAt"), z.literal("score")]),
 	game: z.number().int().min(1),
 	id: z.number().int(),
-	filter: z.union([z.literal("all"), z.literal("comment"), z.literal("review")])
-})
-	
+	filter: z.union([
+		z.literal("all"),
+		z.literal("comment"),
+		z.literal("review"),
+	]),
+});
+
 // This probably does not need to be POST
 export const POST = route(
 	{
-		schema
+		schema,
 	},
 	async ({ locals }, { game, id, sort, filter }) => {
-		const gameDB = await Game.findOne({ id: game })
-		if (!gameDB) return rmsg("Game does not exist", 404)
+		const gameDB = await Game.findOne({ id: game });
+		if (!gameDB) return rmsg("Game does not exist", 404);
 
 		if (id !== -1) {
-			const comment = await Comment.findOne({ id, deleted: false })
-			if (!comment) return rmsg("Comment not found", 404)
+			const comment = await Comment.findOne({ id, deleted: false });
+			if (!comment) return rmsg("Comment not found", 404);
 		}
 
-		const userId = locals.auth.user?.id
-		const isLimited = (await Comment.countDocuments({
-			game,
-			parent: id,
-			deleted: false,
-		})) > 5
+		const userId = locals.auth.user?.id;
+		const isLimited =
+			(await Comment.countDocuments({
+				game,
+				parent: id,
+				deleted: false,
+			})) > 5;
 
 		// Double await seems cursed
-		const result = (await attachNamesToComments(await idToComments(game, sort, filter, id, id !== -1, userId)))
-			.map(i => ({
-				...i,
-				// Date does not work here :(
-				createdAt: +i.createdAt
-			}))
-		return rdata({
-			message: "success",
-			result,
-			isLimited
-		}, 200)
+		const result = (
+			await attachNamesToComments(
+				await idToComments(game, sort, filter, id, id !== -1, userId)
+			)
+		).map(i => ({
+			...i,
+			// Date does not work here :(
+			createdAt: +i.createdAt,
+		}));
+		return rdata(
+			{
+				message: "success",
+				result,
+				isLimited,
+			},
+			200
+		);
 	}
 );
diff --git a/src/pages/api/comments/new.ts b/src/pages/api/comments/new.ts
index 09e3f71c..83c0d8a0 100644
--- a/src/pages/api/comments/new.ts
+++ b/src/pages/api/comments/new.ts
@@ -10,21 +10,27 @@ import { keyv } from "~/models/keyv";
 import { sendFancyWebhook } from "~/helper/sendWebhook";
 import { z } from "zod";
 
-const schema = z.object({ game: z.number().min(1).int(), parent: z.number().int() }).and(
-	z.object({
-		type: z.literal("comment"),
-		content: z
-			.string()
-			.min(3, "Minimum comment length is 3 characters")
-			.max(4096),
-	}).or(z.object({
-		type: z.literal("review"),
-		content: z
-			.string()
-			.min(10, "Minimum review length is 10 characters")
-			.max(4096)
-		}))
-)
+const schema = z
+	.object({ game: z.number().min(1).int(), parent: z.number().int() })
+	.and(
+		z
+			.object({
+				type: z.literal("comment"),
+				content: z
+					.string()
+					.min(3, "Minimum comment length is 3 characters")
+					.max(4096),
+			})
+			.or(
+				z.object({
+					type: z.literal("review"),
+					content: z
+						.string()
+						.min(10, "Minimum review length is 10 characters")
+						.max(4096),
+				})
+			)
+	);
 
 export const POST = route(
 	{
@@ -48,24 +54,33 @@ export const POST = route(
 
 		const author = user.id;
 		const lastCommentId = await keyv.id("lastCommentId");
-		let rating = -1
+		let rating = -1;
 
 		if (type === "review") {
-			if (parent !== -1) return rmsg("You can't reply with a review", 403)
-			if (game.author === user.id) return rmsg("You can't submit a review on your own game", 403)
-
-			const has = await Comment.findOne({ author, game: gameId, type, deleted: false })
-			if (has) return rmsg("Only one review is allowed", 403)
+			if (parent !== -1)
+				return rmsg("You can't reply with a review", 403);
+			if (game.author === user.id)
+				return rmsg("You can't submit a review on your own game", 403);
+
+			const has = await Comment.findOne({
+				author,
+				game: gameId,
+				type,
+				deleted: false,
+			});
+			if (has) return rmsg("Only one review is allowed", 403);
 
-			const rate = await Rating.findOne({ author, game: gameId })
-			if (!rate) return rmsg("A game rating is required for a review", 403)
-			rating = rate.rating
+			const rate = await Rating.findOne({ author, game: gameId });
+			if (!rate)
+				return rmsg("A game rating is required for a review", 403);
+			rating = rate.rating;
 		}
 
-		let parentComment = undefined
+		let parentComment = undefined;
 		if (parent !== -1) {
-			parentComment = await Comment.findOne({ id: parent })
-			if (!parentComment) return rmsg("Can't reply to a nonexistent comment", 404)
+			parentComment = await Comment.findOne({ id: parent });
+			if (!parentComment)
+				return rmsg("Can't reply to a nonexistent comment", 404);
 		}
 
 		// TODO limit comments per user per game (10?)
@@ -81,7 +96,7 @@ export const POST = route(
 			upCount: 1,
 			down: [],
 			score: 1,
-			isOld: false
+			isOld: false,
 		});
 
 		game.comments++;
@@ -100,9 +115,9 @@ Your comment:
 > ${parentComment.content}
  
 ${user.name}'${user.name.endsWith("s") ? "" : "s"} reply:
-> ${content}`
-			})
-			await message.save()
+> ${content}`,
+			});
+			await message.save();
 		}
 
 		if (env.STAFF_COMMENT_WEBHOOK !== undefined)
diff --git a/src/pages/api/users/signup.ts b/src/pages/api/users/signup.ts
index e11e0f79..5013f9d9 100644
--- a/src/pages/api/users/signup.ts
+++ b/src/pages/api/users/signup.ts
@@ -27,7 +27,7 @@ export const POST = route(
 		),
 		schema,
 	},
-	async ({ request, cookies }, req) => {
+	async ({ request, clientAddress, cookies }, req) => {
 		cookies.set("birth-info", req.year + "," + req.month, {
 			maxAge: 60 * 60 * 24 * 365 * 2,
 			path: "/",
@@ -38,7 +38,7 @@ export const POST = route(
 		formData.append("response", req.captcha);
 		formData.append(
 			"remoteip",
-			request.headers.get("CF-Connecting-IP")
+			request.headers.get("CF-Connecting-IP") ?? clientAddress
 		);
 
 		const url = "https://challenges.cloudflare.com/turnstile/v0/siteverify";
diff --git a/src/pages/comments/[gameId].astro b/src/pages/comments/[gameId].astro
index de9c4543..dac5ee74 100644
--- a/src/pages/comments/[gameId].astro
+++ b/src/pages/comments/[gameId].astro
@@ -1,6 +1,10 @@
 ---
-import { attachNamesToComments, frontendifyComments, paginateComments } from "~/helper/fetchComments";
-import Comment from "~/components/Comment.svelte"
+import {
+	attachNamesToComments,
+	frontendifyComments,
+	paginateComments,
+} from "~/helper/fetchComments";
+import Comment from "~/components/Comment.svelte";
 import CommentList from "~/components/CommentList.svelte";
 import { Comment as CommentModel } from "~/models/comment";
 import { Game } from "~/models/game";
@@ -24,8 +28,8 @@ if (sortRaw === "time") sort = "createdAt";
 else if (sortRaw === "top") sort = "score";
 // Ignore invalid sorts
 
-let parent = parseInt(Astro.url.searchParams.get("parent"))
-if (isNaN(parent)) parent = -1
+let parent = parseInt(Astro.url.searchParams.get("parent"));
+if (isNaN(parent)) parent = -1;
 
 const { user, loggedIn, needsVerification } = Astro.locals.auth;
 
@@ -35,16 +39,19 @@ if (isNaN(gameNum)) return new Response(null, { status: 404 });
 const game = await Game.findOne({ id: gameId });
 if (!game) return new Response(null, { status: 404 });
 
-let thisComment = undefined
-let nextParent = ""
+let thisComment = undefined;
+let nextParent = "";
 if (parent !== -1) {
-	const comment = await CommentModel.findOne({ id: parent })
-	if (!comment) return new Response(null, { status: 404 })
-	thisComment = (await attachNamesToComments(frontendifyComments([comment], user?.id)))[0]
-	if (thisComment.parent !== undefined) nextParent = `&parent=${thisComment.parent}`
+	const comment = await CommentModel.findOne({ id: parent });
+	if (!comment) return new Response(null, { status: 404 });
+	thisComment = (
+		await attachNamesToComments(frontendifyComments([comment], user?.id))
+	)[0];
+	if (thisComment.parent !== undefined)
+		nextParent = `&parent=${thisComment.parent}`;
 }
 
-const isDev = user?.id === game.author
+const isDev = user?.id === game.author;
 
 const { comments, pages } = await paginateComments(
 	gameNum,
@@ -75,23 +82,34 @@ if (import.meta.env.PROD) {
 			<option value="top">most votes</option>
 			<option value="time"> most recent</option>
 		</select>
-		{parent !== undefined ? <a href={`/comments/${gameId}?sort=${sortRaw}${nextParent}`} class="button">go up</a> : null}
+		{
+			parent !== undefined ? (
+				<a
+					href={`/comments/${gameId}?sort=${sortRaw}${nextParent}`}
+					class="button"
+				>
+					go up
+				</a>
+			) : null
+		}
 		<a href={`/play/${game.id}`} class="button">go back</a>
 		<br />
 		<br />
-		{parent !== undefined ? (
-			<Comment 
-				gameId={gameNum}
-				comment={thisComment}
-				userId={user?.id}
-				isLoggedIn={loggedIn}
-				isStaff={hasStaffPerm(user?.modLevel, "mod")}
-				loadDepth={-1}
-				{sort}
-				{isDev}
-				client:only="svelte"
-			/>
-		) : null}
+		{
+			parent !== undefined ? (
+				<Comment
+					gameId={gameNum}
+					comment={thisComment}
+					userId={user?.id}
+					isLoggedIn={loggedIn}
+					isStaff={hasStaffPerm(user?.modLevel, "mod")}
+					loadDepth={-1}
+					{sort}
+					{isDev}
+					client:only="svelte"
+				/>
+			) : null
+		}
 		<div style={parent !== undefined ? "margin-left: 20px" : ""}>
 			<CommentList
 				client:load
diff --git a/src/types.d.ts b/src/types.d.ts
index 05e98ad5..e3f08f94 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -8,7 +8,7 @@ interface IComment {
 	// user ID
 	author: number;
 
-	type: "comment" | "review"
+	type: "comment" | "review";
 	rating: number;
 	isOld: boolean;
 
@@ -40,8 +40,8 @@ interface IFrontendComment {
 	hidden: boolean;
 	deleted: boolean;
 	showMore: boolean;
-	
-	type: "comment" | "review"
+
+	type: "comment" | "review";
 	rating: number;
 	isOld: boolean;
 
-- 
GitLab


From bfbccc55077b88f41f85226653a902dff55f3a0b Mon Sep 17 00:00:00 2001
From: circle-gon <14517910-circle-gon@users.noreply.gitlab.com>
Date: Thu, 20 Feb 2025 13:11:55 -0500
Subject: [PATCH 4/5] touchup (i forgot the reply dispatcher)

---
 src/components/Comment.svelte                 | 31 ++++++++++++-------
 src/components/CommentList.svelte             | 18 +++++++++++
 src/components/GameComments.svelte            |  9 ++++++
 .../admin/panels/CommentFeed.svelte           |  1 -
 src/helper/fetchComments.ts                   |  1 +
 src/pages/api/comments/new.ts                 |  1 +
 src/pages/comments/[gameId].astro             |  5 ++-
 src/types.d.ts                                |  2 ++
 8 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index 188cce34..999594e6 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -27,6 +27,11 @@
 		id: number;
 		rating: number;
 	}
+
+	export interface ReplyDetail {
+		id: number;
+		comment: INamedFrontendComment;
+	}
 </script>
 
 <script lang="ts">
@@ -57,14 +62,13 @@
 		edit: EditDetail;
 		show: ShowDetail;
 		convert: ConvertDetail;
+		reply: ReplyDetail;
 	}>();
 
 	let editing = false;
 	let trueReplying = false;
 	let thisComment = "";
 	let realReply = "";
-	let isLimited = false;
-	let seenReplies: INamedFrontendComment[] | undefined;
 	let commentList: CommentList | undefined = undefined;
 
 	// using export let turns it into a prop instead of an exported property
@@ -156,11 +160,15 @@
 			});
 
 			if (result._resCode === 201) {
-				if (seenReplies === undefined) await loadReplies();
-				seenReplies = [...seenReplies, result.content];
+				if (comment.seenReplies === undefined) await loadReplies();
+				// Don't update replies here because it will be updated when the event dispatching happens
 				trueReplying = false;
-				comment.showMore = true; // Don't hide your own response
 				realReply = "";
+
+				dispatcher("reply", {
+					id,
+					comment: result.content,
+				});
 			}
 		};
 	}
@@ -199,8 +207,8 @@
 			game: gameId,
 			filter: "all",
 		});
-		seenReplies = resp.result;
-		isLimited = resp.isLimited;
+		comment.seenReplies = resp.result;
+		comment.isLimited = resp.isLimited;
 	}
 
 	function processEditClick() {
@@ -340,10 +348,10 @@
 		<button id="postreply" on:click={ctruereply(comment.id)}>reply</button>
 		<button on:click={() => (trueReplying = false)}>cancel</button>
 	{/if}
-	{#if seenReplies && comment.showMore}
+	{#if comment.seenReplies && comment.showMore}
 		<div class="replies">
 			<CommentList
-				comments={seenReplies}
+				comments={comment.seenReplies}
 				{sort}
 				loadDepth={loadDepth > 0 ? loadDepth - 1 : 2}
 				{gameId}
@@ -357,9 +365,10 @@
 				on:edit
 				on:show
 				on:convert
+				on:reply
 				bind:this={commentList}
 			/>
-			{#if isLimited}
+			{#if comment.isLimited}
 				<a
 					href="/comments/{gameId}?sort={sort === 'createdAt'
 						? 'time'
@@ -374,7 +383,7 @@
 		</div>
 	{:else if comment.showMore}
 		<span class="unimportant">loading...</span>
-	{:else if loadDepth > -1 && seenReplies && seenReplies.length > 0}
+	{:else if loadDepth > -1 && comment.seenReplies && comment.seenReplies.length > 0}
 		<button on:click={() => cshow()}>Show more</button>
 	{/if}
 </div>
diff --git a/src/components/CommentList.svelte b/src/components/CommentList.svelte
index 16535a18..035eb16b 100644
--- a/src/components/CommentList.svelte
+++ b/src/components/CommentList.svelte
@@ -3,6 +3,7 @@
 		type ConvertDetail,
 		type DeleteDetail,
 		type EditDetail,
+		type ReplyDetail,
 		type RevealDetail,
 		type ShowDetail,
 		type VoteDetail,
@@ -90,6 +91,22 @@
 		for (const comp of comps)
 			comp.getCommentListInstance()?.doShow(convertDetail);
 	}
+
+	export function doReply(replyDetail: ReplyDetail) {
+		const { id, comment } = replyDetail;
+		comments = comments.map(c => {
+			if (c.id !== id) return c;
+			c.showMore = true;
+			c.seenReplies.unshift(comment);
+			if (c.seenReplies.length > 5) {
+				c.seenReplies.pop();
+				c.isLimited = true;
+			}
+			return c;
+		});
+		for (const comp of comps)
+			comp.getCommentListInstance()?.doReply(replyDetail);
+	}
 </script>
 
 {#each comments as comment, count (comment.id)}
@@ -108,6 +125,7 @@
 		on:edit
 		on:show
 		on:convert
+		on:reply
 		bind:this={comps[count]}
 	/>
 {/each}
diff --git a/src/components/GameComments.svelte b/src/components/GameComments.svelte
index 9df5e7b3..38d874a4 100644
--- a/src/components/GameComments.svelte
+++ b/src/components/GameComments.svelte
@@ -3,6 +3,7 @@
 		ConvertDetail,
 		DeleteDetail,
 		EditDetail,
+		ReplyDetail,
 		RevealDetail,
 		ShowDetail,
 		VoteDetail,
@@ -87,6 +88,11 @@
 		topCommentDiv?.doConvert(detail);
 	}
 
+	function handleReply({ detail }: CustomEvent<ReplyDetail>) {
+		newCommentDiv.doReply(detail);
+		topCommentDiv?.doReply(detail);
+	}
+
 	async function getComments(filter: "all" | "comment" | "review") {
 		loaded = false;
 
@@ -168,6 +174,7 @@
 					on:edit={handleEdit}
 					on:show={handleShow}
 					on:convert={handleConvert}
+					on:reply={handleReply}
 					bind:this={newCommentDiv}
 				/>
 			</div>
@@ -190,6 +197,7 @@
 					on:edit={handleEdit}
 					on:show={handleShow}
 					on:convert={handleConvert}
+					on:reply={handleReply}
 					bind:this={newCommentDiv}
 				/>
 			</div>
@@ -211,6 +219,7 @@
 					on:edit={handleEdit}
 					on:show={handleShow}
 					on:convert={handleConvert}
+					on:reply={handleReply}
 					bind:this={topCommentDiv}
 				/>
 			</div>
diff --git a/src/components/admin/panels/CommentFeed.svelte b/src/components/admin/panels/CommentFeed.svelte
index 47fc5c9d..137c7aa5 100644
--- a/src/components/admin/panels/CommentFeed.svelte
+++ b/src/components/admin/panels/CommentFeed.svelte
@@ -96,7 +96,6 @@
 				score: { name: "score", type: "score" },
 				deleted: { name: "deleted" },
 				content: { name: "content" },
-				response: { name: "developer response" },
 			}}
 			onitemclick={x => {
 				const comment = data.find(y => y.id == x.id);
diff --git a/src/helper/fetchComments.ts b/src/helper/fetchComments.ts
index 1ae8272e..eda2994c 100644
--- a/src/helper/fetchComments.ts
+++ b/src/helper/fetchComments.ts
@@ -22,6 +22,7 @@ export function frontendifyComments(
 		content: c.content,
 		score: c.score,
 		showMore: false,
+		isLimited: false,
 		// TODO: magic number :(
 		hidden: c.score <= -5,
 		deleted: c.deleted,
diff --git a/src/pages/api/comments/new.ts b/src/pages/api/comments/new.ts
index 83c0d8a0..6a890a9e 100644
--- a/src/pages/api/comments/new.ts
+++ b/src/pages/api/comments/new.ts
@@ -152,6 +152,7 @@ ${user.name}'${user.name.endsWith("s") ? "" : "s"} reply:
 					score: 1,
 					hidden: false,
 					deleted: false,
+					isLimited: false,
 					createdAt: +comment.createdAt,
 					yourVote: 1,
 					type,
diff --git a/src/pages/comments/[gameId].astro b/src/pages/comments/[gameId].astro
index dac5ee74..58913504 100644
--- a/src/pages/comments/[gameId].astro
+++ b/src/pages/comments/[gameId].astro
@@ -47,8 +47,7 @@ if (parent !== -1) {
 	thisComment = (
 		await attachNamesToComments(frontendifyComments([comment], user?.id))
 	)[0];
-	if (thisComment.parent !== undefined)
-		nextParent = `&parent=${thisComment.parent}`;
+	if (thisComment.parent !== -1) nextParent = `&parent=${thisComment.parent}`;
 }
 
 const isDev = user?.id === game.author;
@@ -83,7 +82,7 @@ if (import.meta.env.PROD) {
 			<option value="time"> most recent</option>
 		</select>
 		{
-			parent !== undefined ? (
+			parent !== -1 ? (
 				<a
 					href={`/comments/${gameId}?sort=${sortRaw}${nextParent}`}
 					class="button"
diff --git a/src/types.d.ts b/src/types.d.ts
index e3f08f94..12951d8e 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -40,6 +40,8 @@ interface IFrontendComment {
 	hidden: boolean;
 	deleted: boolean;
 	showMore: boolean;
+	comments?: INamedFrontendComment[];
+	isLimited: boolean;
 
 	type: "comment" | "review";
 	rating: number;
-- 
GitLab


From 58649783bd4c3f4aa4b5010f4b5cf3e8b2dccfb7 Mon Sep 17 00:00:00 2001
From: circle-gon <14517910-circle-gon@users.noreply.gitlab.com>
Date: Thu, 20 Feb 2025 14:22:33 -0500
Subject: [PATCH 5/5] alignment touchup and comment page fix

---
 src/components/Comment.svelte     | 3 ++-
 src/components/Header.astro       | 1 +
 src/pages/comments/[gameId].astro | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index 999594e6..354c6c65 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -391,7 +391,8 @@
 <style>
 	.replies {
 		margin-top: 10px;
-		margin-left: 20px;
+		/* Align with the user pfp so it looks nicer */
+		margin-left: 26px;
 	}
 
 	.comment:not(:last-child) {
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 6c7b56b7..2f4dc51a 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -142,6 +142,7 @@ const xpToNext = getXPToNextLevel(level);
 								<h3>galaxy forums</h3>
 								<div class="top-list">
 									<a href="/forum/category/galaxy">galaxy discussions</a>
+									<!-- Should this be removed -->
 									<a href="/forum/category/games">game forums</a>
 									<a href="/forum/category/support">help & support</a>
 									<a href="/forum/category/forum-games">forum games</a>
diff --git a/src/pages/comments/[gameId].astro b/src/pages/comments/[gameId].astro
index 58913504..a59684be 100644
--- a/src/pages/comments/[gameId].astro
+++ b/src/pages/comments/[gameId].astro
@@ -44,6 +44,7 @@ let nextParent = "";
 if (parent !== -1) {
 	const comment = await CommentModel.findOne({ id: parent });
 	if (!comment) return new Response(null, { status: 404 });
+	// This is probably cursed
 	thisComment = (
 		await attachNamesToComments(frontendifyComments([comment], user?.id))
 	)[0];
@@ -95,7 +96,7 @@ if (import.meta.env.PROD) {
 		<br />
 		<br />
 		{
-			parent !== undefined ? (
+			parent !== -1 ? (
 				<Comment
 					gameId={gameNum}
 					comment={thisComment}
@@ -109,7 +110,7 @@ if (import.meta.env.PROD) {
 				/>
 			) : null
 		}
-		<div style={parent !== undefined ? "margin-left: 20px" : ""}>
+		<div style={parent !== -1 ? "margin-left: 26px" : ""}>
 			<CommentList
 				client:load
 				gameId={gameNum}
-- 
GitLab