From af882627a193620eaa1b0d0c004eb04554b1471a Mon Sep 17 00:00:00 2001 From: roflmaoqwerty Date: Sat, 11 Jan 2020 00:39:32 +1100 Subject: [PATCH] changed almost all references of utils successMessage to this.sendSuccessMessage. Waiting on knub changes to finish this --- .vscode/launch.json | 33 ++++++++++ backend/src/configValidator.ts | 1 + backend/src/index.ts | 9 +-- backend/src/plugins/AutoReactionsPlugin.ts | 4 +- backend/src/plugins/BotControl.ts | 8 +-- backend/src/plugins/LocateUser.ts | 2 +- backend/src/plugins/MessageSaver.ts | 21 ++----- backend/src/plugins/ModActions.ts | 62 ++++++++----------- backend/src/plugins/Mutes.ts | 8 +-- backend/src/plugins/PingableRolesPlugin.ts | 6 +- backend/src/plugins/ReactionRoles.ts | 6 +- backend/src/plugins/Reminders.ts | 8 +-- .../src/plugins/SelfGrantableRolesPlugin.ts | 34 ++++------ backend/src/plugins/Slowmode.ts | 8 +-- backend/src/plugins/Tags.ts | 4 +- backend/src/plugins/Utility.ts | 14 ++--- backend/src/utils.ts | 4 +- 17 files changed, 112 insertions(+), 120 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..f94336b2 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,33 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "attach", + "name": "Attach by Process ID", + "processId": "${command:PickProcess}", + "skipFiles": [ + "/**" + ], + "sourceMaps": true, + "outFiles": [ + "${workspaceFolder}/**/*.js" + ] + }, + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "skipFiles": [ + "/**" + ], + "program": "${workspaceFolder}\\backend\\src\\utils.ts", + "outFiles": [ + "${workspaceFolder}/backend/dist/backend/src/*.js" + ] + } + ] +} \ No newline at end of file diff --git a/backend/src/configValidator.ts b/backend/src/configValidator.ts index 6411477b..d83a9b4d 100644 --- a/backend/src/configValidator.ts +++ b/backend/src/configValidator.ts @@ -16,6 +16,7 @@ for (const pluginClass of availablePlugins) { const guildConfigRootSchema = t.type({ prefix: t.string, levels: t.record(t.string, t.number), + success_emoji: t.string, plugins: t.record(t.string, t.unknown), }); const partialGuildConfigRootSchema = t.partial(guildConfigRootSchema.props); diff --git a/backend/src/index.ts b/backend/src/index.ts index 1128735d..a2af241c 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -4,7 +4,7 @@ import yaml from "js-yaml"; import fs from "fs"; const fsp = fs.promises; -import { Knub, logger, PluginError, Plugin } from "knub"; +import { Knub, logger, PluginError, Plugin, IGuildConfig } from "knub"; import { SimpleError } from "./SimpleError"; import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line @@ -67,7 +67,7 @@ for (const [i, part] of actualVersionParts.entries()) { import moment from "moment-timezone"; moment.tz.setDefault("UTC"); -import { Client } from "eris"; +import { Client, TextableChannel, TextChannel } from "eris"; import { connect } from "./data/db"; import { availablePlugins, availableGlobalPlugins, basePlugins } from "./plugins/availablePlugins"; import { ZeppelinPlugin } from "./plugins/ZeppelinPlugin"; @@ -160,8 +160,9 @@ connect().then(async conn => { customArgumentTypes, - sendSuccessMessageFn(channel, body) { - channel.createMessage(successMessage(body)); + sendSuccessMessageFn(channel: TextChannel, body) { + let config: IGuildConfig = this.getConfig(channel.guild.id); + channel.createMessage(successMessage(config., body)); }, sendErrorMessageFn(channel, body) { diff --git a/backend/src/plugins/AutoReactionsPlugin.ts b/backend/src/plugins/AutoReactionsPlugin.ts index aefe713d..00e95fba 100644 --- a/backend/src/plugins/AutoReactionsPlugin.ts +++ b/backend/src/plugins/AutoReactionsPlugin.ts @@ -93,7 +93,7 @@ export class AutoReactionsPlugin extends ZeppelinPlugin { } await this.autoReactions.set(args.channelId, finalReactions); - msg.channel.createMessage(successMessage(`Auto-reactions set for <#${args.channelId}>`)); + this.sendSuccessMessage(msg.channel, `Auto-reactions set for <#${args.channelId}>`); } @d.command("auto_reactions disable", "", { @@ -112,7 +112,7 @@ export class AutoReactionsPlugin extends ZeppelinPlugin { } await this.autoReactions.removeFromChannel(args.channelId); - msg.channel.createMessage(successMessage(`Auto-reactions disabled in <#${args.channelId}>`)); + this.sendSuccessMessage(msg.channel, `Auto-reactions disabled in <#${args.channelId}>`); } async onMessageCreate(msg: SavedMessage) { diff --git a/backend/src/plugins/BotControl.ts b/backend/src/plugins/BotControl.ts index 8ab6af4f..1cb5f85a 100644 --- a/backend/src/plugins/BotControl.ts +++ b/backend/src/plugins/BotControl.ts @@ -60,7 +60,7 @@ export class BotControlPlugin extends GlobalZeppelinPlugin { if (guild) { const channel = guild.channels.get(channelId); if (channel instanceof TextChannel) { - channel.createMessage(successMessage("Global plugins reloaded!")); + this.sendSuccessMessage(channel, "Global plugins reloaded!"); } } } @@ -157,7 +157,7 @@ export class BotControlPlugin extends GlobalZeppelinPlugin { return; } - msg.channel.createMessage(successMessage(`Left guild **${guildName}**`)); + this.sendSuccessMessage(msg.channel, `Left guild **${guildName}**`); } @d.command("reload_guild", "") @@ -176,7 +176,7 @@ export class BotControlPlugin extends GlobalZeppelinPlugin { } const guild = this.bot.guilds.get(args.guildId); - msg.channel.createMessage(successMessage(`Reloaded guild **${guild.name}**`)); + this.sendSuccessMessage(msg.channel, `Reloaded guild **${guild.name}**`); } @d.command("reload_all_guilds") @@ -203,7 +203,7 @@ export class BotControlPlugin extends GlobalZeppelinPlugin { }); createChunkedMessage(msg.channel, `Reloaded ${reloadCount} guild(s). Errors:\n${errorLines.join("\n")}`); } else { - msg.channel.createMessage(successMessage(`Reloaded ${reloadCount} guild(s)`)); + this.sendSuccessMessage(msg.channel, `Reloaded ${reloadCount} guild(s)`); } } diff --git a/backend/src/plugins/LocateUser.ts b/backend/src/plugins/LocateUser.ts index 7116cfe0..c79ff368 100644 --- a/backend/src/plugins/LocateUser.ts +++ b/backend/src/plugins/LocateUser.ts @@ -152,7 +152,7 @@ export class LocatePlugin extends ZeppelinPlugin { const toDelete = alerts[args.num - 1]; await this.alerts.delete(toDelete.id); - msg.channel.createMessage(successMessage("Alert deleted")); + this.sendSuccessMessage(msg.channel, "Alert deleted"); } @d.event("voiceChannelJoin") diff --git a/backend/src/plugins/MessageSaver.ts b/backend/src/plugins/MessageSaver.ts index ae413f33..a3e1caf5 100644 --- a/backend/src/plugins/MessageSaver.ts +++ b/backend/src/plugins/MessageSaver.ts @@ -108,14 +108,9 @@ export class MessageSaverPlugin extends ZeppelinPlugin { const { savedCount, failed } = await this.saveMessagesToDB(args.channel, args.ids); if (failed.length) { - msg.channel.createMessage( - successMessage( - `Saved ${savedCount} messages. The following messages could not be saved: ${failed.join(", ")} - `, - ), - ); + this.sendSuccessMessage(msg.channel, `Saved ${savedCount} messages. The following messages could not be saved: ${failed.join(", ")}`); } else { - msg.channel.createMessage(successMessage(`Saved ${savedCount} messages!`)); + this.sendSuccessMessage(msg.channel, `Saved ${savedCount} messages!`); } } @@ -131,14 +126,10 @@ export class MessageSaverPlugin extends ZeppelinPlugin { ); if (failed.length) { - msg.channel.createMessage( - successMessage( - `Saved ${savedCount} messages. The following messages could not be saved: ${failed.join(", ")} - `, - ), - ); - } else { - msg.channel.createMessage(successMessage(`Saved ${savedCount} messages!`)); + this.sendSuccessMessage(msg.channel, `Saved ${savedCount} messages. The following messages could not be saved: ${failed.join(", ")}`); + } + else { + this.sendSuccessMessage(msg.channel, `Saved ${savedCount} messages!`); } } } diff --git a/backend/src/plugins/ModActions.ts b/backend/src/plugins/ModActions.ts index 9e0ce862..0b02af1c 100644 --- a/backend/src/plugins/ModActions.ts +++ b/backend/src/plugins/ModActions.ts @@ -530,7 +530,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { note, }); - msg.channel.createMessage(successMessage(`Case \`#${theCase.case_number}\` updated`)); + this.sendSuccessMessage(msg.channel, `Case \`#${theCase.case_number}\` updated`); } @d.command("note", " ", { @@ -624,11 +624,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { const messageResultText = warnResult.notifyResult.text ? ` (${warnResult.notifyResult.text})` : ""; - msg.channel.createMessage( - successMessage( - `Warned **${memberToWarn.user.username}#${memberToWarn.user.discriminator}** (Case #${warnResult.case.case_number})${messageResultText}`, - ), - ); + this.sendSuccessMessage(msg.channel, `Warned **${memberToWarn.user.username}#${memberToWarn.user.discriminator}** (Case #${warnResult.case.case_number})${messageResultText}`); } async warnMember( @@ -862,22 +858,18 @@ export class ModActionsPlugin extends ZeppelinPlugin { // Confirm the action to the moderator if (args.time) { const timeUntilUnmute = args.time && humanizeDuration(args.time); - msg.channel.createMessage( - successMessage( - asSingleLine(` - Unmuting **${user.username}#${user.discriminator}** - in ${timeUntilUnmute} (Case #${result.case.case_number}) - `), - ), + this.sendSuccessMessage(msg.channel, + asSingleLine(` + Unmuting **${user.username}#${user.discriminator}** + in ${timeUntilUnmute} (Case #${result.case.case_number}) + `), ); } else { - msg.channel.createMessage( - successMessage( - asSingleLine(` - Unmuted **${user.username}#${user.discriminator}** - (Case #${result.case.case_number}) - `), - ), + this.sendSuccessMessage(msg.channel, + asSingleLine(` + Unmuted **${user.username}#${user.discriminator}** + (Case #${result.case.case_number}) + `), ); } } @@ -1019,7 +1011,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { let response = `Kicked **${memberToKick.user.username}#${memberToKick.user.discriminator}** (Case #${kickResult.case.case_number})`; if (kickResult.notifyResult.text) response += ` (${kickResult.notifyResult.text})`; - msg.channel.createMessage(successMessage(response)); + this.sendSuccessMessage(msg.channel, response); } @d.command("ban", " [reason:string$]", { @@ -1080,7 +1072,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { let response = `Banned **${memberToBan.user.username}#${memberToBan.user.discriminator}** (Case #${banResult.case.case_number})`; if (banResult.notifyResult.text) response += ` (${banResult.notifyResult.text})`; - msg.channel.createMessage(successMessage(response)); + this.sendSuccessMessage(msg.channel, response); } @d.command("softban", " [reason:string$]", { @@ -1160,10 +1152,8 @@ export class ModActionsPlugin extends ZeppelinPlugin { }); // Confirm the action to the moderator - msg.channel.createMessage( - successMessage( - `Softbanned **${memberToSoftban.user.username}#${memberToSoftban.user.discriminator}** (Case #${createdCase.case_number})`, - ), + this.sendSuccessMessage(msg.channel, + `Softbanned **${memberToSoftban.user.username}#${memberToSoftban.user.discriminator}** (Case #${createdCase.case_number})`, ); // Log the action @@ -1220,7 +1210,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { }); // Confirm the action - msg.channel.createMessage(successMessage(`Member unbanned (Case #${createdCase.case_number})`)); + this.sendSuccessMessage(msg.channel, `Member unbanned (Case #${createdCase.case_number})`); // Log the action this.serverLogs.log(LogType.MEMBER_UNBAN, { @@ -1290,7 +1280,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { }); // Confirm the action - msg.channel.createMessage(successMessage(`Member forcebanned (Case #${createdCase.case_number})`)); + this.sendSuccessMessage(msg.channel, `Member forcebanned (Case #${createdCase.case_number})`); // Log the action this.serverLogs.log(LogType.MEMBER_FORCEBAN, { @@ -1378,11 +1368,11 @@ export class ModActionsPlugin extends ZeppelinPlugin { }); if (failedBans.length) { - msg.channel.createMessage( - successMessage(`Banned ${successfulBanCount} users, ${failedBans.length} failed: ${failedBans.join(" ")}`), + this.sendSuccessMessage(msg.channel, + `Banned ${successfulBanCount} users, ${failedBans.length} failed: ${failedBans.join(" ")}`, ); } else { - msg.channel.createMessage(successMessage(`Banned ${successfulBanCount} users successfully`)); + this.sendSuccessMessage(msg.channel, `Banned ${successfulBanCount} users successfully`); } } } @@ -1438,11 +1428,11 @@ export class ModActionsPlugin extends ZeppelinPlugin { }); if (user) { - msg.channel.createMessage( - successMessage(`Case #${theCase.case_number} created for **${user.username}#${user.discriminator}**`), + this.sendSuccessMessage(msg.channel, + `Case #${theCase.case_number} created for **${user.username}#${user.discriminator}**`, ); } else { - msg.channel.createMessage(successMessage(`Case #${theCase.case_number} created`)); + this.sendSuccessMessage(msg.channel, `Case #${theCase.case_number} created`); } // Log the action @@ -1603,8 +1593,8 @@ export class ModActionsPlugin extends ZeppelinPlugin { } await this.cases.setHidden(theCase.id, true); - msg.channel.createMessage( - successMessage(`Case #${theCase.case_number} is now hidden! Use \`unhidecase\` to unhide it.`), + this.sendSuccessMessage(msg.channel, + `Case #${theCase.case_number} is now hidden! Use \`unhidecase\` to unhide it.`, ); } diff --git a/backend/src/plugins/Mutes.ts b/backend/src/plugins/Mutes.ts index e907bcd6..1f060991 100644 --- a/backend/src/plugins/Mutes.ts +++ b/backend/src/plugins/Mutes.ts @@ -473,7 +473,7 @@ export class MutesPlugin extends ZeppelinPlugin { // let the user know we are done if (chunks.length > 2) { - msg.channel.createMessage(successMessage("All mutes for the specified filters posted!")); + this.sendSuccessMessage(msg.channel, "All mutes for the specified filters posted!"); } } @@ -530,7 +530,7 @@ export class MutesPlugin extends ZeppelinPlugin { } } - msg.channel.createMessage(successMessage(`Cleared ${cleared} mutes from banned users!`)); + this.sendSuccessMessage(msg.channel, `Cleared ${cleared} mutes from banned users!`); } /** @@ -572,7 +572,7 @@ export class MutesPlugin extends ZeppelinPlugin { } } - msg.channel.createMessage(successMessage(`Cleared ${cleared} mutes from members that don't have the mute role`)); + this.sendSuccessMessage(msg.channel, `Cleared ${cleared} mutes from members that don't have the mute role`); } @d.command("clear_mute", "") @@ -585,7 +585,7 @@ export class MutesPlugin extends ZeppelinPlugin { } await this.mutes.clear(args.userId); - msg.channel.createMessage(successMessage(`Active mute cleared`)); + this.sendSuccessMessage(msg.channel, `Active mute cleared`); } protected async clearExpiredMutes() { diff --git a/backend/src/plugins/PingableRolesPlugin.ts b/backend/src/plugins/PingableRolesPlugin.ts index 895f042f..e9036163 100644 --- a/backend/src/plugins/PingableRolesPlugin.ts +++ b/backend/src/plugins/PingableRolesPlugin.ts @@ -69,8 +69,8 @@ export class PingableRolesPlugin extends ZeppelinPlugin { await this.pingableRoles.delete(args.channelId, args.role.id); this.cache.delete(args.channelId); - msg.channel.createMessage( - successMessage(`**${args.role.name}** is no longer set as pingable in <#${args.channelId}>`), + this.sendSuccessMessage(msg.channel, + `**${args.role.name}** is no longer set as pingable in <#${args.channelId}>`, ); } @@ -88,7 +88,7 @@ export class PingableRolesPlugin extends ZeppelinPlugin { await this.pingableRoles.add(args.channelId, args.role.id); this.cache.delete(args.channelId); - msg.channel.createMessage(successMessage(`**${args.role.name}** has been set as pingable in <#${args.channelId}>`)); + this.sendSuccessMessage(msg.channel, `**${args.role.name}** has been set as pingable in <#${args.channelId}>`); } @d.event("typingStart") diff --git a/backend/src/plugins/ReactionRoles.ts b/backend/src/plugins/ReactionRoles.ts index b07609d9..1e913002 100644 --- a/backend/src/plugins/ReactionRoles.ts +++ b/backend/src/plugins/ReactionRoles.ts @@ -237,7 +237,7 @@ export class ReactionRolesPlugin extends ZeppelinPlugin { const targetMessage = await channel.getMessage(savedMessage.id); await targetMessage.removeReactions(); - msg.channel.createMessage(successMessage("Reaction roles cleared")); + this.sendSuccessMessage(msg.channel, "Reaction roles cleared"); } /** @@ -259,7 +259,7 @@ export class ReactionRolesPlugin extends ZeppelinPlugin { await this.refreshReactionRoles(savedMessage.channel_id, savedMessage.id); - msg.channel.createMessage(successMessage("Reaction roles refreshed")); + this.sendSuccessMessage(msg.channel, "Reaction roles refreshed"); } /** @@ -346,7 +346,7 @@ export class ReactionRolesPlugin extends ZeppelinPlugin { const reactionRoles = await this.reactionRoles.getForMessage(targetMessage.id); await this.applyReactionRoleReactionsToMessage(targetMessage.channel.id, targetMessage.id, reactionRoles); - msg.channel.createMessage(successMessage("Reaction roles added")); + this.sendSuccessMessage(msg.channel, "Reaction roles added"); } /** diff --git a/backend/src/plugins/Reminders.ts b/backend/src/plugins/Reminders.ts index dd1767e0..810ce277 100644 --- a/backend/src/plugins/Reminders.ts +++ b/backend/src/plugins/Reminders.ts @@ -147,11 +147,7 @@ export class RemindersPlugin extends ZeppelinPlugin { const msUntilReminder = reminderTime.diff(now); const timeUntilReminder = humanizeDuration(msUntilReminder, { largest: 2, round: true }); - msg.channel.createMessage( - successMessage( - `I will remind you in **${timeUntilReminder}** at **${reminderTime.format("YYYY-MM-DD, HH:mm")}**`, - ), - ); + this.sendSuccessMessage(msg.channel, `I will remind you in **${timeUntilReminder}** at **${reminderTime.format("YYYY-MM-DD, HH:mm")}**`); } @d.command("reminders") @@ -194,6 +190,6 @@ export class RemindersPlugin extends ZeppelinPlugin { const toDelete = reminders[args.num - 1]; await this.reminders.delete(toDelete.id); - msg.channel.createMessage(successMessage("Reminder deleted")); + this.sendSuccessMessage(msg.channel, "Reminder deleted"); } } diff --git a/backend/src/plugins/SelfGrantableRolesPlugin.ts b/backend/src/plugins/SelfGrantableRolesPlugin.ts index 232898be..0708ad02 100644 --- a/backend/src/plugins/SelfGrantableRolesPlugin.ts +++ b/backend/src/plugins/SelfGrantableRolesPlugin.ts @@ -109,19 +109,15 @@ export class SelfGrantableRolesPlugin extends ZeppelinPlugin { const removedRolesWord = rolesToRemoveArr.length === 1 ? "role" : "roles"; if (nonMatchingRoleNames.length) { - msg.channel.createMessage( - successMessage( - `<@!${msg.author.id}> Removed ${removedRolesStr.join(", ")} ${removedRolesWord};` + - ` couldn't recognize the other roles you mentioned`, - ), + this.sendSuccessMessage(msg.channel, + `<@!${msg.author.id}> Removed ${removedRolesStr.join(", ")} ${removedRolesWord};` + + ` couldn't recognize the other roles you mentioned`, ); } else { - msg.channel.createMessage( - successMessage(`<@!${msg.author.id}> Removed ${removedRolesStr.join(", ")} ${removedRolesWord}`), - ); + this.sendSuccessMessage(msg.channel, `<@!${msg.author.id}> Removed ${removedRolesStr.join(", ")} ${removedRolesWord}`); } } catch (e) { - msg.channel.createMessage(errorMessage(`<@!${msg.author.id}> Got an error while trying to remove the roles`)); + this.sendSuccessMessage(msg.channel, `<@!${msg.author.id}> Got an error while trying to remove the roles`); } } else { msg.channel.createMessage( @@ -193,16 +189,12 @@ export class SelfGrantableRolesPlugin extends ZeppelinPlugin { const grantedRolesWord = rolesToGrantArr.length === 1 ? "role" : "roles"; if (nonMatchingRoleNames.length) { - msg.channel.createMessage( - successMessage( - `<@!${msg.author.id}> Granted you the ${grantedRolesStr.join(", ")} ${grantedRolesWord};` + - ` couldn't recognize the other roles you mentioned`, - ), + this.sendSuccessMessage(msg.channel, + `<@!${msg.author.id}> Granted you the ${grantedRolesStr.join(", ")} ${grantedRolesWord};` + + ` couldn't recognize the other roles you mentioned`, ); } else { - msg.channel.createMessage( - successMessage(`<@!${msg.author.id}> Granted you the ${grantedRolesStr.join(", ")} ${grantedRolesWord}`), - ); + this.sendSuccessMessage(msg.channel, `<@!${msg.author.id}> Granted you the ${grantedRolesStr.join(", ")} ${grantedRolesWord}`); } } catch (e) { msg.channel.createMessage( @@ -283,9 +275,7 @@ export class SelfGrantableRolesPlugin extends ZeppelinPlugin { // Add new one await this.selfGrantableRoles.add(args.channel.id, role.id, uniqueAliases); - msg.channel.createMessage( - successMessage(`Self-grantable role **${role.name}** added to **#${args.channel.name}**`), - ); + this.sendSuccessMessage(msg.channel, `Self-grantable role **${role.name}** added to **#${args.channel.name}**`); } @d.command("self_grantable_roles delete", " ") @@ -295,9 +285,7 @@ export class SelfGrantableRolesPlugin extends ZeppelinPlugin { const roleName = this.guild.roles.has(args.roleId) ? this.guild.roles.get(args.roleId).name : args.roleId; - msg.channel.createMessage( - successMessage(`Self-grantable role **${roleName}** removed from **#${args.channel.name}**`), - ); + this.sendSuccessMessage(msg.channel, `Self-grantable role **${roleName}** removed from **#${args.channel.name}**`); } @d.command("self_grantable_roles", "") diff --git a/backend/src/plugins/Slowmode.ts b/backend/src/plugins/Slowmode.ts index 3535797a..188b84c3 100644 --- a/backend/src/plugins/Slowmode.ts +++ b/backend/src/plugins/Slowmode.ts @@ -194,13 +194,9 @@ export class SlowmodePlugin extends ZeppelinPlugin { } if (failedUsers.length) { - msg.channel.createMessage( - successMessage( - `Slowmode disabled! Failed to clear slowmode from the following users:\n\n<@!${failedUsers.join(">\n<@!")}>`, - ), - ); + this.sendSuccessMessage(msg.channel, `Slowmode disabled! Failed to clear slowmode from the following users:\n\n<@!${failedUsers.join(">\n<@!")}>`); } else { - msg.channel.createMessage(successMessage("Slowmode disabled!")); + this.sendSuccessMessage(msg.channel, "Slowmode disabled!"); initMsg.delete().catch(noop); } } diff --git a/backend/src/plugins/Tags.ts b/backend/src/plugins/Tags.ts index 812162dc..21e78c7a 100644 --- a/backend/src/plugins/Tags.ts +++ b/backend/src/plugins/Tags.ts @@ -153,7 +153,7 @@ export class TagsPlugin extends ZeppelinPlugin { } await this.tags.delete(args.tag); - msg.channel.createMessage(successMessage("Tag deleted!")); + this.sendSuccessMessage(msg.channel, "Tag deleted!"); } @d.command("tag eval", "") @@ -180,7 +180,7 @@ export class TagsPlugin extends ZeppelinPlugin { await this.tags.createOrUpdate(args.tag, args.body, msg.author.id); const prefix = this.getConfig().prefix; - msg.channel.createMessage(successMessage(`Tag set! Use it with: \`${prefix}${args.tag}\``)); + this.sendSuccessMessage(msg.channel, `Tag set! Use it with: \`${prefix}${args.tag}\``); } @d.command("tag", "", { diff --git a/backend/src/plugins/Utility.ts b/backend/src/plugins/Utility.ts index 348cb90a..471cc77b 100644 --- a/backend/src/plugins/Utility.ts +++ b/backend/src/plugins/Utility.ts @@ -176,7 +176,7 @@ export class UtilityPlugin extends ZeppelinPlugin { this.lastReload = Date.now(); if (activeReloads && activeReloads.has(this.guildId)) { - activeReloads.get(this.guildId).createMessage(successMessage("Reloaded!")); + this.sendSuccessMessage(activeReloads.get(this.guildId), "Reloaded!"); activeReloads.delete(this.guildId); } } @@ -770,7 +770,7 @@ export class UtilityPlugin extends ZeppelinPlugin { responseText += ` in <#${targetChannel.id}>\n${cleanResult.archiveUrl}`; } - responseMsg = await msg.channel.createMessage(successMessage(responseText)); + responseMsg = await msg.channel.createMessage(successMessage(`<:zep_check:650361014180904971>`,responseText)); } else { responseMsg = await msg.channel.createMessage(errorMessage(`Found no messages to clean!`)); } @@ -946,7 +946,7 @@ export class UtilityPlugin extends ZeppelinPlugin { return; } - msg.channel.createMessage(successMessage(`The nickname of <@!${args.member.id}> has been reset`)); + this.sendSuccessMessage(msg.channel, `The nickname of <@!${args.member.id}> has been reset`); } @d.command("nickname", " ", { @@ -982,9 +982,7 @@ export class UtilityPlugin extends ZeppelinPlugin { return; } - msg.channel.createMessage( - successMessage(`Changed nickname of <@!${args.member.id}> from **${oldNickname}** to **${args.nickname}**`), - ); + this.sendSuccessMessage(msg.channel, `Changed nickname of <@!${args.member.id}> from **${oldNickname}** to **${args.nickname}**`); } @d.command("server", "", { @@ -1236,9 +1234,7 @@ export class UtilityPlugin extends ZeppelinPlugin { newChannel: stripObjectToScalars(channel), }); - msg.channel.createMessage( - successMessage(`**${args.member.user.username}#${args.member.user.discriminator}** moved to **${channel.name}**`), - ); + this.sendSuccessMessage(msg.channel, `**${args.member.user.username}#${args.member.user.discriminator}** moved to **${channel.name}**`); } @d.command("help", "", { diff --git a/backend/src/utils.ts b/backend/src/utils.ts index 1cb5af74..5821c389 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -264,8 +264,8 @@ export function convertMSToDelayString(ms: number): string { return result; } -export function successMessage(str) { - return `<:zep_check:650361014180904971> ${str}`; +export function successMessage(str, emoji) { + return `${emoji} ${str}`; } export function errorMessage(str) {