Galactic/galactic-bot
3
1
Fork 1
Code Issues 4 Pull Requests Projects 2 Releases Wiki Activity

proper perms checks

Browse Source
This commit is contained in:
Erik 2023-12-16 20:13:59 +02:00
parent dbf3dd8ed9
commit 7ca623c3c7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/components/settings/logging/Moderation.ts
View File

@ -89,17 +89,23 @@ class ModerationLog extends Setting
async execute (invoker: InvokerWrapper, opts: CommandParams, setting: ModerationSettings) async execute (invoker: InvokerWrapper, opts: CommandParams, setting: ModerationSettings)
{ {
const { channel, infractions, anonymous, enabled } = opts, const { channel, infractions, anonymous, enabled } = opts,
langParams: FormatParams = {}; langParams: FormatParams = {};
let index = 'SETTING_SUCCESS_ALT'; let index = 'SETTING_SUCCESS_ALT';
if (anonymous)
setting.anonymous = anonymous.asBool;
if (channel) if (channel)
{
const ch = channel.asChannel;
const perms = ch.permissionsFor(this.client.user!);
const missing = perms?.missing([ 'ViewChannel', 'SendMessages', 'EmbedLinks' ]);
if (!missing || missing.length)
return { error: true, index: 'ERR_BOT_MISSING_PERMISSIONS', params: { missing: missing?.join(', ') || 'Any' } };
setting.channel = channel.asChannel.id; setting.channel = channel.asChannel.id;
}
if (enabled) if (enabled)
setting.enabled = enabled.asBool; setting.enabled = enabled.asBool;
if (anonymous)
setting.anonymous = anonymous.asBool;
if (infractions) if (infractions)
{ {

6
src/client/interfaces/Infraction.ts
View File

@ -191,14 +191,14 @@ class Infraction
{ {
this.#moderationLog = await this.#guild.resolveChannel<TextChannel>(moderation.channel, true); this.#moderationLog = await this.#guild.resolveChannel<TextChannel>(moderation.channel, true);
const perms = this.#moderationLog?.permissionsFor(this.client.user!); const perms = this.#moderationLog?.permissionsFor(this.client.user!);
const missing = perms?.missing([ 'SendMessages', 'EmbedLinks' ]); const missing = perms?.missing([ 'ViewChannel', 'SendMessages', 'EmbedLinks' ]);
if (this.#moderationLog && !missing?.length) if (this.#moderationLog && !missing?.length)
{ {
this.#modLogId = this.#moderationLog.id; this.#modLogId = this.#moderationLog.id;
this.#dmLogMessage = await this.#moderationLog this.#modLogMessage = await this.#moderationLog
.send({ embeds: [ await this.#embed() ] }) .send({ embeds: [ await this.#embed() ] })
.catch((err) => this.logger.error(err)) ?? null; .catch((err) => this.logger.error(err)) ?? null;
this.#modLogMessageId = this.#dmLogMessage?.id || null; this.#modLogMessageId = this.#modLogMessage?.id || null;
} }
} }
else else