From a446837679c2b29ba751efb8c3e5d00ef0b13f00 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Fri, 3 Sep 2021 13:23:20 +0200
Subject: :bug: fix member roles + list

---
 api/scripts/droptables.sql                                  | 2 +-
 api/src/routes/guilds/#guild_id/members/#member_id/index.ts | 8 ++------
 api/src/routes/guilds/index.ts                              | 8 ++++----
 gateway/src/opcodes/LazyRequest.ts                          | 4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/api/scripts/droptables.sql b/api/scripts/droptables.sql
index 2a9fd3ad..cabb9f31 100644
--- a/api/scripts/droptables.sql
+++ b/api/scripts/droptables.sql
@@ -2,7 +2,6 @@ DROP TABLE applications;
 DROP TABLE attachments;
 DROP TABLE audit_logs;
 DROP TABLE bans;
-DROP TABLE channels;
 DROP TABLE connected_accounts;
 DROP TABLE emojis;
 DROP TABLE invites;
@@ -24,6 +23,7 @@ DROP TABLE teams;
 DROP TABLE templates;
 DROP TABLE voice_states;
 DROP TABLE webhooks;
+DROP TABLE channels;
 DROP TABLE members;
 DROP TABLE guilds;
 -- DROP TABLE users;
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 aef1c6dc..66c508a2 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,18 +30,14 @@ router.patch("/", check(MemberChangeSchema), async (req: Request, res: Response)
 	const { guild_id, member_id } = req.params;
 	const body = req.body as MemberChangeSchema;
 
+	const member = await Member.findOneOrFail({ where: { id: member_id, guild_id }, relations: ["roles", "user"] });
 	const permission = await getPermission(req.user_id, guild_id);
 
 	if (body.roles) {
 		permission.hasThrow("MANAGE_ROLES");
-
-		const roles = await Role.find({ id: In(body.roles) });
-		if (body.roles.length !== roles.length) throw new HTTPError("Roles not found", 404);
+		member.roles = body.roles.map((x) => new Role({ id: x })); // foreign key constraint will fail if role doesn't exist
 	}
 
-	const member = await Member.findOneOrFail({ id: member_id, guild_id });
-	member.assign(req.body);
-
 	Promise.all([
 		member.save(),
 		emitEvent({
diff --git a/api/src/routes/guilds/index.ts b/api/src/routes/guilds/index.ts
index 51dcf96a..b4f6b3d2 100644
--- a/api/src/routes/guilds/index.ts
+++ b/api/src/routes/guilds/index.ts
@@ -20,7 +20,7 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
 
 	const guild_id = Snowflake.generate();
 
-	const guild = await new Guild({
+	await Guild.insert({
 		name: body.name,
 		region: Config.get().regions.default,
 		owner_id: req.user_id,
@@ -47,10 +47,10 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
 			welcome_channels: []
 		},
 		widget_enabled: false
-	}).save();
+	});
 
 	// we have to create the role _after_ the guild because else we would get a "SQLITE_CONSTRAINT: FOREIGN KEY constraint failed" error
-	const role = await new Role({
+	await Role.insert({
 		id: guild_id,
 		guild_id: guild_id,
 		color: 0,
@@ -60,7 +60,7 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
 		name: "@everyone",
 		permissions: String("2251804225"),
 		position: 0
-	}).save();
+	});
 
 	if (!body.channels || !body.channels.length) body.channels = [{ id: "01", type: 0, name: "general" }];
 
diff --git a/gateway/src/opcodes/LazyRequest.ts b/gateway/src/opcodes/LazyRequest.ts
index e035e6bb..b7ee9a96 100644
--- a/gateway/src/opcodes/LazyRequest.ts
+++ b/gateway/src/opcodes/LazyRequest.ts
@@ -33,7 +33,7 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
 	const roles = await Role.find({
 		where: { guild_id: guild_id },
 		order: {
-			position: "ASC",
+			position: "DESC",
 		},
 	});
 
@@ -47,7 +47,7 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
 		);
 		const group = {
 			count: role_members.length,
-			id: role.id === guild_id ? "online" : role.name,
+			id: role.id === guild_id ? "online" : role.id,
 		};
 
 		items.push({ group });
-- 
cgit 1.4.1