From 97e4c0b41995617fcbaf20a599b53b18dfa56fcf Mon Sep 17 00:00:00 2001 From: Navy Date: Sun, 20 Jun 2021 00:57:12 +0300 Subject: [PATCH] added queue reminder and command --- structure/Client.js | 4 +++ structure/Modmail.js | 53 ++++++++++++++++++++++++++++++++----- structure/commands/Queue.js | 42 +++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 structure/commands/Queue.js diff --git a/structure/Client.js b/structure/Client.js index e707b14..8704f75 100644 --- a/structure/Client.js +++ b/structure/Client.js @@ -136,6 +136,10 @@ class ModmailClient extends Client { return this.resolver.resolveUser(input); } + resolveUsers(input) { + return this.resolver.resolveUsers(input); + } + async prompt(str, { author, channel, time }) { if (!channel && author) channel = await author.createDM(); diff --git a/structure/Modmail.js b/structure/Modmail.js index 2d53700..dad28f0 100644 --- a/structure/Modmail.js +++ b/structure/Modmail.js @@ -2,25 +2,36 @@ const fs = require('fs'); class Modmail { + // A lot of this can probably be simplified but I wrote all of this in 2 days and I cba to fix this atm + // TODO: Fix everything + constructor(client) { this.client = client; this.mainServer = null; this.bansServer = null; - this.categories = client._options.modmailCategory; - this.graveyardInactive = client._options.graveyardInactive; - this.readInactive = client._options.readInactive; - this.channelSweepInterval = client._options.channelSweepInterval; - this.saveInterval = client._options.saveInterval; - this.anonColor = client._options.anonColor; + const opts = client._options; + + this.categories = opts.modmailCategory; + this.graveyardInactive = opts.graveyardInactive; + this.readInactive = opts.readInactive; + this.channelSweepInterval = opts.channelSweepInterval; + this.saveInterval = opts.saveInterval; + this.anonColor = opts.anonColor; + this.reminderInterval = opts.modmailReminderInterval || 30; + this._reminderChannel = opts.modmailReminderChannel || null; + this.reminderChannel = null; this.updatedThreads = []; + this.queue = []; this.mmcache = {}; this.spammers = {}; this.replies = {}; this.awaitingChannel = {}; + this.lastReminder = null; + } init() { @@ -39,6 +50,11 @@ class Modmail { this.graveyard = channels.resolve(this.categories[2]); this.replies = this.loadReplies(); + this.queue = this.client.cache.queue || []; + if (this._reminderChannel) { + this.reminderChannel = this.client.channels.resolve(this._reminderChannel); + this.reminder = setInterval(this.sendReminder.bind(this), this.reminderInterval * 60 * 1000); + } // Sweep graveyard every 30 min and move stale channels to graveyard this.sweeper = setInterval(this.sweepChannels.bind(this), this.channelSweepInterval * 60 * 1000); @@ -136,6 +152,7 @@ class Modmail { pastModmail.push({ author: author.id, content, timestamp: Date.now(), isReply: false }); if (!this.updatedThreads.includes(author.id)) this.updatedThreads.push(author.id); + this.queue.push(author.id); const embed = { footer: { @@ -313,6 +330,7 @@ class Modmail { const history = await this.loadHistory(userId); history.push({ author: member.id, content, timestamp: Date.now(), isReply: true, anon }); + if (this.queue.includes(userId)) this.queue.splice(this.queue.indexOf(userId), 1); const embed = { author: { @@ -334,6 +352,11 @@ class Modmail { if (sent.error) return sent; + embed.author = { + name: author.tag, + // eslint-disable-next-line camelcase + icon_url: author.displayAvatarURL({ dynamic: true }) + }; await channel.send({ embed }).catch((err) => { this.client.logger.error(`channel.send errored:\n${err.stack}\nContent: "${content}"`); }); @@ -389,6 +412,7 @@ class Modmail { await message.channel.send('Delivered.').catch(this.client.logger.error.bind(this.client.logger)); const channel = await this.loadChannel(targetMember, history).catch(this.client.logger.error.bind(this.client.logger)); history.push({ author: member.id, content, timestamp: Date.now(), isReply: true, anon }); + if (this.queue.includes(target.id)) this.queue.splice(this.queue.indexOf(target.id), 1); if (!this.updatedThreads.includes(target.id)) this.updatedThreads.push(target.id); await channel.send({ embed }).catch(this.client.logger.error.bind(this.client.logger)); await channel.edit({ parentID: this.readMail.id, lockPermissions: true }).catch(this.client.logger.error.bind(this.client.logger)); @@ -504,6 +528,7 @@ class Modmail { msg: `Internal error, this has been logged.` }; history.push({ author: author.id, timestamp: Date.now(), markread: true }); // To keep track of read state + if (this.queue.includes(userId)) this.queue.splice(this.queue.indexOf(userId), 1); await channel.edit({ parentID: this.readMail.id, lockPermissions: true }); if (!this.updatedThreads.includes(author.id)) this.updatedThreads.push(userId); @@ -511,6 +536,22 @@ class Modmail { } + async sendReminder() { + + const channel = this.reminderChannel; + const amount = this.queue.length; + let str = ''; + + if (!amount) str = 'No modmail in queue'; + else str = `${amount} modmail in queue.`; + + if (this.lastReminder) { + if (channel.lastMessage.id === this.lastReminder.id) return this.lastReminder.edit(str); + await this.lastReminder.delete(); + } else this.lastReminder = await channel.send(str); + + } + loadHistory(userId) { return new Promise((resolve, reject) => { diff --git a/structure/commands/Queue.js b/structure/commands/Queue.js new file mode 100644 index 0000000..99de248 --- /dev/null +++ b/structure/commands/Queue.js @@ -0,0 +1,42 @@ +const Command = require('../Command'); + +class Queue extends Command { + + constructor(client) { + super(client, { + name: 'queue', + aliases: ['mmq', 'mmqueue'] + }); + } + + async execute(message) { + + const { queue } = this.client.modmail; + if (!queue.length) return 'Queue is empty!'; + + const users = this.client.resolveUsers(queue); + let str = ``, + count = 0; + for (const user of users) { + const _str = `${user.tag} (${user.id})\n`; + if ((str + _str).length > 2000) break; + str += _str; + count++; + } + + const { channel } = message; + const embed = { + title: `${users.length} users in queue`, + description: str, + footer: { + text: `Showing ${count} users` + } + }; + + await channel.send({ embed }); + + } + +} + +module.exports = Queue; \ No newline at end of file