From 110d58b5d255131ce4f30dd69ed7bc18d6f92d0b 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: 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(-) (limited to 'api/src') 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 */ + + 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); + return res.json(bans_array); }); router.get("/:user", route({ permission: "BAN_MEMBERS" }), async (req: Request, res: Response) => { -- cgit 1.5.1 From 8b5a9171862e9bc14b9a6cb4a612d87966ea327a Mon Sep 17 00:00:00 2001 From: Nobody Date: Tue, 8 Mar 2022 09:18:19 -0300 Subject: 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(+) (limited to 'api/src') 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 } -- cgit 1.5.1 From d46fe195d00bcd87ed9936b29ca5aef058e90fe2 Mon Sep 17 00:00:00 2001 From: Nobody Date: Tue, 8 Mar 2022 09:25:14 -0300 Subject: 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(-) (limited to 'api/src') 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 } -- cgit 1.5.1 From a3091e9d1acce09d18311d55f75ae2d17ca7b383 Mon Sep 17 00:00:00 2001 From: Nobody Date: Tue, 8 Mar 2022 09:36:21 -0300 Subject: 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(-) (limited to 'api/src') 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", -- cgit 1.5.1 From 4a1e25dda6b1a39d67a3337041a60f6dd4bd781c 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: 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(-) (limited to 'api/src') 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; -- cgit 1.5.1