From 2aa7f5bfe0e86867e7126d097f54a96b300a0833 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Fri, 9 Aug 2024 08:08:55 +0200
Subject: [PATCH 1/6] opcode 8

---
 assets/schemas.json                           | Bin 23267068 -> 23428652 bytes
 src/gateway/opcodes/RequestGuildMembers.ts    | 100 ++++++++++++++++--
 src/util/interfaces/Event.ts                  |  10 +-
 src/util/schemas/RequestGuildMembersSchema.ts |  35 ++++++
 src/util/schemas/index.ts                     |   7 +-
 5 files changed, 138 insertions(+), 14 deletions(-)
 create mode 100644 src/util/schemas/RequestGuildMembersSchema.ts

diff --git a/assets/schemas.json b/assets/schemas.json
index 5226bbade87cac4040e598053c272c32a2445bb6..6e8f2f48dfe5166d80de9008f3e61b2fae25f76e 100644
GIT binary patch
delta 1481
zcmW;BcU;tU0LJmx4-|xR9D3k!;Blx3DpN(A2qK^$3Jx5IgFMT^M1@LIgYzjeHBj=t
zl@@AKrLwYYYifJ%rH0Wi)3VG#<@5B%`}4>1v~SvIYiZwVtA&LC1fl~vA_&3ggb;+n
zhR*1MuIL6k!q6Q(;6OMc&=XEX!i6YAqZizWfd{eZjXvm$IP^n263`z5Fc67ILNZd2
ziZl$uU<^Szh9U#QFdQQ=5~DC0nHYmCWMeFHFb=uMLq5i10t!%wi73J(Ohz$EFa=XF
z4bxGI8JLM#n2j>bK{@7P9_C{KDsTlB!iz<?5?5g{uEsU{E7$qMyvu65E2{Hr7FRAT
z@-C_HE;rVq6o+XIh|4gZE%^n3{LSX*Tu+lH+hGpbL+$2-ak@-ndYZf0b1L3)nhSf*
z#WYo|2{-$qv+U+{i!<0%mAfKLgDoh=c>IAb(|R<j#CS5-Cp4$#MOsP!kIjvaL@UFb
z*=2K^wPmrcrs5E{$qJ}0HOV<vNPSyjE!7=pEA+LjsQ39RX$f6ROR0*M(Q?vXO*M2K
zT~9aAN?JuX(rQ{mYw0Gcr8@G_Is)BHw@^LZO6%!1+CUp=6WvY?)JU6Y3pLRlw3Ym1
z=uWze?xt<Do$jG~shM`rPTEEH(f#xQJxCAH!?c_B&|YexN9a*{jP}vv^aMRg`{^lq
znhwx2^ejC`&(jO^BE3Wh=@7k4hv^6%rB~=xdW~MEH|R}zi{7Sp=v{h`-lq@fL;8q5
zrcdZo`iwrOFX&79ijL87IzeAkE1jfosExj*@92B_fqtZ)=x6$cex+0N8=a;z^gI1Q
zXX#J+i_X#Cbe=BIMY=@o^bh?@|84O3tp-v8lt86}(oqRgf|X86h!U#Ul+H>QrK{3S
zu`6Lpccq8oP{Nf6rKjRlA{Cbsr9>;e6t@zic$8SBx6()HtHde&lz1gU>8}h>1}ce4
zl9H^XD5*-CGDsP$3{ldRp-P4_Oc}0>P(~`Fl+jA2GDgW#vX!w)jxtWkRq~X4WxO&$
zDNqWPiAs?&Ntvt^D<#SlWvVhwnXZ&7GnARiEM>M*rp!^wmAT41Wxle&I_UFPSgWco
E18oYTwg3PC

delta 1318
zcmW;Gd3Xo}9LDiy46~Wrm}53O%r%?2*=&Zf*_itn#w<zC<A|b^)!tIs8kO9-PjpS?
zs8n=1La5}XqEkhvslIQ2e7?``ulM<FtXv*aSymcStN>L}RRyY=s;h>AR8zqUQ7wh4
zw(6*^>Z!gOsG%AuOpVn<;cBX8YOWTFP)kKBO05*F7{w}1trf2}YO8i?uMSF3M<psr
zos_K3>Y}ddrta#Yp6aFEN>Qr%C{5|=s|@v1e+^Kk25OM9l&!(aQLct)sPZ&S!!<%9
zHA<s3Mq@Qj<CU)ony5)C&}2<fp{A-xH)xt})O6jX8Jlk|d2De-=uFJQY|Ozen2UM1
z6}MqN7T|W=frYpecVQ8VaX0Qk350ub9~R?&Jb(wW1f?j$Lny~mEW^Wi1dn1l{ND<!
z#44=D8mz@StjFVc0#D*8JdJ1YES|&jcmXfsC2YV(Y{JWU1+U^Yyp9TN#v6DOZ($3z
zVjH&OZM=hbu><eneSCnO*o6=A5kAHz_!OUEH}+sJ_Th8v#{nF~7dV8&ID#+n6~4w%
ze1l^+juSYEQ#g$?IE!=m7T@7}oW}+HfFJP_e#S5O6&LXve#alUgv<C7S8x^A@E86@
zC9dNi{JW$gG@u+#6{o5b=u~s6J2jjjr=}C^ggCXF{|9ROs^ipk>N)kD22Mk#krU=L
zcA7ZhPE)6u)7)v{L^v&-NGHl^<wQF%POKB>w07d1Hcnfoozvdw;3PO5okS<e>Et9k
zot-XDSErlP-Ra@<bb2|xofIe4>Eon1=}uoK!|CVrcLq3_&Om37ljUSPgPj~F*BRmr
yb@H5H&TwahGtwF5jCRI2W1Vr%cqiYP;7oKTIR(ySXNptkObysk5n2?mVAg-y4-oJG

diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts
index 304d4b39..68c7b7f4 100644
--- a/src/gateway/opcodes/RequestGuildMembers.ts
+++ b/src/gateway/opcodes/RequestGuildMembers.ts
@@ -1,23 +1,111 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { WebSocket } from "@spacebar/gateway";
+import {
+	getPermission,
+	GuildMembersChunkEvent,
+	Member,
+	Presence,
+	RequestGuildMembersSchema,
+} from "@spacebar/util";
+import {
+	WebSocket,
+	Payload,
+	OPCODES,
+	Send,
+} from "@spacebar/gateway";
+import { check } from "./instanceOf";
+import { FindManyOptions, In, Like } from "typeorm";
 
-export function onRequestGuildMembers(this: WebSocket) {
-	// return this.close(CLOSECODES.Unknown_error);
+export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
+	// TODO: check data
+	check.call(this, RequestGuildMembersSchema, d);
+
+	const { guild_id, query, presences, nonce } =
+		d as RequestGuildMembersSchema;
+	let { limit, user_ids } =
+		d as RequestGuildMembersSchema;
+
+	if ("query" in d && (!limit || Number.isNaN(limit))) throw new Error("\"query\" requires \"limit\" to be set");
+	if ("query" in d && user_ids) throw new Error("\"query\" and \"user_ids\" are mutually exclusive");
+	if (user_ids && !Array.isArray(user_ids)) user_ids = [user_ids];
+	user_ids = user_ids as string[] | undefined;
+
+	// TODO: Configurable limit?
+	if ((query || (user_ids && user_ids.length > 0)) && (!limit || limit > 100)) limit = 100;
+
+	const permissions = await getPermission(this.user_id, guild_id);
+	permissions.hasThrow("VIEW_CHANNEL");
+
+	const whereQuery: any = {};
+	if (query) {
+		whereQuery.user = {
+			username: Like(query + "%")
+		};
+	} else if (user_ids && user_ids.length > 0) {
+		whereQuery.id = In(user_ids);
+	}
+
+	const memberFind: FindManyOptions = {
+		where: {
+			...whereQuery,
+			guild_id
+		},
+		relations: ["user", "roles", ...(presences ? ["presence"] : [])],
+	};
+	if (limit) memberFind.take = Math.abs(Number(limit || 100));
+	const members = await Member.find(memberFind);
+
+	const baseData = {
+		guild_id,
+		nonce,
+	}
+
+	const chunks: GuildMembersChunkEvent["data"][] = [];
+	while (members.length > 0) {
+		const chunk = members.splice(0, 1000);
+
+		const presenceList: Presence[] = [];
+		if (presences) {
+			for await (const member of chunk) {
+				presenceList.push(member.presence);
+				delete member.presence;
+			}
+		}
+
+		chunks.push({
+			...baseData,
+			members: chunk.map(member => member.toPublicMember()),
+			presences: presences ? presenceList : undefined,
+			chunk_index: chunks.length,
+			chunk_count: Math.ceil(members.length / 1000),
+		});
+	}
+
+	if (user_ids && user_ids.length > 0)
+		chunks[0].not_found = user_ids.filter(id => !members.some(member => member.user.id == id));
+
+	chunks.forEach((chunk) => {
+		Send(this, {
+			op: OPCODES.Dispatch,
+			s: this.sequence++,
+			t: "GUILD_MEMBERS_CHUNK",
+			d: chunk,
+		});
+	});
 }
diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts
index 98a64e94..a31e2263 100644
--- a/src/util/interfaces/Event.ts
+++ b/src/util/interfaces/Event.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -280,8 +280,8 @@ export interface GuildMembersChunkEvent extends Event {
 		members: PublicMember[];
 		chunk_index: number;
 		chunk_count: number;
-		not_found: string[];
-		presences: Presence[];
+		not_found?: string[];
+		presences?: Presence[];
 		nonce?: string;
 	};
 }
diff --git a/src/util/schemas/RequestGuildMembersSchema.ts b/src/util/schemas/RequestGuildMembersSchema.ts
new file mode 100644
index 00000000..01ba4f2e
--- /dev/null
+++ b/src/util/schemas/RequestGuildMembersSchema.ts
@@ -0,0 +1,35 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export interface RequestGuildMembersSchema {
+	guild_id: string;
+	query?: string;
+	limit?: number;
+	presences?: boolean;
+	user_ids?: string | string[];
+	nonce?: string;
+}
+
+export const RequestGuildMembersSchema = {
+	guild_id: String,
+	$query: String,
+	$limit: Number,
+	$presences: Boolean,
+	$user_ids: [] as string | string[],
+	$nonce: String,
+};
diff --git a/src/util/schemas/index.ts b/src/util/schemas/index.ts
index 4812b535..62199dfb 100644
--- a/src/util/schemas/index.ts
+++ b/src/util/schemas/index.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -58,6 +58,7 @@ export * from "./PurgeSchema";
 export * from "./RegisterSchema";
 export * from "./RelationshipPostSchema";
 export * from "./RelationshipPutSchema";
+export * from "./RequestGuildMembersSchema";
 export * from "./RoleModifySchema";
 export * from "./RolePositionUpdateSchema";
 export * from "./SelectProtocolSchema";

From f8a21eff0cdaf8e5ce81e50385c5b05f4a4e7dd6 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sat, 10 Aug 2024 20:59:05 +0200
Subject: [PATCH 2/6] Fix chunk_count & not_found

---
 src/gateway/opcodes/RequestGuildMembers.ts | 44 ++++++++++++----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts
index 68c7b7f4..8934377d 100644
--- a/src/gateway/opcodes/RequestGuildMembers.ts
+++ b/src/gateway/opcodes/RequestGuildMembers.ts
@@ -23,12 +23,7 @@ import {
 	Presence,
 	RequestGuildMembersSchema,
 } from "@spacebar/util";
-import {
-	WebSocket,
-	Payload,
-	OPCODES,
-	Send,
-} from "@spacebar/gateway";
+import { WebSocket, Payload, OPCODES, Send } from "@spacebar/gateway";
 import { check } from "./instanceOf";
 import { FindManyOptions, In, Like } from "typeorm";
 
@@ -38,24 +33,26 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
 
 	const { guild_id, query, presences, nonce } =
 		d as RequestGuildMembersSchema;
-	let { limit, user_ids } =
-		d as RequestGuildMembersSchema;
+	let { limit, user_ids } = d as RequestGuildMembersSchema;
 
-	if ("query" in d && (!limit || Number.isNaN(limit))) throw new Error("\"query\" requires \"limit\" to be set");
-	if ("query" in d && user_ids) throw new Error("\"query\" and \"user_ids\" are mutually exclusive");
+	if ("query" in d && (!limit || Number.isNaN(limit)))
+		throw new Error('"query" requires "limit" to be set');
+	if ("query" in d && user_ids)
+		throw new Error('"query" and "user_ids" are mutually exclusive');
 	if (user_ids && !Array.isArray(user_ids)) user_ids = [user_ids];
 	user_ids = user_ids as string[] | undefined;
 
 	// TODO: Configurable limit?
-	if ((query || (user_ids && user_ids.length > 0)) && (!limit || limit > 100)) limit = 100;
+	if ((query || (user_ids && user_ids.length > 0)) && (!limit || limit > 100))
+		limit = 100;
 
 	const permissions = await getPermission(this.user_id, guild_id);
 	permissions.hasThrow("VIEW_CHANNEL");
 
-	const whereQuery: any = {};
+	const whereQuery: FindManyOptions["where"] = {};
 	if (query) {
 		whereQuery.user = {
-			username: Like(query + "%")
+			username: Like(query + "%"),
 		};
 	} else if (user_ids && user_ids.length > 0) {
 		whereQuery.id = In(user_ids);
@@ -64,9 +61,9 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
 	const memberFind: FindManyOptions = {
 		where: {
 			...whereQuery,
-			guild_id
+			guild_id,
 		},
-		relations: ["user", "roles", ...(presences ? ["presence"] : [])],
+		relations: ["roles", ...(presences ? ["presence"] : [])],
 	};
 	if (limit) memberFind.take = Math.abs(Number(limit || 100));
 	const members = await Member.find(memberFind);
@@ -74,7 +71,15 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
 	const baseData = {
 		guild_id,
 		nonce,
-	}
+	};
+
+	const chunkCount = Math.ceil(members.length / 1000);
+
+	let notFound: string[] = [];
+	if (user_ids && user_ids.length > 0)
+		notFound = user_ids.filter(
+			(id) => !members.some((member) => member.id == id),
+		);
 
 	const chunks: GuildMembersChunkEvent["data"][] = [];
 	while (members.length > 0) {
@@ -90,15 +95,14 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
 
 		chunks.push({
 			...baseData,
-			members: chunk.map(member => member.toPublicMember()),
+			members: chunk.map((member) => member.toPublicMember()),
 			presences: presences ? presenceList : undefined,
 			chunk_index: chunks.length,
-			chunk_count: Math.ceil(members.length / 1000),
+			chunk_count: chunkCount,
 		});
 	}
 
-	if (user_ids && user_ids.length > 0)
-		chunks[0].not_found = user_ids.filter(id => !members.some(member => member.user.id == id));
+	if (notFound.length > 0) chunks[0].not_found = notFound;
 
 	chunks.forEach((chunk) => {
 		Send(this, {

From 20b2843680ad1d72b561db5ae536c790015e90cd Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sat, 10 Aug 2024 22:10:20 +0200
Subject: [PATCH 3/6] Make profile bio max length configurable

---
 src/api/routes/users/#id/profile.ts           | 20 ++++++++++++++++---
 src/api/routes/users/@me/index.ts             | 18 ++++++++++++++---
 .../subconfigurations/limits/UserLimits.ts    |  7 ++++---
 src/util/entities/User.ts                     |  8 ++++----
 src/util/schemas/UserModifySchema.ts          |  9 +++------
 5 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts
index db0922d6..44271cad 100644
--- a/src/api/routes/users/#id/profile.ts
+++ b/src/api/routes/users/#id/profile.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -19,6 +19,8 @@
 import { route } from "@spacebar/api";
 import {
 	Badge,
+	Config,
+	FieldErrors,
 	Member,
 	PrivateUserProjection,
 	User,
@@ -136,6 +138,18 @@ router.patch(
 			select: [...PrivateUserProjection, "data"],
 		});
 
+		if (body.bio) {
+			const { maxBio } = Config.get().limits.user;
+			if (body.bio.length > maxBio) {
+				throw FieldErrors({
+					bio: {
+						code: "BIO_INVALID",
+						message: `Bio must be less than ${maxBio} in length`,
+					},
+				});
+			}
+		}
+
 		user.assign(body);
 		await user.save();
 
diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index cddc3a08..5caf0d11 100644
--- a/src/api/routes/users/@me/index.ts
+++ b/src/api/routes/users/@me/index.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -189,6 +189,18 @@ router.patch(
 			}
 		}
 
+		if (body.bio) {
+			const { maxBio } = Config.get().limits.user;
+			if (body.bio.length > maxBio) {
+				throw FieldErrors({
+					bio: {
+						code: "BIO_INVALID",
+						message: `Bio must be less than ${maxBio} in length`,
+					},
+				});
+			}
+		}
+
 		user.assign(body);
 		user.validate();
 		await user.save();
diff --git a/src/util/config/types/subconfigurations/limits/UserLimits.ts b/src/util/config/types/subconfigurations/limits/UserLimits.ts
index 8f9b1a97..afe9afbe 100644
--- a/src/util/config/types/subconfigurations/limits/UserLimits.ts
+++ b/src/util/config/types/subconfigurations/limits/UserLimits.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -20,4 +20,5 @@ export class UserLimits {
 	maxGuilds: number = 1048576;
 	maxUsername: number = 32;
 	maxFriends: number = 5000;
+	maxBio: number = 190;
 }
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index c929039e..b299bcfc 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -130,7 +130,7 @@ export class User extends BaseClass {
 	bot: boolean = false; // if user is bot
 
 	@Column()
-	bio: string = ""; // short description of the user (max 190 chars -> should be configurable)
+	bio: string = ""; // short description of the user
 
 	@Column()
 	system: boolean = false; // shouldn't be used, the api sends this field type true, if the generated message comes from a system generated author
diff --git a/src/util/schemas/UserModifySchema.ts b/src/util/schemas/UserModifySchema.ts
index e155b9af..4be6ad43 100644
--- a/src/util/schemas/UserModifySchema.ts
+++ b/src/util/schemas/UserModifySchema.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -23,9 +23,6 @@ export interface UserModifySchema {
 	 */
 	username?: string;
 	avatar?: string | null;
-	/**
-	 * @maxLength 1024
-	 */
 	bio?: string;
 	accent_color?: number;
 	banner?: string | null;

From 5900d4fdacb89e0f6312ae2b3f52267f142f1b65 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sat, 10 Aug 2024 22:23:02 +0200
Subject: [PATCH 4/6] Update schema for bio max length config

---
 assets/schemas.json | Bin 23267068 -> 23291081 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/schemas.json b/assets/schemas.json
index 5226bbade87cac4040e598053c272c32a2445bb6..70a65862aa56151cd2364f5639bf6515ee96b3eb 100644
GIT binary patch
delta 8586
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

delta 3986
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
BHnji%


From ea3047890bf06dfe8b2de470f5b17ca9f40c1921 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sun, 11 Aug 2024 06:40:42 +0200
Subject: [PATCH 5/6] Fix issues with requesting presences

---
 src/gateway/events/Close.ts                     | 10 +++++-----
 src/gateway/opcodes/Identify.ts                 | 12 ++++++------
 src/gateway/opcodes/LazyRequest.ts              |  8 ++++----
 src/gateway/opcodes/PresenceUpdate.ts           | 15 ++++++++++-----
 src/gateway/opcodes/RequestGuildMembers.ts      | 17 +++++++++++++----
 src/util/entities/Session.ts                    | 12 +++++++-----
 src/util/interfaces/Status.ts                   |  9 +++++----
 .../mariadb/1723347738541-client_status.ts      | 17 +++++++++++++++++
 .../mysql/1723347738541-client_status.ts        | 17 +++++++++++++++++
 .../postgres/1723347738541-client_status.ts     | 17 +++++++++++++++++
 10 files changed, 101 insertions(+), 33 deletions(-)
 create mode 100644 src/util/migration/mariadb/1723347738541-client_status.ts
 create mode 100644 src/util/migration/mysql/1723347738541-client_status.ts
 create mode 100644 src/util/migration/postgres/1723347738541-client_status.ts

diff --git a/src/gateway/events/Close.ts b/src/gateway/events/Close.ts
index 16f6b188..311ed32a 100644
--- a/src/gateway/events/Close.ts
+++ b/src/gateway/events/Close.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -50,7 +50,7 @@ export async function Close(this: WebSocket, code: number, reason: Buffer) {
 		} as SessionsReplace);
 		const session = sessions.first() || {
 			activities: [],
-			client_info: {},
+			client_status: {},
 			status: "offline",
 		};
 
@@ -68,7 +68,7 @@ export async function Close(this: WebSocket, code: number, reason: Buffer) {
 			data: {
 				user: userOrId,
 				activities: session.activities,
-				client_status: session?.client_info,
+				client_status: session?.client_status,
 				status: session.status,
 			},
 		} as PresenceUpdateEvent);
diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts
index 41f9f83d..e30a1ee0 100644
--- a/src/gateway/opcodes/Identify.ts
+++ b/src/gateway/opcodes/Identify.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -122,8 +122,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 		session_id: this.session_id,
 		status: identify.presence?.status || "online",
 		client_info: {
-			client: identify.properties?.$device,
-			os: identify.properties?.os,
+			client: identify.properties?.device || identify.properties?.$device,
+			os: identify.properties?.os || identify.properties?.$os,
 			version: 0,
 		},
 		activities: identify.presence?.activities, // TODO: validation
@@ -372,7 +372,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 			data: {
 				user: user.toPublicUser(),
 				activities: session.activities,
-				client_status: session.client_info,
+				client_status: session.client_status,
 				status: session.status,
 			},
 		} as PresenceUpdateEvent),
diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts
index 3c21b708..27e9b00a 100644
--- a/src/gateway/opcodes/LazyRequest.ts
+++ b/src/gateway/opcodes/LazyRequest.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -248,7 +248,7 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
 					d: {
 						user: user,
 						activities: session?.activities || [],
-						client_status: session?.client_info,
+						client_status: session?.client_status,
 						status: session?.status || "offline",
 					} as Presence,
 				});
diff --git a/src/gateway/opcodes/PresenceUpdate.ts b/src/gateway/opcodes/PresenceUpdate.ts
index 03736263..f84da120 100644
--- a/src/gateway/opcodes/PresenceUpdate.ts
+++ b/src/gateway/opcodes/PresenceUpdate.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -35,14 +35,19 @@ export async function onPresenceUpdate(this: WebSocket, { d }: Payload) {
 		{ status: presence.status, activities: presence.activities },
 	);
 
+	const session = await Session.findOneOrFail({
+		select: ["client_status"],
+		where: { session_id: this.session_id },
+	});
+
 	await emitEvent({
 		event: "PRESENCE_UPDATE",
 		user_id: this.user_id,
 		data: {
 			user: await User.getPublicUser(this.user_id),
-			activities: presence.activities,
-			client_status: {}, // TODO:
 			status: presence.status,
+			activities: presence.activities,
+			client_status: session.client_status,
 		},
 	} as PresenceUpdateEvent);
 }
diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts
index 8934377d..9a966752 100644
--- a/src/gateway/opcodes/RequestGuildMembers.ts
+++ b/src/gateway/opcodes/RequestGuildMembers.ts
@@ -22,6 +22,7 @@ import {
 	Member,
 	Presence,
 	RequestGuildMembersSchema,
+	Session,
 } from "@spacebar/util";
 import { WebSocket, Payload, OPCODES, Send } from "@spacebar/gateway";
 import { check } from "./instanceOf";
@@ -63,7 +64,7 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
 			...whereQuery,
 			guild_id,
 		},
-		relations: ["roles", ...(presences ? ["presence"] : [])],
+		relations: ["users", "roles"],
 	};
 	if (limit) memberFind.take = Math.abs(Number(limit || 100));
 	const members = await Member.find(memberFind);
@@ -83,13 +84,21 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
 
 	const chunks: GuildMembersChunkEvent["data"][] = [];
 	while (members.length > 0) {
-		const chunk = members.splice(0, 1000);
+		const chunk: Member[] = members.splice(0, 1000);
 
 		const presenceList: Presence[] = [];
 		if (presences) {
 			for await (const member of chunk) {
-				presenceList.push(member.presence);
-				delete member.presence;
+				const session = await Session.findOne({
+					where: { user_id: member.id },
+				});
+				if (session)
+					presenceList.push({
+						user: member.user.toPublicUser(),
+						status: session.status,
+						activities: session.activities,
+						client_status: session.client_status,
+					});
 			}
 		}
 
diff --git a/src/util/entities/Session.ts b/src/util/entities/Session.ts
index 6c6f7caa..15f8faa2 100644
--- a/src/util/entities/Session.ts
+++ b/src/util/entities/Session.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -19,7 +19,7 @@
 import { User } from "./User";
 import { BaseClass } from "./BaseClass";
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { Status } from "../interfaces/Status";
+import { ClientStatus, Status } from "../interfaces/Status";
 import { Activity } from "../interfaces/Activity";
 
 //TODO we need to remove all sessions on server start because if the server crashes without closing websockets it won't delete them
@@ -43,7 +43,6 @@ export class Session extends BaseClass {
 	@Column({ type: "simple-json", nullable: true })
 	activities: Activity[];
 
-	// TODO client_status
 	@Column({ type: "simple-json", select: false })
 	client_info: {
 		client: string;
@@ -51,6 +50,9 @@ export class Session extends BaseClass {
 		version: number;
 	};
 
+	@Column({ type: "simple-json" })
+	client_status: ClientStatus;
+
 	@Column({ nullable: false, type: "varchar" })
 	status: Status; //TODO enum
 }
diff --git a/src/util/interfaces/Status.ts b/src/util/interfaces/Status.ts
index 407a813e..0f2f4e13 100644
--- a/src/util/interfaces/Status.ts
+++ b/src/util/interfaces/Status.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -21,5 +21,6 @@ export type Status = "idle" | "dnd" | "online" | "offline" | "invisible";
 export interface ClientStatus {
 	desktop?: string; // e.g. Windows/Linux/Mac
 	mobile?: string; // e.g. iOS/Android
-	web?: string; // e.g. browser, bot account
+	web?: string; // e.g. browser, bot account, unknown
+	embedded?: string; // e.g. embedded
 }
diff --git a/src/util/migration/mariadb/1723347738541-client_status.ts b/src/util/migration/mariadb/1723347738541-client_status.ts
new file mode 100644
index 00000000..0e02c45e
--- /dev/null
+++ b/src/util/migration/mariadb/1723347738541-client_status.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class client_status1723347738541 implements MigrationInterface {
+	name = "client_status1723347738541";
+
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE `sessions` ADD `client_status` text NULL AFTER `client_info`",
+		);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE `sessions` DROP COLUMN `client_status`",
+		);
+	}
+}
diff --git a/src/util/migration/mysql/1723347738541-client_status.ts b/src/util/migration/mysql/1723347738541-client_status.ts
new file mode 100644
index 00000000..0e02c45e
--- /dev/null
+++ b/src/util/migration/mysql/1723347738541-client_status.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class client_status1723347738541 implements MigrationInterface {
+	name = "client_status1723347738541";
+
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE `sessions` ADD `client_status` text NULL AFTER `client_info`",
+		);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE `sessions` DROP COLUMN `client_status`",
+		);
+	}
+}
diff --git a/src/util/migration/postgres/1723347738541-client_status.ts b/src/util/migration/postgres/1723347738541-client_status.ts
new file mode 100644
index 00000000..35d9391f
--- /dev/null
+++ b/src/util/migration/postgres/1723347738541-client_status.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class client_status1723347738541 implements MigrationInterface {
+	name = "client_status1723347738541";
+
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE sessions ADD client_status text NULL",
+		);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE sessions DROP COLUMN client_status",
+		);
+	}
+}

From df794695ffd208f5607829ea64b2430f1ba56b00 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:43:19 +0200
Subject: [PATCH 6/6] Icon for discovery categories & fix "primary_only"

---
 src/api/routes/discovery.ts                       | 10 +++++-----
 src/util/entities/Categories.ts                   | 10 +++++++---
 .../1723577874393-discoveryCategoryIcon.ts        | 15 +++++++++++++++
 .../mysql/1723577874393-discoveryCategoryIcon.ts  | 15 +++++++++++++++
 .../1723577874393-discoveryCategoryIcon.ts        | 13 +++++++++++++
 5 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 src/util/migration/mariadb/1723577874393-discoveryCategoryIcon.ts
 create mode 100644 src/util/migration/mysql/1723577874393-discoveryCategoryIcon.ts
 create mode 100644 src/util/migration/postgres/1723577874393-discoveryCategoryIcon.ts

diff --git a/src/api/routes/discovery.ts b/src/api/routes/discovery.ts
index a045c191..dd3cc15d 100644
--- a/src/api/routes/discovery.ts
+++ b/src/api/routes/discovery.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -39,8 +39,8 @@ router.get(
 		const { primary_only } = req.query;
 
 		const out = primary_only
-			? await Categories.find()
-			: await Categories.find({ where: { is_primary: true } });
+			? await Categories.find({ where: { is_primary: true } })
+			: await Categories.find();
 
 		res.send(out);
 	},
diff --git a/src/util/entities/Categories.ts b/src/util/entities/Categories.ts
index bba1bfa7..13d969de 100644
--- a/src/util/entities/Categories.ts
+++ b/src/util/entities/Categories.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -46,6 +46,10 @@ export class Categories extends BaseClassWithoutId {
 	@Column({ type: "simple-json" })
 	localizations: string;
 
+	// Whether to show the category prominently (e.g. in a sidebar) instead of only secondary (e.g. in search results)
 	@Column({ nullable: true })
 	is_primary: boolean;
+
+	@Column({ nullable: true })
+	icon?: string;
 }
diff --git a/src/util/migration/mariadb/1723577874393-discoveryCategoryIcon.ts b/src/util/migration/mariadb/1723577874393-discoveryCategoryIcon.ts
new file mode 100644
index 00000000..18bc0a77
--- /dev/null
+++ b/src/util/migration/mariadb/1723577874393-discoveryCategoryIcon.ts
@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class DiscoveryCategoryIcon1723577874393 implements MigrationInterface {
+	name = "DiscoveryCategoryIcon1723577874393";
+
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE `categories` ADD `icon` text NULL",
+		);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query("ALTER TABLE `categories` DROP COLUMN `icon`");
+	}
+}
diff --git a/src/util/migration/mysql/1723577874393-discoveryCategoryIcon.ts b/src/util/migration/mysql/1723577874393-discoveryCategoryIcon.ts
new file mode 100644
index 00000000..18bc0a77
--- /dev/null
+++ b/src/util/migration/mysql/1723577874393-discoveryCategoryIcon.ts
@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class DiscoveryCategoryIcon1723577874393 implements MigrationInterface {
+	name = "DiscoveryCategoryIcon1723577874393";
+
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			"ALTER TABLE `categories` ADD `icon` text NULL",
+		);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query("ALTER TABLE `categories` DROP COLUMN `icon`");
+	}
+}
diff --git a/src/util/migration/postgres/1723577874393-discoveryCategoryIcon.ts b/src/util/migration/postgres/1723577874393-discoveryCategoryIcon.ts
new file mode 100644
index 00000000..29b4138a
--- /dev/null
+++ b/src/util/migration/postgres/1723577874393-discoveryCategoryIcon.ts
@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class DiscoveryCategoryIcon1723577874393 implements MigrationInterface {
+	name = "DiscoveryCategoryIcon1723577874393";
+
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query("ALTER TABLE categories ADD icon text NULL");
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query("ALTER TABLE categories DROP COLUMN icon");
+	}
+}