From b51e687793aa9c752d9643cf7a9ac4c3dade6bd2 Mon Sep 17 00:00:00 2001
From: RealMANI <96433859+ImAaronFR@users.noreply.github.com>
Date: Sun, 6 Mar 2022 12:20:47 +0330
Subject: [PATCH 01/19] [Fix] Changing bio and accent color

---
 api/src/routes/users/@me/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/routes/users/@me/index.ts b/api/src/routes/users/@me/index.ts
index 5834921c..78e203a2 100644
--- a/api/src/routes/users/@me/index.ts
+++ b/api/src/routes/users/@me/index.ts
@@ -58,7 +58,7 @@ router.patch("/", route({ body: "UserModifySchema" }), async (req: Request, res:
 	}
 
 	var check_username = body?.username?.replace(/\s/g, '');
-	if(!check_username && !body?.avatar && !body?.banner) {
+	if(!check_username && !body?.avatar && !body?.banner && !body?.bio && !body?.accent_color) {
 		throw FieldErrors({
 			username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
 		});

From fa750de6fb95fb483ec078f008a417ed166b8183 Mon Sep 17 00:00:00 2001
From: RealMANI <96433859+ImAaronFR@users.noreply.github.com>
Date: Sun, 6 Mar 2022 12:37:16 +0330
Subject: [PATCH 02/19] Check username

---
 api/src/routes/users/@me/index.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/api/src/routes/users/@me/index.ts b/api/src/routes/users/@me/index.ts
index 78e203a2..d32b44f9 100644
--- a/api/src/routes/users/@me/index.ts
+++ b/api/src/routes/users/@me/index.ts
@@ -57,12 +57,14 @@ router.patch("/", route({ body: "UserModifySchema" }), async (req: Request, res:
 		user.data.hash = await bcrypt.hash(body.new_password, 12);
 	}
 
-	var check_username = body?.username?.replace(/\s/g, '');
-	if(!check_username && !body?.avatar && !body?.banner && !body?.bio && !body?.accent_color) {
-		throw FieldErrors({
-			username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
-		});
-	}
+    if(body.username){
+        var check_username = body?.username?.replace(/\s/g, '');
+        if(!check_username) {
+            throw FieldErrors({
+                username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
+            });
+        }
+    }
 
 	await user.save();
 

From de8b83f7b9bf9f418b49c4221bec35417de219d8 Mon Sep 17 00:00:00 2001
From: RealMANI <96433859+ImAaronFR@users.noreply.github.com>
Date: Mon, 7 Mar 2022 21:40:24 +0330
Subject: [PATCH 03/19] Type change

Changed type for column "content" to "longtext"

(you might want to get a back up from your database before updating)
---
 util/src/entities/Message.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/src/entities/Message.ts b/util/src/entities/Message.ts
index e577d5df..384355f9 100644
--- a/util/src/entities/Message.ts
+++ b/util/src/entities/Message.ts
@@ -106,7 +106,7 @@ export class Message extends BaseClass {
 	@ManyToOne(() => Application)
 	application?: Application;
 
-	@Column({ nullable: true })
+	@Column({ type: "longtext", nullable: true })
 	content?: string;
 
 	@Column()

From 39a3eee45dc16a6e0a1332054ef75daaf9bf8d07 Mon Sep 17 00:00:00 2001
From: RealMANI <96433859+ImAaronFR@users.noreply.github.com>
Date: Mon, 7 Mar 2022 21:40:24 +0330
Subject: [PATCH 04/19] Revert "Type change"

This reverts commit de8b83f7b9bf9f418b49c4221bec35417de219d8.
---
 util/src/entities/Message.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/src/entities/Message.ts b/util/src/entities/Message.ts
index 384355f9..e577d5df 100644
--- a/util/src/entities/Message.ts
+++ b/util/src/entities/Message.ts
@@ -106,7 +106,7 @@ export class Message extends BaseClass {
 	@ManyToOne(() => Application)
 	application?: Application;
 
-	@Column({ type: "longtext", nullable: true })
+	@Column({ nullable: true })
 	content?: string;
 
 	@Column()

From 4294c6a8753379a06b5f4c21c4d4258352ec139d Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Tue, 8 Mar 2022 12:01:00 -0300
Subject: [PATCH 05/19] fix(api): working ban list

We should never use await inside loops
---
 api/src/routes/guilds/#guild_id/bans.ts | 31 ++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/api/src/routes/guilds/#guild_id/bans.ts b/api/src/routes/guilds/#guild_id/bans.ts
index 7ccf34d7..1ce41936 100644
--- a/api/src/routes/guilds/#guild_id/bans.ts
+++ b/api/src/routes/guilds/#guild_id/bans.ts
@@ -33,17 +33,32 @@ router.get("/", route({ permission: "BAN_MEMBERS" }), async (req: Request, res:
 	const { guild_id } = req.params;
 
 	let bans = await Ban.find({ guild_id: guild_id });
+	let promisesToAwait: object[] = [];
+	const bansObj: object[] = [];
 
-	/* Filter secret from database registry.*/
+	bans.filter((ban) => ban.user_id !== ban.executor_id); // pretend self-bans don't exist to prevent victim chasing
 
-	bans.filter(ban => ban.user_id !== ban.executor_id);
-	// pretend self-bans don't exist to prevent victim chasing
-	
-	bans.forEach((registry: BanRegistrySchema) => {
-	delete registry.ip;
+	bans.forEach((ban) => {
+		promisesToAwait.push(User.getPublicUser(ban.user_id));
 	});
-	
-	return res.json(bans);
+
+	const bannedUsers: object[] = await Promise.all(promisesToAwait);
+
+	bans.forEach((ban, index) => {
+		const user = bannedUsers[index] as User;
+		bansObj.push({
+			reason: ban.reason,
+			user: {
+				username: user.username,
+				discriminator: user.discriminator,
+				id: user.id,
+				avatar: user.avatar,
+				public_flags: user.public_flags
+			}
+		});
+	});
+
+	return res.json(bansObj);
 });
 
 router.get("/:user", route({ permission: "BAN_MEMBERS" }), async (req: Request, res: Response) => {

From c097fce8417ea9af344203e5d27430cdea5e110f Mon Sep 17 00:00:00 2001
From: RealMANI <96433859+ImAaronFR@users.noreply.github.com>
Date: Tue, 8 Mar 2022 18:35:19 +0330
Subject: [PATCH 06/19] Fix bans list (#674)

* Fix bans list

- Bans list should load properly now

* Updated

Removed await
Removed unnecessary foreach

* Update ban.ts

await
---
 api/src/routes/guilds/#guild_id/bans.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/api/src/routes/guilds/#guild_id/bans.ts b/api/src/routes/guilds/#guild_id/bans.ts
index 7ccf34d7..99adf5ae 100644
--- a/api/src/routes/guilds/#guild_id/bans.ts
+++ b/api/src/routes/guilds/#guild_id/bans.ts
@@ -33,17 +33,21 @@ router.get("/", route({ permission: "BAN_MEMBERS" }), async (req: Request, res:
 	const { guild_id } = req.params;
 
 	let bans = await Ban.find({ guild_id: guild_id });
-
-	/* Filter secret from database registry.*/
-
-	bans.filter(ban => ban.user_id !== ban.executor_id);
+	
 	// pretend self-bans don't exist to prevent victim chasing
+	bans.filter(ban => ban.user_id !== ban.executor_id);
 	
-	bans.forEach((registry: BanRegistrySchema) => {
-	delete registry.ip;
-	});
+	/* Create an separate array to modify and return */
 	
-	return res.json(bans);
+	var bans_array: object[] = [];
+
+	for (const ban of bans) {
+	const banned_user = await User.getPublicUser(ban.user_id);
+	var ban_object = {user: {id: banned_user.id, username: banned_user.username, avatar: banned_user.avatar, discriminator: banned_user.discriminator, public_flags: banned_user.public_flags}, reason: ban.reason};
+	bans_array.push(ban_object)
+	}
+	
+	return res.json(bans_array);
 });
 
 router.get("/:user", route({ permission: "BAN_MEMBERS" }), async (req: Request, res: Response) => {

From 22467f2596904007b66b20148d9cb600d5df0979 Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Tue, 8 Mar 2022 05:07:39 -0300
Subject: [PATCH 07/19] refactor(gateway): delete hardcoded guild boosts

Since you can set `premium_subscription_count` and `premium_tier` by editing the database (and it works fine), this should not be hardcoded.
---
 gateway/src/opcodes/Identify.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index 904aa963..eb15c28f 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/gateway/src/opcodes/Identify.ts
@@ -240,8 +240,6 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 			x.guild_hashes = {}; // @ts-ignore
 			x.guild_scheduled_events = []; // @ts-ignore
 			x.threads = [];
-			x.premium_subscription_count = 30;
-			x.premium_tier = 3;
 			return x;
 		}),
 		guild_experiments: [], // TODO

From 4a617faf02d931e5c69a509aa3764ef2b8999bea Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Tue, 8 Mar 2022 09:18:19 -0300
Subject: [PATCH 08/19] fix(api): always add @everyone in user's roles

When you add or delete an user's role, you MUST always add "@everyone" role to the roles map
---
 api/src/routes/guilds/#guild_id/members/#member_id/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
index 24c74af7..c33eb2fe 100644
--- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -28,6 +28,9 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re
 
 	if (body.roles) {
 		permission.hasThrow("MANAGE_ROLES");
+
+		const everyone = await Role.findOneOrFail({ guild_id: guild_id, name: "@everyone", position: 0 });
+		body.roles.push(everyone?.id);
 		member.roles = body.roles.map((x) => new Role({ id: x })); // foreign key constraint will fail if role doesn't exist
 	}
 

From b20746bd17e6b5b177b35bcf26434b5d0e1b38d6 Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Tue, 8 Mar 2022 09:25:14 -0300
Subject: [PATCH 09/19] fix(api): prevent @everyone role duplication

If user already has @everyone role, then don't push it to the array
---
 api/src/routes/guilds/#guild_id/members/#member_id/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
index c33eb2fe..3234a405 100644
--- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -30,7 +30,7 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re
 		permission.hasThrow("MANAGE_ROLES");
 
 		const everyone = await Role.findOneOrFail({ guild_id: guild_id, name: "@everyone", position: 0 });
-		body.roles.push(everyone?.id);
+		if (body.roles.indexOf(everyone.id) === -1) body.roles.push(everyone.id);
 		member.roles = body.roles.map((x) => new Role({ id: x })); // foreign key constraint will fail if role doesn't exist
 	}
 

From 0bb00e044b736596a48a609c575786d557b26f59 Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Tue, 8 Mar 2022 09:36:21 -0300
Subject: [PATCH 10/19] fix(api): don't send @everyone in route response

The response of `PATCH /guilds/{guild.id}/members/{user.id}` should not include "@everyone" role
---
 api/src/routes/guilds/#guild_id/members/#member_id/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
index 3234a405..34836292 100644
--- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -25,16 +25,19 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re
 
 	const member = await Member.findOneOrFail({ where: { id: member_id, guild_id }, relations: ["roles", "user"] });
 	const permission = await getPermission(req.user_id, guild_id);
+	const everyone = await Role.findOneOrFail({ guild_id: guild_id, name: "@everyone", position: 0 });
 
 	if (body.roles) {
 		permission.hasThrow("MANAGE_ROLES");
 
-		const everyone = await Role.findOneOrFail({ guild_id: guild_id, name: "@everyone", position: 0 });
 		if (body.roles.indexOf(everyone.id) === -1) body.roles.push(everyone.id);
 		member.roles = body.roles.map((x) => new Role({ id: x })); // foreign key constraint will fail if role doesn't exist
 	}
 
 	await member.save();
+
+	member.roles = member.roles.filter((x) => x.id !== everyone.id);
+
 	// do not use promise.all as we have to first write to db before emitting the event to catch errors
 	await emitEvent({
 		event: "GUILD_MEMBER_UPDATE",

From 392d6b2a90745308bc184de3fe51b02b21d7a664 Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Tue, 8 Mar 2022 10:52:48 -0300
Subject: [PATCH 11/19] fix(api): working invisible status type

---
 api/assets/openapi.json | 4 ++--
 api/assets/schemas.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/assets/openapi.json b/api/assets/openapi.json
index 1af0600d..03550323 100644
--- a/api/assets/openapi.json
+++ b/api/assets/openapi.json
@@ -3119,7 +3119,7 @@
 						"type": "boolean"
 					},
 					"status": {
-						"enum": ["dnd", "idle", "offline", "online"],
+						"enum": ["dnd", "idle", "offline", "online", "invisible"],
 						"type": "string"
 					},
 					"stream_notifications_enabled": {
@@ -5677,7 +5677,7 @@
 						"type": "boolean"
 					},
 					"status": {
-						"enum": ["dnd", "idle", "offline", "online"],
+						"enum": ["dnd", "idle", "offline", "online", "invisible"],
 						"type": "string"
 					},
 					"stream_notifications_enabled": {
diff --git a/api/assets/schemas.json b/api/assets/schemas.json
index 4ffa44b8..d531df21 100644
--- a/api/assets/schemas.json
+++ b/api/assets/schemas.json
@@ -7897,7 +7897,7 @@
 				"type": "boolean"
 			},
 			"status": {
-				"enum": ["dnd", "idle", "offline", "online"],
+				"enum": ["dnd", "idle", "offline", "online", "invisible"],
 				"type": "string"
 			},
 			"stream_notifications_enabled": {

From 4dc7ab3fde1d66861548cf5a5cc55ad169083612 Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Tue, 8 Mar 2022 10:52:54 -0300
Subject: [PATCH 12/19] fix(util): working invisible status type

---
 util/src/entities/User.ts     | 2 +-
 util/src/interfaces/Status.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 1d18c838..ed7bd4ce 100644
--- a/util/src/entities/User.ts
+++ b/util/src/entities/User.ts
@@ -360,7 +360,7 @@ export interface UserSettings {
 	render_reactions: boolean;
 	restricted_guilds: string[];
 	show_current_game: boolean;
-	status: "online" | "offline" | "dnd" | "idle";
+	status: "online" | "offline" | "dnd" | "idle" | "invisible";
 	stream_notifications_enabled: boolean;
 	theme: "dark" | "white"; // dark
 	timezone_offset: number; // e.g -60
diff --git a/util/src/interfaces/Status.ts b/util/src/interfaces/Status.ts
index c4dab586..5d2e1bba 100644
--- a/util/src/interfaces/Status.ts
+++ b/util/src/interfaces/Status.ts
@@ -1,4 +1,4 @@
-export type Status = "idle" | "dnd" | "online" | "offline";
+export type Status = "idle" | "dnd" | "online" | "offline" | "invisible";
 
 export interface ClientStatus {
 	desktop?: string; // e.g. Windows/Linux/Mac

From 08d10161ae24f047c692119d143ddd24c8c631be Mon Sep 17 00:00:00 2001
From: Nobody <17956512+n0bodysec@users.noreply.github.com>
Date: Tue, 8 Mar 2022 12:10:06 -0300
Subject: [PATCH 13/19] refactor(Docker): add working docker scripts (#671)

---
 Dockerfile         | 45 +++++++++++++++++++++++++++++++++++++------
 docker-compose.yml | 48 ++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d4b423ee..3c8a0b31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,40 @@
-FROM node:14
-WORKDIR /usr/src/fosscord-server/
-COPY . .
-WORKDIR /usr/src/fosscord-server/bundle
+FROM node:alpine
+
+# env vars
+ENV WORK_DIR="/srv/fosscord-server"
+ENV DEV_MODE=0
+ENV HTTP_PORT=3001
+ENV WS_PORT=3002
+ENV CDN_PORT=3003
+ENV RTC_PORT=3004
+ENV ADMIN_PORT=3005
+
+# exposed ports (only for reference, see https://docs.docker.com/engine/reference/builder/#expose)
+EXPOSE ${HTTP_PORT}/tcp ${WS_PORT}/tcp ${CDN_PORT}/tcp ${RTC_PORT}/tcp ${ADMIN_PORT}/tcp
+
+# install required apps
+RUN apk add --no-cache --update git python2 py-pip make build-base
+
+# optionl: packages for debugging/development
+RUN apk add --no-cache sqlite
+
+# download fosscord-server
+WORKDIR $WORK_DIR/src
+RUN git clone https://github.com/fosscord/fosscord-server.git .
+
+# setup and run
+WORKDIR $WORK_DIR/src/bundle
 RUN npm run setup
-EXPOSE 3001
-CMD [ "npm", "run", "start:bundle" ]
+RUN npm install @yukikaze-bot/erlpack
+# RUN npm install mysql --save
+
+# create update script
+RUN printf '#!/bin/sh\n\ngit -C $WORK_DIR/src/ checkout master\ngit -C $WORK_DIR/src/ reset --hard HEAD\ngit -C $WORK_DIR/src/ pull\ncd $WORK_DIR/src/bundle/\nnpm run setup\n' > $WORK_DIR/update.sh
+RUN chmod +x $WORK_DIR/update.sh
+
+# configure entrypoint file
+RUN printf '#!/bin/sh\n\nDEV_MODE=${DEV_MODE:-0}\n\nif [ "$DEV_MODE" -eq 1 ]; then\n    tail -f /dev/null\nelse\n    cd $WORK_DIR/src/bundle/\n    npm run start:bundle\nfi\n' > $WORK_DIR/entrypoint.sh
+RUN chmod +x $WORK_DIR/entrypoint.sh
+
+WORKDIR $WORK_DIR
+ENTRYPOINT ["./entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c03220c..13696f6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,47 @@
-version: "3"
+version: '3.8'
+
 services:
-  server:
-    image: fosscord/server
+  fosscord:
+    container_name: fosscord
+    image: fosscord
+    restart: on-failure:5
+    # depends_on: mariadb
     build: .
     ports:
-      - 3001:3001
+      - '3001-3005:3001-3005'
+    volumes:
+      # - ./data/:${WORK_DIR:-/srv/fosscord-server}/data/
+      - data:${WORK_DIR:-/srv/fosscord-server}/
+    environment:
+      WORK_DIR: ${WORK_DIR:-/srv/fosscord-server}
+      DEV_MODE: ${DEV_MODE:-0}
+      THREADS: ${THREADS:-1}
+      DATABASE: ${DATABASE:-../../data/database.db}
+      STORAGE_LOCATION: ${STORAGE_LOCATION:-../../data/files/}
+      HTTP_PORT: 3001
+      WS_PORT: 3002
+      CDN_PORT: 3003
+      RTC_PORT: 3004
+      ADMIN_PORT: 3005
+
+  # mariadb:
+  #   image: mariadb:latest
+  #   restart: on-failure:5
+  #   environment:
+  #     MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-secr3tpassw0rd}
+  #     MYSQL_DATABASE: ${MYSQL_DATABASE:-fosscord}
+  #     MYSQL_USER: ${MYSQL_USER:-fosscord}
+  #     MYSQL_PASSWORD: ${MYSQL_PASSWORD:-password1}
+  #   networks:
+  #     - default
+  #   volumes:
+  #     - mariadb:/var/lib/mysql
+
+volumes:
+  data:
+  # mariadb:
+
+networks:
+  default:
+    name: fosscord
+    driver: bridge

From 4059a00044fd3236d1e86cead24b09ff52893a18 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Wed, 9 Mar 2022 02:10:23 +1100
Subject: [PATCH 14/19] Changing Member.premium_since back from Date to number
 fixes an error in the Discord electron client related to rendering premium
 status. (#669)

Client throws "Invalid time value", so I'm guessing it's something to do with premium_since not being the date format they want ( allegedly ISO8601, but works with a plain number, so wtf )
---
 util/src/entities/Member.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts
index 3c5f9db0..b7406881 100644
--- a/util/src/entities/Member.ts
+++ b/util/src/entities/Member.ts
@@ -86,7 +86,7 @@ export class Member extends BaseClassWithoutId {
 	joined_at: Date;
 
 	@Column({ nullable: true })
-	premium_since?: Date;
+	premium_since?: number;
 
 	@Column()
 	deaf: boolean;

From 4adf6602deb67c4d2b613d4a3787d2c5eca9da0c Mon Sep 17 00:00:00 2001
From: RealMANI <96433859+ImAaronFR@users.noreply.github.com>
Date: Tue, 8 Mar 2022 01:27:32 +0330
Subject: [PATCH 15/19] Temporary notes fix

Temporary fix for getting stuck on loading user note.
//TODO
---
 api/src/routes/users/@me/notes.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/routes/users/@me/notes.ts b/api/src/routes/users/@me/notes.ts
index 2ef27bc0..96067bf5 100644
--- a/api/src/routes/users/@me/notes.ts
+++ b/api/src/routes/users/@me/notes.ts
@@ -6,9 +6,9 @@ const router: Router = Router();
 router.put("/:id", route({}), async (req: Request, res: Response) => {
 	//TODO
 	res.json({
-		message: "400: Bad Request",
-		code: 0
-	}).status(400);
+		message: "Unknown User",
+		code: 10013
+	}).status(404);
 });
 
 export default router;

From 7d8b4b00cee517404c85010d56eb05cf3967104d Mon Sep 17 00:00:00 2001
From: Xenorio <realxenorio@gmail.com>
Date: Tue, 8 Mar 2022 19:06:58 +0100
Subject: [PATCH 16/19] Change premium_since to bigint

---
 util/src/entities/Member.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts
index b7406881..a246b891 100644
--- a/util/src/entities/Member.ts
+++ b/util/src/entities/Member.ts
@@ -85,7 +85,7 @@ export class Member extends BaseClassWithoutId {
 	@Column()
 	joined_at: Date;
 
-	@Column({ nullable: true })
+	@Column({ type: "bigint", nullable: true })
 	premium_since?: number;
 
 	@Column()
@@ -245,7 +245,7 @@ export class Member extends BaseClassWithoutId {
 			nick: undefined,
 			roles: [guild_id], // @everyone role
 			joined_at: new Date(),
-			premium_since: new Date(),
+			premium_since: (new Date()).getTime(),
 			deaf: false,
 			mute: false,
 			pending: false,

From 64f0b1f1a16c89c7f47facf2d0a73400e377cbe2 Mon Sep 17 00:00:00 2001
From: Nobody <git@n0bodysec.com>
Date: Wed, 9 Mar 2022 06:04:50 -0300
Subject: [PATCH 17/19] fix(api): working replies in dm channels

---
 api/src/util/handlers/Message.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts
index 21664368..2d9f7032 100644
--- a/api/src/util/handlers/Message.ts
+++ b/api/src/util/handlers/Message.ts
@@ -82,10 +82,12 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
 	if (opts.message_reference) {
 		permission.hasThrow("READ_MESSAGE_HISTORY");
 		// code below has to be redone when we add custom message routing and cross-channel replies
-		const guild = await Guild.findOneOrFail({ id: channel.guild_id });
-		if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) {
-			if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild");
-			if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel");
+		if (message.guild_id !== null) {
+			const guild = await Guild.findOneOrFail({ id: channel.guild_id });
+			if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) {
+				if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild");
+				if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel");
+			}
 		}
 		// TODO: should be checked if the referenced message exists?
 		// @ts-ignore

From 134d746ebf41fe0682d8525b20c10bf8bcde25f8 Mon Sep 17 00:00:00 2001
From: Nobody <17956512+n0bodysec@users.noreply.github.com>
Date: Wed, 9 Mar 2022 11:35:19 -0300
Subject: [PATCH 18/19] fix(api): add vanity urls creation/update (#665)

* fix(api): add vanity urls creation/update

* refactor(api): multiple vanity urls
Old vanty urls will not be updated, instead a new one will be created.
* feat(api): add ALIASABLE_NAMES feature

Reference: https://github.com/fosscord/fosscord-server/issues/407
---
 api/src/routes/guilds/#guild_id/vanity-url.ts | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/api/src/routes/guilds/#guild_id/vanity-url.ts b/api/src/routes/guilds/#guild_id/vanity-url.ts
index 63173345..29cd25e2 100644
--- a/api/src/routes/guilds/#guild_id/vanity-url.ts
+++ b/api/src/routes/guilds/#guild_id/vanity-url.ts
@@ -9,11 +9,19 @@ const InviteRegex = /\W/g;
 
 router.get("/", route({ permission: "MANAGE_GUILD" }), async (req: Request, res: Response) => {
 	const { guild_id } = req.params;
+	const guild = await Guild.findOneOrFail({ id: guild_id });
 
-	const invite = await Invite.findOne({ where: { guild_id: guild_id, vanity_url: true } });
-	if (!invite) return res.json({ code: null });
+	if (!guild.features.includes("ALIASABLE_NAMES")) {
+		const invite = await Invite.findOne({ where: { guild_id: guild_id, vanity_url: true } });
+		if (!invite) return res.json({ code: null });
 
-	return res.json({ code: invite.code, uses: invite.uses });
+		return res.json({ code: invite.code, uses: invite.uses });
+	} else {
+		const invite = await Invite.find({ where: { guild_id: guild_id, vanity_url: true } });
+		if (!invite || invite.length == 0) return res.json({ code: null });
+
+		return res.json(invite.map((x) => ({ code: x.code, uses: x.uses })));
+	}
 });
 
 export interface VanityUrlSchema {
@@ -24,18 +32,33 @@ export interface VanityUrlSchema {
 	code?: string;
 }
 
-// TODO: check if guild is elgible for vanity url
 router.patch("/", route({ body: "VanityUrlSchema", permission: "MANAGE_GUILD" }), async (req: Request, res: Response) => {
 	const { guild_id } = req.params;
 	const body = req.body as VanityUrlSchema;
 	const code = body.code?.replace(InviteRegex, "");
 
+	const guild = await Guild.findOneOrFail({ id: guild_id });
+	if (!guild.features.includes("VANITY_URL")) throw new HTTPError("Your guild doesn't support vanity urls");
+
+	if (!code || code.length === 0) throw new HTTPError("Code cannot be null or empty");
+
 	const invite = await Invite.findOne({ code });
 	if (invite) throw new HTTPError("Invite already exists");
 
 	const { id } = await Channel.findOneOrFail({ guild_id, type: ChannelType.GUILD_TEXT });
 
-	await Invite.update({ vanity_url: true, guild_id }, { code: code, channel_id: id });
+	await new Invite({
+		vanity_url: true,
+		code: code,
+		temporary: false,
+		uses: 0,
+		max_uses: 0,
+		max_age: 0,
+		created_at: new Date(),
+		expires_at: new Date(),
+		guild_id: guild_id,
+		channel_id: id
+	}).save();
 
 	return res.json({ code: code });
 });

From 771e9c1cae0d59f5e443c38cbbb88eaa6cab25e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= <erkinalp9035@gmail.com>
Date: Wed, 9 Mar 2022 17:41:34 +0300
Subject: [PATCH 19/19] Update Rights.ts

---
 util/src/util/Rights.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/src/util/Rights.ts b/util/src/util/Rights.ts
index 9a99d393..db5384d0 100644
--- a/util/src/util/Rights.ts
+++ b/util/src/util/Rights.ts
@@ -65,6 +65,8 @@ export class Rights extends BitField {
 		// inverts the presence confidentiality default (OPERATOR's presence is not routed by default, others' are) for a given user
 		SELF_ADD_DISCOVERABLE: BitFlag(36), // can mark discoverable guilds that they have permissions to mark as discoverable
 		MANAGE_GUILD_DIRECTORY: BitFlag(37), // can change anything in the primary guild directory
+		POGGERS: BitFlag(38), // can send confetti, screenshake, random user mention (@someone)
+		USE_ACHIEVEMENTS: BitFlag(39), // can use achievements and cheers
 		INITIATE_INTERACTIONS: BitFlag(40), // can initiate interactions
 		RESPOND_TO_INTERACTIONS: BitFlag(41), // can respond to interactions
 		SEND_BACKDATED_EVENTS: BitFlag(42), // can send backdated events