diff --git a/backend/src/index.ts b/backend/src/index.ts index 3b7e1e17..71c9b8d0 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -307,22 +307,6 @@ connect().then(async () => { startUptimeCounter(); }); - const debugGuilds = ["877581055920603238", "348468156597010432", "134286179121102848"]; - bot.on("guildLoaded", (guildId) => { - if (!debugGuilds.includes(guildId)) { - return; - } - - console.log(`[!! DEBUG !!] LOADED GUILD ${guildId}`); - }); - bot.on("guildUnloaded", (guildId) => { - if (!debugGuilds.includes(guildId)) { - return; - } - - console.log(`[!! DEBUG !!] UNLOADED GUILD ${guildId}`); - }); - bot.initialize(); logger.info("Bot Initialized"); logger.info("Logging in..."); diff --git a/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts b/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts index 202f03dd..c8a603e1 100644 --- a/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts +++ b/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts @@ -21,9 +21,6 @@ const defaultOptions: PluginOptions = { ], }; -let debugId = 0; -const debugGuilds = ["877581055920603238", "348468156597010432", "134286179121102848"]; - export const MessageSaverPlugin = zeppelinGuildPlugin()({ name: "message_saver", showInDocs: false, @@ -48,18 +45,5 @@ export const MessageSaverPlugin = zeppelinGuildPlugin()( beforeLoad(pluginData) { const { state, guild } = pluginData; state.savedMessages = GuildSavedMessages.getGuildInstance(guild.id); - state.debugId = ++debugId; - - if (debugGuilds.includes(pluginData.guild.id)) { - console.log(`[!! DEBUG !!] MessageSaverPlugin::beforeLoad (${state.debugId}): ${pluginData.guild.id}`); - } - }, - - beforeUnload(pluginData) { - if (debugGuilds.includes(pluginData.guild.id)) { - console.log( - `[!! DEBUG !!] MessageSaverPlugin::beforeUnload (${pluginData.state.debugId}): ${pluginData.guild.id}`, - ); - } }, }); diff --git a/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts b/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts index 5acaf5fc..86fa4dd0 100644 --- a/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts +++ b/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts @@ -3,22 +3,6 @@ import { messageSaverEvt } from "../types"; import { SECONDS } from "../../../utils"; import moment from "moment-timezone"; -const recentlyCreatedMessages: Map = new Map(); -const recentlyCreatedMessagesToKeep = 100; - -setInterval(() => { - let toDelete = recentlyCreatedMessages.size - recentlyCreatedMessagesToKeep; - for (const key of recentlyCreatedMessages.keys()) { - if (toDelete === 0) { - break; - } - - recentlyCreatedMessages.delete(key); - - toDelete--; - } -}, 60 * SECONDS); - const AFFECTED_MESSAGE_TYPES: MessageType[] = ["DEFAULT", "REPLY", "APPLICATION_COMMAND"]; export const MessageCreateEvt = messageSaverEvt({ @@ -41,23 +25,6 @@ export const MessageCreateEvt = messageSaverEvt({ return; } - // FIXME: Remove debug code - if (recentlyCreatedMessages.has(meta.args.message.id)) { - const ourDebugId = meta.pluginData.state.debugId; - const oldDebugId = recentlyCreatedMessages.get(meta.args.message.id)![0]; - const oldGuildId = recentlyCreatedMessages.get(meta.args.message.id)![2]; - const context = `${ourDebugId} : ${oldDebugId} / ${meta.pluginData.guild.id} : ${oldGuildId} : ${meta.args.message.guildId} / ${meta.args.message.channelId} / ${meta.args.message.id}`; - const timestamp = moment(recentlyCreatedMessages.get(meta.args.message.id)![1]).format("HH:mm:ss.SSS"); - // tslint:disable-next-line:no-console - console.warn(`Tried to save duplicate message from messageCreate event: ${context} / saved at: ${timestamp}`); - return; - } - recentlyCreatedMessages.set(meta.args.message.id, [ - meta.pluginData.state.debugId, - Date.now(), - meta.pluginData.guild.id, - ]); - await meta.pluginData.state.savedMessages.createFromMsg(meta.args.message); }, }); diff --git a/backend/src/plugins/MessageSaver/types.ts b/backend/src/plugins/MessageSaver/types.ts index 694a0b0a..28495da3 100644 --- a/backend/src/plugins/MessageSaver/types.ts +++ b/backend/src/plugins/MessageSaver/types.ts @@ -12,7 +12,6 @@ export interface MessageSaverPluginType extends BasePluginType { config: TConfigSchema; state: { savedMessages: GuildSavedMessages; - debugId: number; }; }