diff options
| author | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2021-09-06 11:30:16 -0400 |
|---|---|---|
| committer | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2021-09-06 11:30:16 -0400 |
| commit | b2ea3e7f142d47d19819893eb1c5fe9e8a31f87c (patch) | |
| tree | c69b6a93c37c81c7b305cf95713b8c3cbf0a9d22 /src/inhibitors | |
| parent | e3c116e0f4b741032fe777936fdf5d80f0b011e6 (diff) | |
| download | tanzanite-b2ea3e7f142d47d19819893eb1c5fe9e8a31f87c.tar.gz tanzanite-b2ea3e7f142d47d19819893eb1c5fe9e8a31f87c.tar.bz2 tanzanite-b2ea3e7f142d47d19819893eb1c5fe9e8a31f87c.zip | |
change channel overrides to not use superusers
Diffstat (limited to 'src/inhibitors')
| -rw-r--r-- | src/inhibitors/blacklist/channelGlobalBlacklist.ts | 2 | ||||
| -rw-r--r-- | src/inhibitors/blacklist/channelGuildBlacklist.ts | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/inhibitors/blacklist/channelGlobalBlacklist.ts b/src/inhibitors/blacklist/channelGlobalBlacklist.ts index 36a6757..d870307 100644 --- a/src/inhibitors/blacklist/channelGlobalBlacklist.ts +++ b/src/inhibitors/blacklist/channelGlobalBlacklist.ts @@ -12,7 +12,7 @@ export default class UserGlobalBlacklistInhibitor extends BushInhibitor { public override exec(message: BushMessage | BushSlashMessage): boolean { if (!message.author || !message.guild) return false; - if (client.isOwner(message.author) || client.isSuperUser(message.author) || client.user!.id === message.author.id) + if (client.isOwner(message.author) || /* client.isSuperUser(message.author) ||*/ client.user!.id === message.author.id) return false; if (client.cache.global.blacklistedChannels.includes(message.channel!.id)) { return true; diff --git a/src/inhibitors/blacklist/channelGuildBlacklist.ts b/src/inhibitors/blacklist/channelGuildBlacklist.ts index 54acb34..d02408c 100644 --- a/src/inhibitors/blacklist/channelGuildBlacklist.ts +++ b/src/inhibitors/blacklist/channelGuildBlacklist.ts @@ -12,8 +12,9 @@ export default class ChannelGuildBlacklistInhibitor extends BushInhibitor { public override async exec(message: BushMessage | BushSlashMessage): Promise<boolean> { if (!message.author || !message.guild) return false; - if (client.isOwner(message.author) || client.isSuperUser(message.author) || client.user!.id === message.author.id) + if (client.isOwner(message.author) || /* client.isSuperUser(message.author) || */ client.user!.id === message.author.id) return false; + if ((await message.guild.getSetting('bypassChannelBlacklist'))?.includes(message.author.id)) return false; if ((await message.guild.getSetting('blacklistedChannels'))?.includes(message.channel!.id)) { return true; } |