emit gateway events

spacebarchat · Dec 17, 2023 · 8ed831c · 8ed831c
1 parent e45857b
commit 8ed831c
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 44 deletions.
diff --git a/src/api/routes/admin/guilds/#guild_id/index.ts b/src/api/routes/admin/guilds/#guild_id/index.ts
@@ -22,6 +22,7 @@ import {
 	AdminGuildProjection,
 	Channel,
 	Guild,
+	GuildDeleteEvent,
 	GuildUpdateEvent,
 	Permissions,
 	emitEvent,
@@ -214,7 +215,7 @@ router.delete(
 		description: "Delete a guild",
 		right: "ADMIN_DELETE_GUILDS",
 		responses: {
-			200: {},
+			204: {},
 			400: {
 				body: "APIErrorResponse",
 			},
@@ -225,9 +226,18 @@ router.delete(
 	}),
 	async (req: Request, res: Response) => {
 		const { guild_id } = req.params;
-		const guild = await Guild.findOneOrFail({ where: { id: guild_id } });
-		await guild.remove();
-		res.sendStatus(200);
+		await Promise.all([
+			Guild.findOneOrFail({ where: { id: guild_id } }),
+			Guild.delete({ id: guild_id }), // this will also delete all guild related data
+			emitEvent({
+				event: "GUILD_DELETE",
+				data: {
+					id: guild_id,
+				},
+				guild_id: guild_id,
+			} as GuildDeleteEvent),
+		]);
+		res.sendStatus(204);
 	},
 );
 

diff --git a/src/api/routes/admin/guilds/index.ts b/src/api/routes/admin/guilds/index.ts
@@ -28,39 +28,6 @@ import { HTTPError } from "lambert-server";
 import { ILike, MoreThan } from "typeorm";
 const router = Router();
 
-router.post(
-	"/",
-	route({
-		requestBody: "AdminGuildCreateSchema",
-		right: "ADMIN_CREATE_GUILDS",
-		responses: {
-			201: {
-				body: "AdminGuildResponse",
-			},
-			400: {
-				body: "APIErrorResponse",
-			},
-			403: {
-				body: "APIErrorResponse",
-			},
-		},
-	}),
-	async (req: Request, res: Response) => {
-		const body = req.body as AdminGuildCreateSchema;
-
-		const ownerId = body.owner_id || req.user_id;
-
-		const guild = await Guild.createGuild({
-			...body,
-			owner_id: ownerId,
-		});
-
-		await Member.addToGuild(ownerId, guild.id);
-
-		res.status(201).json(guild);
-	},
-);
-
 router.get(
 	"/",
 	route({
@@ -116,4 +83,37 @@ router.get(
 	},
 );
 
+router.post(
+	"/",
+	route({
+		requestBody: "AdminGuildCreateSchema",
+		right: "ADMIN_CREATE_GUILDS",
+		responses: {
+			201: {
+				body: "AdminGuildResponse",
+			},
+			400: {
+				body: "APIErrorResponse",
+			},
+			403: {
+				body: "APIErrorResponse",
+			},
+		},
+	}),
+	async (req: Request, res: Response) => {
+		const body = req.body as AdminGuildCreateSchema;
+
+		const ownerId = body.owner_id || req.user_id;
+
+		const guild = await Guild.createGuild({
+			...body,
+			owner_id: ownerId,
+		});
+
+		await Member.addToGuild(ownerId, guild.id);
+
+		res.status(201).json(guild);
+	},
+);
+
 export default router;
diff --git a/src/api/routes/admin/users/#id/index.ts b/src/api/routes/admin/users/#id/index.ts
@@ -22,6 +22,7 @@ import {
 	AdminUserProjection,
 	FieldErrors,
 	User,
+	UserDeleteEvent,
 	UserUpdateEvent,
 	emitEvent,
 	handleFile,
@@ -138,7 +139,7 @@ router.delete(
 		description: "Delete a user",
 		right: "ADMIN_DELETE_USERS",
 		responses: {
-			200: {},
+			204: {},
 			400: {
 				body: "APIErrorResponse",
 			},
@@ -149,12 +150,20 @@ router.delete(
 	}),
 	async (req: Request, res: Response) => {
 		const { id } = req.params;
-		const user = await User.findOneOrFail({
-			where: { id },
-			select: AdminUserProjection,
-		});
-		await user.remove();
-		res.sendStatus(200);
+
+		await Promise.all([
+			User.findOneOrFail({
+				where: { id },
+			}),
+			User.delete({ id }),
+			emitEvent({
+				event: "USER_DELETE",
+				user_id: req.user_id,
+				data: { user_id: req.params.id },
+			} as UserDeleteEvent),
+		]);
+
+		res.sendStatus(204);
 	},
 );