mirror of
https://github.com/spacebarchat/server.git
synced 2024-11-06 10:52:31 +01:00
Allow self-ban of non-owners
This commit is contained in:
parent
71d3e81b53
commit
af677c2342
@ -54,7 +54,8 @@ router.put("/:user_id", route({ body: "BanCreateSchema", permission: "BAN_MEMBER
|
|||||||
|
|
||||||
const banned_user = await User.getPublicUser(banned_user_id);
|
const banned_user = await User.getPublicUser(banned_user_id);
|
||||||
|
|
||||||
if (req.user_id === banned_user_id) throw new HTTPError("You can't ban yourself", 400);
|
if ( (req.user_id === banned_user_id) && (banned_user_id === req.permission!.cache.guild?.owner_id))
|
||||||
|
throw new HTTPError("You are the guild owner, hence can't ban yourself", 403);
|
||||||
if (req.permission!.cache.guild?.owner_id === banned_user_id) throw new HTTPError("You can't ban the owner", 400);
|
if (req.permission!.cache.guild?.owner_id === banned_user_id) throw new HTTPError("You can't ban the owner", 400);
|
||||||
|
|
||||||
const ban = new Ban({
|
const ban = new Ban({
|
||||||
@ -81,6 +82,38 @@ router.put("/:user_id", route({ body: "BanCreateSchema", permission: "BAN_MEMBER
|
|||||||
return res.json(ban);
|
return res.json(ban);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
router.put("/@me", route({ body: "BanCreateSchema"}), async (req: Request, res: Response) => {
|
||||||
|
// TODO: make self-bans irreversible
|
||||||
|
const { guild_id } = req.params;
|
||||||
|
|
||||||
|
const banned_user = await User.getPublicUser(req.params.user_id);
|
||||||
|
|
||||||
|
if (req.permission!.cache.guild?.owner_id === req.params.user_id)
|
||||||
|
throw new HTTPError("You are the guild owner, hence can't ban yourself", 403);
|
||||||
|
const ban = new Ban({
|
||||||
|
user_id: req.params.user_id,
|
||||||
|
guild_id: guild_id,
|
||||||
|
ip: getIpAdress(req),
|
||||||
|
executor_id: req.params.user_id,
|
||||||
|
reason: req.body.reason // || otherwise empty
|
||||||
|
});
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
Member.removeFromGuild(req.user_id, guild_id),
|
||||||
|
ban.save(),
|
||||||
|
emitEvent({
|
||||||
|
event: "GUILD_BAN_ADD",
|
||||||
|
data: {
|
||||||
|
guild_id: guild_id,
|
||||||
|
user: banned_user
|
||||||
|
},
|
||||||
|
guild_id: guild_id
|
||||||
|
} as GuildBanAddEvent)
|
||||||
|
]);
|
||||||
|
|
||||||
|
return res.json(ban);
|
||||||
|
});
|
||||||
|
|
||||||
router.delete("/:user_id", route({ permission: "BAN_MEMBERS" }), async (req: Request, res: Response) => {
|
router.delete("/:user_id", route({ permission: "BAN_MEMBERS" }), async (req: Request, res: Response) => {
|
||||||
const { guild_id, user_id } = req.params;
|
const { guild_id, user_id } = req.params;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user