bugfix for empty messages

Bump moment from 2.29.2 to 2.29.4

README.md

@@ -13,6 +13,7 @@ Contributions welcome.
 > Create a named volume `docker volume create ModmailStorage`  
 Make sure to have a config.js ready to go, see the example file for a template  
 > Start the container  
+
 ```
 docker run -d --name modmail \
 -v /path/to/config.js:/modmail/config.js \

package.json

@@ -8,7 +8,8 @@
   "description": "Modmail bot with eventual integration with Galactic Bot's API",
   "scripts": {
     "start": "node index.js",
-    "dev": "nodemon --ignore *.json index.js"
+    "dev": "nodemon --ignore *.json index.js",
+    "dockerpub": "tsc && docker build . --tag navydotgif/modmail:latest && docker push navydotgif/modmail:latest "
   },
   "devDependencies": {
     "eslint": "^7.28.0",
@@ -18,7 +19,7 @@
     "chalk": "^4.0.0",
     "diagnostics": "^2.0.2",
     "discord.js": "^12.5.3",
-    "moment": "^2.29.2",
+    "moment": "^2.29.4",
     "winston": "^3.3.3",
     "winston-transport": "^4.4.0"
   }

structure/ChannelHandler.js

@@ -92,7 +92,7 @@ class ChannelHandler {
         if (channel) await channel.edit({ parentID: state === 'read' ? this.readMail.id : this.newMail.id, lockPermissions: true });
         if (!this.cache.updatedThreads.includes(target)) this.cache.updatedThreads.push(target);
         if (this.cache.queue.includes(target) && state === 'read') this.cache.queue.splice(this.cache.queue.indexOf(target), 1);
-        else if (!this.cache.queue.includes(target)) this.cache.queue.push(target);
+        else if (!this.cache.queue.includes(target) && state === 'unread') this.cache.queue.push(target);
         return {};
 
     }

structure/Client.js

@@ -102,11 +102,11 @@ class ModmailClient extends Client {
         const roles = member.roles.cache.map((r) => r.id);
         if (!roles.some((r) => this._options.staffRoles.includes(r)) && !member.hasPermission('ADMINISTRATOR')) return;
 
-        const [ rawCommand, ...args ] = content.split(' ');
+        const [ rawCommand, ...args ] = content.split(/\s+/u);
         const commandName = rawCommand.substring(prefix.length);
         const command = this.registry.find(commandName);
         if (!command) return;
-        message._caller = commandName.toLowerCase();
+        message._caller = commandName;
 
         if (command.showUsage && !args.length) {
 

structure/Modmail.js

@@ -362,7 +362,6 @@ class Modmail {
             response = await this.channels.setReadState(userId, channel, author, state);
         }
 
-        
         if (response.error) return response;
         this.log({ author, action: `${author.tag} marked ${user.tag}'s thread as ${state}`, target: user });
         return 'Done';

structure/commands/CannedReply.js

@@ -13,7 +13,7 @@ class CannedReply extends Command {
 
     async execute (message, { args }) {
         
-        const [ first ] = args.map((a) => a);
+        const [ first, second ] = args.map((a) => a);
         // eslint-disable-next-line prefer-const
         let { channel, content, _caller } = message,
             anon = false;
@@ -29,6 +29,7 @@ class CannedReply extends Command {
 
             const list = Object.entries(this.client.modmail.replies);
             let str = '';
+            if (second?.toLowerCase() !== '-here') channel = await message.author.createDM();
             // eslint-disable-next-line no-shadow
             for (const [ name, content ] of list) {
                 const substr = `**${name}:** ${content}\n`;

structure/commands/Modmail.js

@@ -12,7 +12,6 @@ class Modmail extends Command {
     }
 
     async execute (message, { args }) {
-
         // eslint-disable-next-line prefer-const
         let [ first, second ] = args.map((a) => a);
         // eslint-disable-next-line prefer-const
@@ -37,15 +36,14 @@ class Modmail extends Command {
             error: true,
             msg: 'Cannot send modmail to a bot.'
         };
-        content = content.replace(first, '');
+        content = content.replace(first, '').trim();
 
         if (!content.length) return {
             error: true,
             msg: `Cannot send empty message`
         };
 
-        return this.client.modmail.sendModmail({ message, content: content.trim(), anon, target: user });
-
+        return this.client.modmail.sendModmail({ message, content, anon, target: user });
     }
 
 }