Make clear command also delete the sender's message

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>wtf.beatrice.hidekobot</groupId>
     <artifactId>HidekoBot</artifactId>
-    <version>0.5.0</version>
+    <version>0.5.3</version>
 
     <properties>
         <maven.compiler.source>16</maven.compiler.source>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-alpha.22</version>
+            <version>5.0.0-beta.2</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

src/main/java/wtf/beatrice/hidekobot/HidekoBot.java

@@ -129,10 +129,13 @@ public class HidekoBot
         // register message commands
         MessageCommandListener messageCommandListener = new MessageCommandListener();
         messageCommandListener.registerCommand(new HelloCommand());
-        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.InviteCommand());
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.AvatarCommand());
         messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.BotInfoCommand());
         messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.CoinFlipCommand());
         messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.ClearCommand());
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.DiceRollCommand());
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.InviteCommand());
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.SayCommand());
         Cache.setMessageCommandListener(messageCommandListener);
 
         // register listeners

src/main/java/wtf/beatrice/hidekobot/commands/base/Avatar.java

@@ -0,0 +1,62 @@
+package wtf.beatrice.hidekobot.commands.base;
+
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.User;
+import wtf.beatrice.hidekobot.Cache;
+
+public class Avatar
+{
+    public static int parseResolution(int resolution)
+    {
+        int[] acceptedSizes = Cache.getSupportedAvatarResolutions();
+
+        // method to find closest value to accepted values
+        int distance = Math.abs(acceptedSizes[0] - resolution);
+        int idx = 0;
+        for(int c = 1; c < acceptedSizes.length; c++){
+            int cdistance = Math.abs(acceptedSizes[c] - resolution);
+            if(cdistance < distance){
+                idx = c;
+                distance = cdistance;
+            }
+        }
+
+        return acceptedSizes[idx];
+    }
+
+    public static MessageEmbed buildEmbed(int resolution, User user)
+    {
+        int[] acceptedSizes = Cache.getSupportedAvatarResolutions();
+        EmbedBuilder embedBuilder = new EmbedBuilder();
+
+        embedBuilder.setColor(Cache.getBotColor());
+        embedBuilder.setTitle("Profile picture");
+
+        embedBuilder.addField("User", "<@" + user.getId() + ">", false);
+
+        embedBuilder.addField("Current resolution", resolution + " × " + resolution, false);
+
+        // string builder to create a string that links to all available resolutions
+        StringBuilder links = new StringBuilder();
+        for(int pos = 0; pos < acceptedSizes.length; pos++)
+        {
+            int currSize = acceptedSizes[pos];
+
+            String currLink = user.getEffectiveAvatar().getUrl(currSize);
+
+            links.append("[").append(currSize).append("px](").append(currLink).append(")");
+            if(pos + 1 != acceptedSizes.length) // don't add a separator on the last iteration
+            {
+                links.append(" | ");
+            }
+        }
+
+        embedBuilder.addField("Available resolutions", links.toString(), false);
+
+
+
+        embedBuilder.setImage(user.getEffectiveAvatar().getUrl(resolution));
+        return embedBuilder.build();
+    }
+}

src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java

@@ -3,6 +3,7 @@ package wtf.beatrice.hidekobot.commands.base;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageHistory;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@@ -46,7 +47,9 @@ public class ClearChat
         return null;
     }
 
-    public static int delete(int toDeleteAmount, long startingMessageId, MessageChannel channel)
+    public static int delete(int toDeleteAmount,
+                             long startingMessageId,
+                             MessageChannel channel)
     {
         // int to keep track of how many messages we actually deleted.
         int deleted = 0;
@@ -155,6 +158,7 @@ public class ClearChat
 
     public static String parseAmount(int deleted)
     {
+
         if(deleted < 1)
         {
             return "\uD83D\uDE22 Couldn't clear any message!";

src/main/java/wtf/beatrice/hidekobot/commands/base/Say.java

@@ -0,0 +1,11 @@
+package wtf.beatrice.hidekobot.commands.base;
+
+import net.dv8tion.jda.api.Permission;
+
+public class Say
+{
+
+    public static Permission getPermission() {
+        return Permission.MESSAGE_MANAGE;
+    }
+}

src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java

@@ -0,0 +1,81 @@
+package wtf.beatrice.hidekobot.commands.message;
+
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.IMentionable;
+import net.dv8tion.jda.api.entities.Mentions;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import org.jetbrains.annotations.Nullable;
+import wtf.beatrice.hidekobot.Cache;
+import wtf.beatrice.hidekobot.HidekoBot;
+import wtf.beatrice.hidekobot.commands.base.Avatar;
+import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+public class AvatarCommand  implements MessageCommand
+{
+
+    @Override
+    public LinkedList<String> getCommandLabels() {
+        return new LinkedList<>(Collections.singletonList("avatar"));
+    }
+
+    @Nullable
+    @Override
+    public List<Permission> getPermissions() {
+        return null; // anyone can use it
+    }
+
+    @Override
+    public boolean passRawArgs() {
+        return false;
+    }
+
+    @Override
+    public void runCommand(MessageReceivedEvent event, String label, String[] args)
+    {
+        int[] acceptedSizes = Cache.getSupportedAvatarResolutions();
+
+        User user = null;
+        int resolution = -1;
+
+        // we have no specific order for user and resolution, so let's try parsing any arg as resolution
+        // (mentions are handled differently by a specific method)
+        boolean resFound = false;
+
+        for (String arg : args) {
+            try {
+                int givenRes = Integer.parseInt(arg);
+                resolution = Avatar.parseResolution(givenRes);
+                resFound = true;
+                break;
+            } catch (NumberFormatException ignored) {
+            }
+        }
+
+        // fallback in case we didn't find any specified resolution
+        if(!resFound) resolution = Avatar.parseResolution(512);
+
+        // check if someone is mentioned
+        Mentions mentions = event.getMessage().getMentions();
+        if(mentions.getMentions().isEmpty())
+        {
+            user = event.getAuthor();
+        } else
+        {
+            String mentionedId = mentions.getMentions().get(0).getId();
+            user = HidekoBot.getAPI().retrieveUserById(mentionedId).complete();
+        }
+
+        // in case of issues, fallback to the sender
+        if(user == null) user = event.getAuthor();
+
+        // send a response
+        MessageEmbed embed = Avatar.buildEmbed(resolution, user);
+        event.getMessage().replyEmbeds(embed).queue();
+    }
+}

src/main/java/wtf/beatrice/hidekobot/commands/message/ClearCommand.java

@@ -43,7 +43,15 @@ public class ClearCommand implements MessageCommand
         // get the amount from the command args.
         Integer toDeleteAmount;
         if (args.length == 0) toDeleteAmount = 1;
-        else toDeleteAmount = Integer.parseInt(args[0]);
+        else
+        {
+            try {
+                toDeleteAmount = Integer.parseInt(args[0]);
+            } catch (NumberFormatException e)
+            {
+                toDeleteAmount = 0;
+            }
+        }
 
         error = ClearChat.checkDeleteAmount(toDeleteAmount);
         if (error != null) {
@@ -67,11 +75,16 @@ public class ClearCommand implements MessageCommand
         // ^ todo: maybe the dismiss button should also delete the original message sent by the user?
         // todo: but then, we need to differentiate between command type in the database, and store
         // todo: that message's id too.
-        botMessage = botMessage.editMessage(content).setActionRow(dismiss).complete();
+        Message finalMessage = event.getChannel().sendMessage(content).setActionRow(dismiss).complete();
 
         // add the message to database.
-        Cache.getDatabaseSource().queueDisabling(botMessage);
-        Cache.getDatabaseSource().trackRanCommandReply(botMessage, event.getAuthor());
+        Cache.getDatabaseSource().queueDisabling(finalMessage);
+        Cache.getDatabaseSource().trackRanCommandReply(finalMessage, event.getAuthor());
+
+        // delete the sender's message.
+        event.getMessage().delete().queue();
+        // delete the "clearing" info message.
+        botMessage.delete().queue();
 
     }
 

src/main/java/wtf/beatrice/hidekobot/commands/message/DiceRollCommand.java

@@ -0,0 +1,128 @@
+package wtf.beatrice.hidekobot.commands.message;
+
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import org.jetbrains.annotations.Nullable;
+import wtf.beatrice.hidekobot.objects.Dice;
+import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
+
+import java.util.*;
+
+public class DiceRollCommand implements MessageCommand
+{
+        @Override
+        public LinkedList<String> getCommandLabels() {
+            return new LinkedList<>(Arrays.asList("diceroll", "droll", "roll"));
+        }
+
+        @Nullable
+        @Override
+        public List<Permission> getPermissions() {
+            return null; // anyone can use it
+        }
+
+        @Override
+        public boolean passRawArgs() {
+            return false;
+        }
+
+        @Override
+        public void runCommand(MessageReceivedEvent event, String label, String[] args)
+        {
+            LinkedHashMap<Dice, Integer> dicesToRoll = new LinkedHashMap<Dice, Integer>();
+            String diceRegex = "d[0-9]+";
+            String amountRegex = "[0-9]+";
+
+            Dice currentDice = null;
+            int currentAmount;
+            UUID lastPushedDice = null;
+
+            for(String arg : args)
+            {
+                if(arg.matches(amountRegex))
+                {
+                    currentAmount = Integer.parseInt(arg);
+
+                    if(currentDice == null)
+                    {
+                        currentDice = new Dice(6);
+                    } else {
+                        currentDice = new Dice(currentDice);
+                    }
+
+                    lastPushedDice = currentDice.getUUID();
+                    dicesToRoll.put(currentDice, currentAmount);
+                }
+                else if(arg.matches(diceRegex))
+                {
+                    int sides = Integer.parseInt(arg.substring(1));
+
+                    if(args.length == 1)
+                    {
+                        dicesToRoll.put(new Dice(sides), 1);
+                    } else
+                    {
+                        if(currentDice != null)
+                        {
+                            if(lastPushedDice == null || !lastPushedDice.equals(currentDice.getUUID()))
+                            {
+                                dicesToRoll.put(currentDice, 1);
+                                lastPushedDice = currentDice.getUUID();
+                            }
+                        }
+
+                        currentDice = new Dice(sides);
+                    }
+                }
+            }
+
+            if(lastPushedDice == null)
+            {
+                if(currentDice != null)
+                {
+                    dicesToRoll.put(currentDice, 1);
+                }
+            } else
+            {
+                if(!lastPushedDice.equals(currentDice.getUUID()))
+                {
+                    dicesToRoll.put(new Dice(currentDice), 1);
+                }
+            }
+
+            LinkedList<Dice> rolledDices = new LinkedList<>();
+
+            for(Dice dice : dicesToRoll.keySet())
+            {
+                for(int roll = 0; roll < dicesToRoll.get(dice); roll++)
+                {
+                    dice.roll();
+                    rolledDices.add(new Dice(dice));
+                }
+            }
+
+            StringBuilder message = new StringBuilder();
+            int total = 0;
+
+            int previousDiceSides = 0;
+            for (Dice dice : rolledDices) {
+                int diceSize = dice.getSides();
+
+                if (previousDiceSides != diceSize) {
+                    message.append("\nd").append(diceSize).append(": ");
+                    previousDiceSides = diceSize;
+                } else if (previousDiceSides != 0) {
+                    message.append(", ");
+                }
+
+                message.append(dice.getValue());
+
+                total += dice.getValue();
+            }
+
+            message.append("\n\n").append("**Total**: ").append(total);
+
+            event.getMessage().reply(message.toString()).queue();
+        }
+
+}

src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java

@@ -0,0 +1,51 @@
+package wtf.beatrice.hidekobot.commands.message;
+
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import org.jetbrains.annotations.Nullable;
+import wtf.beatrice.hidekobot.commands.base.ClearChat;
+import wtf.beatrice.hidekobot.commands.base.Say;
+import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+public class SayCommand implements MessageCommand
+{
+
+
+    @Override
+    public LinkedList<String> getCommandLabels() {
+        return new LinkedList<>(Collections.singletonList("say"));
+    }
+
+    @Nullable
+    @Override
+    public List<Permission> getPermissions() { return Collections.singletonList(Say.getPermission()); }
+
+    @Override
+    public boolean passRawArgs() {
+        return true;
+    }
+
+    @Override
+    public void runCommand(MessageReceivedEvent event, String label, String[] args)
+    {
+
+        String messageContent;
+        if(args.length != 0 && !args[0].isEmpty())
+        {
+            messageContent = args[0];
+        } else {
+            event.getMessage().reply("\uD83D\uDE20 Hey, you have to tell me what to say!")
+                    .queue();
+            return;
+        }
+
+        event.getChannel().sendMessage(messageContent).queue();
+        event.getMessage().delete().queue();
+
+    }
+}

src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java

@@ -1,6 +1,7 @@
 package wtf.beatrice.hidekobot.commands.slash;
 
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -9,6 +10,7 @@ import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
+import wtf.beatrice.hidekobot.commands.base.Avatar;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 public class AvatarCommand extends SlashCommandImpl
@@ -31,9 +33,6 @@ public class AvatarCommand extends SlashCommandImpl
         User user;
         int resolution;
 
-        int[] acceptedSizes = Cache.getSupportedAvatarResolutions();
-
-
         OptionMapping userArg = event.getOption("user");
         if(userArg != null)
         {
@@ -45,57 +44,12 @@ public class AvatarCommand extends SlashCommandImpl
         OptionMapping sizeArg = event.getOption("size");
         if(sizeArg != null)
         {
-            resolution = sizeArg.getAsInt();
-
-            // method to find closest value to accepted values
-            int distance = Math.abs(acceptedSizes[0] - resolution);
-            int idx = 0;
-            for(int c = 1; c < acceptedSizes.length; c++){
-                int cdistance = Math.abs(acceptedSizes[c] - resolution);
-                if(cdistance < distance){
-                    idx = c;
-                    distance = cdistance;
-                }
-            }
-            resolution = acceptedSizes[idx];
-
+            resolution = Avatar.parseResolution(sizeArg.getAsInt());
         } else {
-            resolution = 512;
+            resolution = Avatar.parseResolution(512);
         }
 
-        EmbedBuilder embedBuilder = new EmbedBuilder();
-
-        // embed processing
-        {
-            embedBuilder.setColor(Cache.getBotColor());
-            embedBuilder.setTitle("Profile picture");
-
-            embedBuilder.addField("User", "<@" + user.getId() + ">", false);
-
-            embedBuilder.addField("Current resolution", resolution + " × " + resolution, false);
-
-            // string builder to create a string that links to all available resolutions
-            StringBuilder links = new StringBuilder();
-            for(int pos = 0; pos < acceptedSizes.length; pos++)
-            {
-                int currSize = acceptedSizes[pos];
-
-                String currLink = user.getEffectiveAvatar().getUrl(currSize);
-
-                links.append("[").append(currSize).append("px](").append(currLink).append(")");
-                if(pos + 1 != acceptedSizes.length) // don't add a separator on the last iteration
-                {
-                    links.append(" | ");
-                }
-            }
-
-            embedBuilder.addField("Available resolutions", links.toString(), false);
-
-
-
-            embedBuilder.setImage(user.getEffectiveAvatar().getUrl(resolution));
-        }
-
-        event.getHook().editOriginalEmbeds(embedBuilder.build()).queue();
+        MessageEmbed embed = Avatar.buildEmbed(resolution, user);
+        event.getHook().editOriginalEmbeds(embed).queue();
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java

@@ -9,6 +9,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
+import wtf.beatrice.hidekobot.commands.base.Say;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 public class SayCommand extends SlashCommandImpl
@@ -22,7 +23,7 @@ public class SayCommand extends SlashCommandImpl
                         "The message to send.",
                         true,
                         false)
-                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.MESSAGE_MANAGE));
+                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Say.getPermission()));
     }
 
     @Override

src/main/java/wtf/beatrice/hidekobot/listeners/MessageCommandListener.java

@@ -57,10 +57,11 @@ public class MessageCommandListener extends ListenerAdapter
     @Override
     public void onMessageReceived(@NotNull MessageReceivedEvent event)
     {
-        String eventMessage = event.getMessage().getContentDisplay();
+        // warning: we are getting the RAW value of the message content, not the DISPLAY value!
+        String eventMessage = event.getMessage().getContentRaw();
 
         // check if the sent message matches the bot activation regex (prefix, name, ...)
-        if(!eventMessage.toLowerCase().matches(commandRegex + ".*"))
+        if(!eventMessage.toLowerCase().matches(commandRegex + "((.|\\n)*)"))
             return;
 
         // generate args from the string
@@ -120,8 +121,9 @@ public class MessageCommandListener extends ListenerAdapter
         String[] commandArgs;
         if(commandObject.passRawArgs())
         {
+
             // remove first argument, which is the command label
-            argsString = argsString.replaceAll("^[\\S]+\\s+", "");
+            argsString = argsString.replaceAll("^[\\S]+\\s*", "");
             // pass all other arguments as a single argument as the first array element
             commandArgs = new String[]{argsString};
         }

src/main/java/wtf/beatrice/hidekobot/objects/Dice.java

@@ -0,0 +1,45 @@
+package wtf.beatrice.hidekobot.objects;
+
+import wtf.beatrice.hidekobot.util.RandomUtil;
+
+import java.util.UUID;
+
+public class Dice
+{
+    private final int sides;
+    private int value = 0;
+    private final UUID uuid;
+
+    public Dice(int sides)
+    {
+        this.sides = sides;
+        this.uuid = UUID.randomUUID();
+    }
+
+    public Dice(Dice old)
+    {
+        this.sides = old.sides;
+        this.value = old.value;
+        this.uuid = UUID.randomUUID();
+    }
+
+    public int getValue()
+    {
+        return value;
+    }
+
+    public int getSides()
+    {
+        return sides;
+    }
+
+    public void roll()
+    {
+        value = RandomUtil.getRandomNumber(1, sides);
+    }
+
+    public UUID getUUID()
+    {
+        return uuid;
+    }
+}