From 759e93bec4e9e2eb86db7434007345c24b0a0252 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Sun, 16 May 2021 22:03:18 -0400 Subject: fix logging for slash command syncing v2, delete BotMessage and BotGuild because useless, add prefix slash command --- src/commands/moderation/ban.ts | 4 ++-- src/commands/moderation/kick.ts | 5 ++--- src/commands/moderation/warn.ts | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/commands/moderation') diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index 7ce36d3..3858290 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -1,9 +1,9 @@ import { User } from 'discord.js'; import { Guild } from '../../lib/models'; import { BotCommand } from '../../lib/extensions/BotCommand'; -import { BotMessage } from '../../lib/extensions/BotMessage'; import { Ban, Modlog, ModlogType } from '../../lib/models'; import moment from 'moment'; +import { Message } from 'discord.js'; const durationAliases: Record = { weeks: ['w', 'weeks', 'week', 'wk', 'wks'], @@ -51,7 +51,7 @@ export default class PrefixCommand extends BotCommand { }); } async exec( - message: BotMessage, + message: Message, { user, reason, time }: { user: User; reason?: string; time?: string } ): Promise { const duration = moment.duration(); diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts index 23fc092..7b04d5a 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -1,7 +1,6 @@ import { BotCommand } from '../../lib/extensions/BotCommand'; -import { BotMessage } from '../../lib/extensions/BotMessage'; import { Guild, Modlog, ModlogType } from '../../lib/models'; -import { GuildMember } from 'discord.js'; +import { GuildMember, Message } from 'discord.js'; export default class PrefixCommand extends BotCommand { constructor() { @@ -30,7 +29,7 @@ export default class PrefixCommand extends BotCommand { }); } async exec( - message: BotMessage, + message: Message, { user, reason }: { user: GuildMember; reason?: string } ): Promise { let modlogEnry: Modlog; diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts index 98ba4bd..41e0032 100644 --- a/src/commands/moderation/warn.ts +++ b/src/commands/moderation/warn.ts @@ -1,6 +1,5 @@ -import { GuildMember } from 'discord.js'; +import { GuildMember, Message } from 'discord.js'; import { BotCommand } from '../../lib/extensions/BotCommand'; -import { BotMessage } from '../../lib/extensions/BotMessage'; import { Guild, Modlog, ModlogType } from '../../lib/models'; export default class WarnCommand extends BotCommand { @@ -26,7 +25,7 @@ export default class WarnCommand extends BotCommand { }); } public async exec( - message: BotMessage, + message: Message, { member, reason }: { member: GuildMember; reason: string } ): Promise { // Create guild entry so postgres doesn't get mad when I try and add a modlog entry -- cgit