diff --git a/api/src/routes/guilds/#guild_id/index.ts b/api/src/routes/guilds/#guild_id/index.ts
index 87103caa..6f55be3b 100644
--- a/api/src/routes/guilds/#guild_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/index.ts
@@ -1,19 +1,5 @@
import { Request, Response, Router } from "express";
-import {
- ChannelModel,
- emitEvent,
- EmojiModel,
- getPermission,
- GuildDeleteEvent,
- GuildModel,
- GuildUpdateEvent,
- InviteModel,
- MemberModel,
- MessageModel,
- RoleModel,
- toObject,
- UserModel
-} from "@fosscord/util";
+import { emitEvent, getPermission, Guild, GuildUpdateEvent, Member } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { GuildUpdateSchema } from "../../../schema/Guild";
@@ -26,12 +12,15 @@ const router = Router();
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
- const guild = await GuildModel.findOne({ id: guild_id })
- .populate({ path: "joined_at", match: { id: req.user_id } })
- .exec();
+ const [guild, member_count, member] = await Promise.all([
+ Guild.findOneOrFail({ id: guild_id }),
+ Member.count({ guild: { id: guild_id }, id: req.user_id }),
+ Member.findOneOrFail({ id: req.user_id })
+ ]);
+ if (!member_count) throw new HTTPError("You are not a member of the guild you are trying to access", 401);
- const member = await MemberModel.exists({ guild_id: guild_id, id: req.user_id });
- if (!member) throw new HTTPError("You are not a member of the guild you are trying to access", 401);
+ // @ts-ignore
+ guild.joined_at = member?.joined_at;
return res.json(guild);
});
@@ -48,15 +37,12 @@ router.patch("/", check(GuildUpdateSchema), async (req: Request, res: Response)
if (body.banner) body.banner = await handleFile(`/banners/${guild_id}`, body.banner);
if (body.splash) body.splash = await handleFile(`/splashes/${guild_id}`, body.splash);
- const guild = await GuildModel.findOneAndUpdate({ id: guild_id }, body, { new: true })
- .populate({ path: "joined_at", match: { id: req.user_id } })
- .exec();
+ const guild = await Guild.findOneOrFail({ id: guild_id });
+ guild.assign(body);
- const data = toObject(guild);
+ await Promise.all([guild.save(), emitEvent({ event: "GUILD_UPDATE", data: guild, guild_id } as GuildUpdateEvent)]);
- emitEvent({ event: "GUILD_UPDATE", data: data, guild_id } as GuildUpdateEvent);
-
- return res.json(data);
+ return res.json(guild);
});
export default router;
|
