Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-23 10:52:30 +01:00
Code Issues Releases Activity

Merge pull request #776 from MaddyUnderStars/fix/member_id

Browse Source 
Fix compile errors in latest
This commit is contained in:
Madeline 2022-06-26 23:35:31 +10:00 committed by GitHub
commit 9c6d0a98c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/src/routes/guilds/#guild_id/members/#member_id/index.ts
View File

@ -51,7 +51,7 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re
router.put("/", route({}), async (req: Request, res: Response) => { router.put("/", route({}), async (req: Request, res: Response) => {
// TODO: Lurker mode // TODO: Lurker mode
const rights = await getRights(req.user_id); const rights = await getRights(req.user_id);
let { guild_id, member_id } = req.params; let { guild_id, member_id } = req.params;
@ -59,28 +59,33 @@ router.put("/", route({}), async (req: Request, res: Response) => {
member_id = req.user_id; member_id = req.user_id;
rights.hasThrow("JOIN_GUILDS"); rights.hasThrow("JOIN_GUILDS");
} else { } else {
// TODO: join others by controller // TODO: join others by controller
} }
var guild = await Guild.findOneOrFail({ var guild = await Guild.findOneOrFail({
where: { id: guild_id } }); where: { id: guild_id }
});
var emoji = await Emoji.find({ var emoji = await Emoji.find({
where: { guild_id: guild_id } }); where: { guild_id: guild_id }
});
var roles = await Role.find({ var roles = await Role.find({
where: { guild_id: guild_id } }); where: { guild_id: guild_id }
});
var stickers = await Sticker.find({ var stickers = await Sticker.find({
where: { guild_id: guild_id } }); where: { guild_id: guild_id }
});
await Member.addToGuild(member_id, guild_id); await Member.addToGuild(member_id, guild_id);
res.send({...guild, emojis: emoji, roles: roles, stickers: stickers}); res.send({ ...guild, emojis: emoji, roles: roles, stickers: stickers });
}); });
router.delete("/", route(), async (req: Request, res: Response) => { router.delete("/", route({}), async (req: Request, res: Response) => {
const permission = await getPermission(req.user_id); const permission = await getPermission(req.user_id);
const rights = await getRights(req.user_id); const rights = await getRights(req.user_id);
const { guild_id, member_id } = req.params;
if (member_id !== "@me" || member_id === req.user_id) { if (member_id !== "@me" || member_id === req.user_id) {
// TODO: unless force-joined // TODO: unless force-joined
rights.hasThrow("SELF_LEAVE_GROUPS"); rights.hasThrow("SELF_LEAVE_GROUPS");
@ -88,7 +93,6 @@ router.delete("/", route(), async (req: Request, res: Response) => {
rights.hasThrow("KICK_BAN_MEMBERS"); rights.hasThrow("KICK_BAN_MEMBERS");
permission.hasThrow("KICK_MEMBERS"); permission.hasThrow("KICK_MEMBERS");
} }
const { guild_id, member_id } = req.params;
await Member.removeFromGuild(member_id, guild_id); await Member.removeFromGuild(member_id, guild_id);
res.sendStatus(204); res.sendStatus(204);