diff --git a/api/src/routes/guilds/#guild_id/roles.ts b/api/src/routes/guilds/#guild_id/roles.ts
index f095c885..f6ac8caa 100644
--- a/api/src/routes/guilds/#guild_id/roles.ts
+++ b/api/src/routes/guilds/#guild_id/roles.ts
@@ -1,12 +1,9 @@
import { Request, Response, Router } from "express";
import {
- RoleModel,
- GuildModel,
+ Role,
getPermission,
- toObject,
- UserModel,
Snowflake,
- MemberModel,
+ Member,
GuildRoleCreateEvent,
GuildRoleUpdateEvent,
GuildRoleDeleteEvent,
@@ -16,40 +13,34 @@ import { HTTPError } from "lambert-server";
import { check } from "../../../util/instanceOf";
import { RoleModifySchema } from "../../../schema/Roles";
-import { getPublicUser } from "../../../util/User";
-import { isMember } from "../../../util/Member";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
const guild_id = req.params.guild_id;
- await isMember(req.user_id, guild_id);
+ await Member.IsInGuildOrFail(req.user_id, guild_id);
- const roles = await RoleModel.find({ guild_id: guild_id }).exec();
+ const roles = await Role.find({ guild_id: guild_id });
- return res.json(toObject(roles));
+ return res.json(roles);
});
router.post("/", check(RoleModifySchema), async (req: Request, res: Response) => {
const guild_id = req.params.guild_id;
const body = req.body as RoleModifySchema;
- const guild = await GuildModel.findOne({ id: guild_id }, { id: true }).exec();
- const user = await UserModel.findOne({ id: req.user_id }).exec();
-
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_ROLES");
- if (!body.name) throw new HTTPError("You need to specify a name");
- const role = await new RoleModel({
+ const role = await new Role({
...body,
id: Snowflake.generate(),
guild_id: guild_id,
managed: false,
position: 0,
tags: null,
- permissions: body.permissions || 0n
+ permissions: String(perms.bitfield & (body.permissions || 0n))
}).save();
await emitEvent({
@@ -57,11 +48,11 @@ router.post("/", check(RoleModifySchema), async (req: Request, res: Response) =>
guild_id,
data: {
guild_id,
- role: toObject(role)
+ role: role
}
} as GuildRoleCreateEvent);
- res.json(toObject(role));
+ res.json(role);
});
router.delete("/:role_id", async (req: Request, res: Response) => {
@@ -72,19 +63,20 @@ router.delete("/:role_id", async (req: Request, res: Response) => {
const permissions = await getPermission(req.user_id, guild_id);
permissions.hasThrow("MANAGE_ROLES");
- await RoleModel.deleteOne({
- id: role_id,
- guild_id: guild_id
- }).exec();
-
- await emitEvent({
- event: "GUILD_ROLE_DELETE",
- guild_id,
- data: {
+ await Promise.all([
+ Role.delete({
+ id: role_id,
+ guild_id: guild_id
+ }),
+ emitEvent({
+ event: "GUILD_ROLE_DELETE",
guild_id,
- role_id
- }
- } as GuildRoleDeleteEvent);
+ data: {
+ guild_id,
+ role_id
+ }
+ } as GuildRoleDeleteEvent)
+ ]);
res.sendStatus(204);
});
@@ -96,32 +88,24 @@ router.patch("/:role_id", check(RoleModifySchema), async (req: Request, res: Res
const { role_id } = req.params;
const body = req.body as RoleModifySchema;
- const guild = await GuildModel.findOne({ id: guild_id }, { id: true }).exec();
- const user = await UserModel.findOne({ id: req.user_id }).exec();
-
const perms = await getPermission(req.user_id, guild_id);
perms.hasThrow("MANAGE_ROLES");
- const role = await RoleModel.findOneAndUpdate(
- {
- id: role_id,
- guild_id: guild_id
- },
- // @ts-ignore
- body,
- { new: true }
- ).exec();
+ const role = new Role({ ...body, id: role_id, guild_id, permissions: perms.bitfield & (body.permissions || 0n) });
- await emitEvent({
- event: "GUILD_ROLE_UPDATE",
- guild_id,
- data: {
+ await Promise.all([
+ role.save(),
+ emitEvent({
+ event: "GUILD_ROLE_UPDATE",
guild_id,
- role
- }
- } as GuildRoleUpdateEvent);
-
- res.json(toObject(role));
+ data: {
+ guild_id,
+ role
+ }
+ } as GuildRoleUpdateEvent)
+ ]);
+
+ res.json(role);
});
export default router;
|
