Use partition func instead + use Promise.all

3 files changed, 24 insertions, 28 deletions

diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts
index 886b0d1a..6b9fad9c 100644
--- a/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts
+++ b/src/api/routes/guilds/#guild_id/roles/#role_id/members.ts
@@ -17,7 +17,7 @@
 */
 
 import { Router, Request, Response } from "express";
-import { Member } from "@spacebar/util";
+import { Member, partition } from "@spacebar/util";
 import { route } from "@spacebar/api";
 
 const router = Router();
@@ -35,26 +35,21 @@ router.patch(
 			relations: ["roles"],
 		});
 
-		const members_to_add = members.filter((member) => {
-			return (
+		const [add, remove] = partition(
+			members,
+			(member) =>
 				member_ids.includes(member.id) &&
-				!member.roles.map((role) => role.id).includes(role_id)
-			);
-		});
-		const members_to_remove = members.filter((member) => {
-			return (
-				!member_ids.includes(member.id) &&
-				member.roles.map((role) => role.id).includes(role_id)
-			);
-		});
-
-		for (const member of members_to_add) {
-			await Member.addRole(member.id, guild_id, role_id);
-		}
-
-		for (const member of members_to_remove) {
-			await Member.removeRole(member.id, guild_id, role_id);
-		}
+				!member.roles.map((role) => role.id).includes(role_id),
+		);
+
+		await Promise.all([
+			...add.map((member) =>
+				Member.addRole(member.id, guild_id, role_id),
+			),
+			...remove.map((member) =>
+				Member.removeRole(member.id, guild_id, role_id),
+			),
+		]);
 
 		res.sendStatus(204);
 	},
diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts
index 3cc2b655..64e50d92 100644
--- a/src/gateway/opcodes/LazyRequest.ts
+++ b/src/gateway/opcodes/LazyRequest.ts
@@ -26,6 +26,7 @@ import {
 	LazyRequestSchema,
 	User,
 	Presence,
+	partition,
 } from "@spacebar/util";
 import {
 	WebSocket,
@@ -302,11 +303,3 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
 		},
 	});
 }
-
-/* https://stackoverflow.com/a/50636286 */
-function partition<T>(array: T[], filter: (elem: T) => boolean) {
-	const pass: T[] = [],
-		fail: T[] = [];
-	array.forEach((e) => (filter(e) ? pass : fail).push(e));
-	return [pass, fail];
-}
diff --git a/src/util/util/Array.ts b/src/util/util/Array.ts
index 8a141340..082ac307 100644
--- a/src/util/util/Array.ts
+++ b/src/util/util/Array.ts
@@ -21,3 +21,11 @@
 export function containsAll(arr: unknown[], target: unknown[]) {
 	return target.every((v) => arr.includes(v));
 }
+
+/* https://stackoverflow.com/a/50636286 */
+export function partition<T>(array: T[], filter: (elem: T) => boolean) {
+	const pass: T[] = [],
+		fail: T[] = [];
+	array.forEach((e) => (filter(e) ? pass : fail).push(e));
+	return [pass, fail];
+}