Merge pull request #1026 from ochen1/patch-3
Add support for Discord's new endpoints to update roles
This commit is contained in:
commit
f040caa712
42
src/api/routes/guilds/#guild_id/roles/#role_id/member-ids.ts
Normal file
42
src/api/routes/guilds/#guild_id/roles/#role_id/member-ids.ts
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
||||||
|
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Router, Request, Response } from "express";
|
||||||
|
import { Member } from "@spacebar/util";
|
||||||
|
import { route } from "@spacebar/api";
|
||||||
|
|
||||||
|
const router = Router();
|
||||||
|
|
||||||
|
router.get("/", route({}), async (req: Request, res: Response) => {
|
||||||
|
const { guild_id, role_id } = req.params;
|
||||||
|
|
||||||
|
// TODO: Is this route really not paginated?
|
||||||
|
const members = await Member.find({
|
||||||
|
select: ["id"],
|
||||||
|
where: {
|
||||||
|
roles: {
|
||||||
|
id: role_id,
|
||||||
|
},
|
||||||
|
guild_id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return res.json(members.map((x) => x.id));
|
||||||
|
});
|
||||||
|
|
||||||
|
export default router;
|
59
src/api/routes/guilds/#guild_id/roles/#role_id/members.ts
Normal file
59
src/api/routes/guilds/#guild_id/roles/#role_id/members.ts
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
||||||
|
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Router, Request, Response } from "express";
|
||||||
|
import { Member, partition } from "@spacebar/util";
|
||||||
|
import { route } from "@spacebar/api";
|
||||||
|
|
||||||
|
const router = Router();
|
||||||
|
|
||||||
|
router.patch(
|
||||||
|
"/",
|
||||||
|
route({ permission: "MANAGE_ROLES" }),
|
||||||
|
async (req: Request, res: Response) => {
|
||||||
|
// Payload is JSON containing a list of member_ids, the new list of members to have the role
|
||||||
|
const { guild_id, role_id } = req.params;
|
||||||
|
const { member_ids } = req.body;
|
||||||
|
|
||||||
|
const members = await Member.find({
|
||||||
|
where: { guild_id },
|
||||||
|
relations: ["roles"],
|
||||||
|
});
|
||||||
|
|
||||||
|
const [add, remove] = partition(
|
||||||
|
members,
|
||||||
|
(member) =>
|
||||||
|
member_ids.includes(member.id) &&
|
||||||
|
!member.roles.map((role) => role.id).includes(role_id),
|
||||||
|
);
|
||||||
|
|
||||||
|
// TODO (erkin): have a bulk add/remove function that adds the roles in a single txn
|
||||||
|
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);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
export default router;
|
39
src/api/routes/guilds/#guild_id/roles/member-counts.ts
Normal file
39
src/api/routes/guilds/#guild_id/roles/member-counts.ts
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
||||||
|
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Request, Response, Router } from "express";
|
||||||
|
import { Role, Member } from "@spacebar/util";
|
||||||
|
import { route } from "@spacebar/api";
|
||||||
|
import {} from "typeorm";
|
||||||
|
|
||||||
|
const router: Router = Router();
|
||||||
|
|
||||||
|
router.get("/", route({}), async (req: Request, res: Response) => {
|
||||||
|
const { guild_id } = req.params;
|
||||||
|
await Member.IsInGuildOrFail(req.user_id, guild_id);
|
||||||
|
|
||||||
|
const role_ids = await Role.find({ where: { guild_id }, select: ["id"] });
|
||||||
|
const counts: { [id: string]: number } = {};
|
||||||
|
for (const { id } of role_ids) {
|
||||||
|
counts[id] = await Member.count({ where: { roles: { id }, guild_id } });
|
||||||
|
}
|
||||||
|
|
||||||
|
return res.json(counts);
|
||||||
|
});
|
||||||
|
|
||||||
|
export default router;
|
@ -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];
|
|
||||||
}
|
|
||||||
|
@ -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];
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user