smyalygames/arabot
1
0
Fork 0
mirror of https://github.com/veganhacktivists/arabot.git synced 2025-05-19 10:34:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(arabot): check if user is banned

Browse Source
This commit is contained in:
smyalygames 2022-10-28 03:03:01 +01:00
parent 556038ee80
commit 9d3f687473
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/commands/mod/unban.ts
View File

@ -20,7 +20,7 @@
import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import { Args, Command, RegisterBehavior } from '@sapphire/framework';
import type { User, Message, TextChannel } from 'discord.js'; import type { User, Message, TextChannel } from 'discord.js';
import IDs from '../../utils/ids'; import IDs from '../../utils/ids';
import { removeBan } from '../../utils/database/ban'; import { removeBan, checkActive } from '../../utils/database/ban';
class UnbanCommand extends Command { class UnbanCommand extends Command {
public constructor(context: Command.Context, options: Command.Options) { public constructor(context: Command.Context, options: Command.Options) {
@ -64,27 +64,26 @@ class UnbanCommand extends Command {
return; return;
} }
// Unban the user if (!await checkActive(user.id)) {
try {
await guild.members.unban(user);
} catch {
await interaction.reply({ await interaction.reply({
content: `${user} is not banned.`, content: `${user} is not banned.`,
ephemeral: true,
fetchReply: true,
}); });
return; return;
} }
// Unban the user
await guild.members.unban(user)
.catch(() => {});
// Add unban to database
await removeBan(user.id, mod.user.id);
await interaction.reply({ await interaction.reply({
content: `${user} has been unbanned.`, content: `${user} has been unbanned.`,
ephemeral: true, ephemeral: true,
fetchReply: true, fetchReply: true,
}); });
// Add unban to database
await removeBan(user.id, mod.user.id);
// Log the ban // Log the ban
let modRestrict = guild.channels.cache.get(IDs.channels.restricted.moderators) as TextChannel | undefined; let modRestrict = guild.channels.cache.get(IDs.channels.restricted.moderators) as TextChannel | undefined;
@ -127,10 +126,7 @@ class UnbanCommand extends Command {
return; return;
} }
// Unban the user if (!await checkActive(user.id)) {
try {
await guild.members.unban(user);
} catch {
await message.react('❌'); await message.react('❌');
await message.reply({ await message.reply({
content: `${user} is not banned.`, content: `${user} is not banned.`,
@ -138,11 +134,15 @@ class UnbanCommand extends Command {
return; return;
} }
await message.react('✅'); // Unban the user
await guild.members.unban(user)
.catch(() => {});
// Add unban to database // Add unban to database
await removeBan(user.id, mod.id); await removeBan(user.id, mod.id);
await message.react('✅');
await message.reply({ await message.reply({
content: `${user} has been unbanned.`, content: `${user} has been unbanned.`,
}); });