Skip to content

Commit

Permalink
Merge pull request #1104 from skyrina/urgent-fix
Browse files Browse the repository at this point in the history
what the hell erkin
  • Loading branch information
MaddyUnderStars authored Dec 15, 2023
2 parents 6a4fd5f + 864bf75 commit beaf9fa
Showing 1 changed file with 0 additions and 55 deletions.
55 changes: 0 additions & 55 deletions src/api/routes/guilds/#guild_id/bans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,58 +178,6 @@ router.put(
},
);

router.put(
"/@me",
route({
requestBody: "BanCreateSchema",
responses: {
200: {
body: "Ban",
},
400: {
body: "APIErrorResponse",
},
403: {
body: "APIErrorResponse",
},
},
}),
async (req: Request, res: Response) => {
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 = Ban.create({
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({
Expand All @@ -251,9 +199,6 @@ router.delete(
where: { guild_id: guild_id, user_id: user_id },
});

if (ban.user_id === ban.executor_id) throw DiscordApiErrors.UNKNOWN_BAN;
// make self-bans irreversible and hide them from view to avoid victim chasing

const banned_user = await User.getPublicUser(user_id);

await Promise.all([
Expand Down

0 comments on commit beaf9fa

Please sign in to comment.