ReAdded support for multi-line birthday messages.

scottbucher · Aug 5, 2020 · f119ae4 · f119ae4
1 parent 0f54b72
commit f119ae4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/commands/message/message-add-sub-command.ts b/src/commands/message/message-add-sub-command.ts
@@ -17,11 +17,7 @@ export class MessageAddSubCommand {
         }
 
         // Get Message
-        let birthdayMessage = args
-            .slice(3)
-            .join(' ')
-            .replace(/@users?|<users?>|{users?}/gi, '<Users>');
-
+        let birthdayMessage = msg.content.substring(msg.content.indexOf('add')+3).replace(/@users?|<users?>|{users?}/gi, '<Users>');
         if (birthdayMessage.length > 300) {
             let embed = new MessageEmbed()
                 .setDescription('Custom Messages are maxed at 300 characters!')

diff --git a/src/commands/message/message-test-sub-command.ts b/src/commands/message/message-test-sub-command.ts
@@ -68,7 +68,7 @@ export class MessageTestSubCommand {
         let messages = await this.customMessageRepo.getCustomMessages(msg.guild.id);
 
         if (!messages) {
-            let defaultMessage = 'Happy Birthday <Users>!'.replace('<Users>', userList);
+            let defaultMessage = `Happy Birthday ${userList}!`;
             if (guildData.UseEmbed) {
                 let embed = new MessageEmbed()
                     .setDescription(defaultMessage)
@@ -81,10 +81,10 @@ export class MessageTestSubCommand {
             }
         }
 
-        let customMessage = messages.customMessages
+        let customMessage: string = messages.customMessages
             .find(question => question.Position === position)
-            ?.Message.split('@Users').join(userList)
-            .split('<Users>').join(userList);
+            ?.Message.replace(/@Users/g, userList)
+            .replace(/<Users>/g, userList);
 
         if (!customMessage) {
             let embed = new MessageEmbed()
@@ -103,7 +103,6 @@ export class MessageTestSubCommand {
                 .setDescription(customMessage)
                 .setColor(Config.colors.default);
             await channel.send(embed);
-            return;
         } else {
             await channel.send(customMessage);
         }