Use partition func instead + use Promise.all

This commit is contained in:
Madeline 2023-04-11 12:56:32 +10:00
parent 6a148898a5
commit debfaea866
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47
3 changed files with 23 additions and 27 deletions

View File

@ -17,7 +17,7 @@
*/ */
import { Router, Request, Response } from "express"; import { Router, Request, Response } from "express";
import { Member } from "@spacebar/util"; import { Member, partition } from "@spacebar/util";
import { route } from "@spacebar/api"; import { route } from "@spacebar/api";
const router = Router(); const router = Router();
@ -35,26 +35,21 @@ router.patch(
relations: ["roles"], relations: ["roles"],
}); });
const members_to_add = members.filter((member) => { const [add, remove] = partition(
return ( members,
(member) =>
member_ids.includes(member.id) && member_ids.includes(member.id) &&
!member.roles.map((role) => role.id).includes(role_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 Promise.all([
await Member.addRole(member.id, guild_id, role_id); ...add.map((member) =>
} Member.addRole(member.id, guild_id, role_id),
),
for (const member of members_to_remove) { ...remove.map((member) =>
await Member.removeRole(member.id, guild_id, role_id); Member.removeRole(member.id, guild_id, role_id),
} ),
]);
res.sendStatus(204); res.sendStatus(204);
}, },

View File

@ -26,6 +26,7 @@ import {
LazyRequestSchema, LazyRequestSchema,
User, User,
Presence, Presence,
partition,
} from "@spacebar/util"; } from "@spacebar/util";
import { import {
WebSocket, 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];
}

View File

@ -21,3 +21,11 @@
export function containsAll(arr: unknown[], target: unknown[]) { export function containsAll(arr: unknown[], target: unknown[]) {
return target.every((v) => arr.includes(v)); 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];
}