Merge pull request #159 from beanbeanjuice/integration

Ready for Release v2.1.2
beanbeanjuice · May 19, 2021 · 8cd7522 · 8cd7522
2 parents 7864218 + fd0ccf9
commit 8cd7522
Show file tree

Hide file tree

Showing 33 changed files with 985 additions and 433 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+# patreon: # Replace with a single Patreon username
+# open_collective: # Replace with a single Open Collective username
+# ko_fi: # Replace with a single Ko-fi username
+# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+# liberapay: # Replace with a single Liberapay username
+# issuehunt: # Replace with a single IssueHunt username
+# otechie: # Replace with a single Otechie username
+custom: ['https://streamelements.com/beanbeanjuice/tip']
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ task buildWithDependencies(type: Jar) {
 
 group 'com.beanbeanjuice'
 mainClassName = 'com.beanbeanjuice.main.CafeBot'
-version 'v2.1.1'
+version 'v2.1.2'
 
 repositories {
 

diff --git a/src/main/java/com/beanbeanjuice/command/generic/BugReportCommand.java b/src/main/java/com/beanbeanjuice/command/generic/BugReportCommand.java
@@ -29,7 +29,10 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     private MessageEmbed bugReportEmbed() {
         EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setAuthor("Bug Report", BUG_REPORT_URL);
-        embedBuilder.setDescription("If you want to submit a bug report, please click on the title above.");
+        embedBuilder.setDescription("""
+                If you want to submit a bug report, please click on the title above.
+
+                Or alternatively, head to https://github.com/beanbeanjuice/cafeBot/issues/new/choose""");
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         return embedBuilder.build();
     }

diff --git a/src/main/java/com/beanbeanjuice/command/generic/FeatureRequestCommand.java b/src/main/java/com/beanbeanjuice/command/generic/FeatureRequestCommand.java
@@ -29,7 +29,10 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     private MessageEmbed featureRequestEmbed() {
         EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setAuthor("Feature Request", FEATURE_REQUEST_URL);
-        embedBuilder.setDescription("If you want to submit a feature request, please click on the title above.");
+        embedBuilder.setDescription("""
+                If you want to submit a feature request, please click on the title above.
+
+                Or alternatively, head to https://github.com/beanbeanjuice/cafeBot/issues/new/choose""");
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         return embedBuilder.build();
     }

diff --git a/src/main/java/com/beanbeanjuice/command/interaction/BiteCommand.java b/src/main/java/com/beanbeanjuice/command/interaction/BiteCommand.java
@@ -22,13 +22,39 @@ public class BiteCommand implements ICommand {
     public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildMessageReceivedEvent event) {
         String url = CafeBot.getInteractionHandler().getBiteImage();
         String sender = user.getName();
-        String receiver = CafeBot.getGeneralHelper().getUser(args.get(0)).getName();
-        String message = "**" + sender + "** *bit* **" + receiver + "** :O";
 
-        if (args.size() == 1) {
+        ArrayList<User> receivers = new ArrayList<>();
+        int count = 0;
+
+        if (!args.isEmpty()) {
+            while (CafeBot.getGeneralHelper().getUser(args.get(count)) != null) {
+                receivers.add(CafeBot.getGeneralHelper().getUser(args.get(count++)));
+                if (count == args.size()) {
+                    break;
+                }
+            }
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = count; i < args.size(); i++) {
+            stringBuilder.append(args.get(i));
+            if (i != args.size() - 1) {
+                stringBuilder.append(" ");
+            }
+        }
+
+        String message;
+
+        if (receivers.size() == 0) {
+            message = "**" + sender + "** *bit* themselves! Why would you do that?";
+        } else {
+            message = "**" + sender + "** *bit* **" + CafeBot.getInteractionHandler().getReceiverString(receivers) + "**. :O";
+        }
+
+        if (stringBuilder.isEmpty()) {
             event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionEmbed(url)).queue();
         } else {
-            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, args)).queue();
+            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, stringBuilder.toString())).queue();
         }
     }
 
@@ -55,8 +81,7 @@ public String exampleUsage() {
     @Override
     public Usage getUsage() {
         Usage usage = new Usage();
-        usage.addUsage(CommandType.USER, "User Mention", true);
-        usage.addUsage(CommandType.SENTENCE, "Extra Message", false);
+        usage.addUsage(CommandType.SENTENCE, "Users + Extra Message", false);
         return usage;
     }
 

diff --git a/src/main/java/com/beanbeanjuice/command/interaction/BlushCommand.java b/src/main/java/com/beanbeanjuice/command/interaction/BlushCommand.java
@@ -22,13 +22,39 @@ public class BlushCommand implements ICommand {
     public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildMessageReceivedEvent event) {
         String url = CafeBot.getInteractionHandler().getBlushImage();
         String sender = user.getName();
-        String receiver = CafeBot.getGeneralHelper().getUser(args.get(0)).getName();
-        String message = "**" + sender + "** *blushed* at **" + receiver + "**!";
 
-        if (args.size() == 1) {
+        ArrayList<User> receivers = new ArrayList<>();
+        int count = 0;
+
+        if (!args.isEmpty()) {
+            while (CafeBot.getGeneralHelper().getUser(args.get(count)) != null) {
+                receivers.add(CafeBot.getGeneralHelper().getUser(args.get(count++)));
+                if (count == args.size()) {
+                    break;
+                }
+            }
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = count; i < args.size(); i++) {
+            stringBuilder.append(args.get(i));
+            if (i != args.size() - 1) {
+                stringBuilder.append(" ");
+            }
+        }
+
+        String message;
+
+        if (receivers.size() == 0) {
+            message = "**" + sender + "** *blushed*! Aww... why are you blushing?";
+        } else {
+            message = "**" + sender + "** *blushed* because of **" + CafeBot.getInteractionHandler().getReceiverString(receivers) + "**.";
+        }
+
+        if (stringBuilder.isEmpty()) {
             event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionEmbed(url)).queue();
         } else {
-            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, args)).queue();
+            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, stringBuilder.toString())).queue();
         }
     }
 
@@ -55,8 +81,7 @@ public String exampleUsage() {
     @Override
     public Usage getUsage() {
         Usage usage = new Usage();
-        usage.addUsage(CommandType.USER, "User Mention", true);
-        usage.addUsage(CommandType.SENTENCE, "Extra Message", false);
+        usage.addUsage(CommandType.SENTENCE, "Users + Extra Message", false);
         return usage;
     }
 

diff --git a/src/main/java/com/beanbeanjuice/command/interaction/CryCommand.java b/src/main/java/com/beanbeanjuice/command/interaction/CryCommand.java
@@ -22,13 +22,39 @@ public class CryCommand implements ICommand {
     public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildMessageReceivedEvent event) {
         String url = CafeBot.getInteractionHandler().getCryImage();
         String sender = user.getName();
-        String receiver = CafeBot.getGeneralHelper().getUser(args.get(0)).getName();
-        String message = "**" + sender + "** is *crying* because of **" + receiver + "**!";
 
-        if (args.size() == 1) {
+        ArrayList<User> receivers = new ArrayList<>();
+        int count = 0;
+
+        if (!args.isEmpty()) {
+            while (CafeBot.getGeneralHelper().getUser(args.get(count)) != null) {
+                receivers.add(CafeBot.getGeneralHelper().getUser(args.get(count++)));
+                if (count == args.size()) {
+                    break;
+                }
+            }
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = count; i < args.size(); i++) {
+            stringBuilder.append(args.get(i));
+            if (i != args.size() - 1) {
+                stringBuilder.append(" ");
+            }
+        }
+
+        String message;
+
+        if (receivers.size() == 0) {
+            message = "**" + sender + "** is *crying*... Aww don't cry! What's wrong?";
+        } else {
+            message = "**" + sender + "** is *crying* because of **" + CafeBot.getInteractionHandler().getReceiverString(receivers) + "**.";
+        }
+
+        if (stringBuilder.isEmpty()) {
             event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionEmbed(url)).queue();
         } else {
-            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, args)).queue();
+            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, stringBuilder.toString())).queue();
         }
     }
 
@@ -55,8 +81,7 @@ public String exampleUsage() {
     @Override
     public Usage getUsage() {
         Usage usage = new Usage();
-        usage.addUsage(CommandType.USER, "User Mention", true);
-        usage.addUsage(CommandType.SENTENCE, "Extra Message", false);
+        usage.addUsage(CommandType.SENTENCE, "Users + Extra Message", false);
         return usage;
     }
 

diff --git a/src/main/java/com/beanbeanjuice/command/interaction/CuddleCommand.java b/src/main/java/com/beanbeanjuice/command/interaction/CuddleCommand.java
@@ -22,13 +22,39 @@ public class CuddleCommand implements ICommand {
     public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildMessageReceivedEvent event) {
         String url = CafeBot.getInteractionHandler().getCuddleImage();
         String sender = user.getName();
-        String receiver = CafeBot.getGeneralHelper().getUser(args.get(0)).getName();
-        String message = "**" + sender + "** *cuddled* **" + receiver + "**!";
 
-        if (args.size() == 1) {
+        ArrayList<User> receivers = new ArrayList<>();
+        int count = 0;
+
+        if (!args.isEmpty()) {
+            while (CafeBot.getGeneralHelper().getUser(args.get(count)) != null) {
+                receivers.add(CafeBot.getGeneralHelper().getUser(args.get(count++)));
+                if (count == args.size()) {
+                    break;
+                }
+            }
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = count; i < args.size(); i++) {
+            stringBuilder.append(args.get(i));
+            if (i != args.size() - 1) {
+                stringBuilder.append(" ");
+            }
+        }
+
+        String message;
+
+        if (receivers.size() == 0) {
+            message = "**" + sender + "** is *cuddling* themselves! That's kind of sad...";
+        } else {
+            message = "**" + sender + "** is *cuddling* **" + CafeBot.getInteractionHandler().getReceiverString(receivers) + "**.";
+        }
+
+        if (stringBuilder.isEmpty()) {
             event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionEmbed(url)).queue();
         } else {
-            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, args)).queue();
+            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, stringBuilder.toString())).queue();
         }
     }
 
@@ -55,8 +81,7 @@ public String exampleUsage() {
     @Override
     public Usage getUsage() {
         Usage usage = new Usage();
-        usage.addUsage(CommandType.USER, "User Mention", true);
-        usage.addUsage(CommandType.SENTENCE, "Extra Message", false);
+        usage.addUsage(CommandType.SENTENCE, "Users + Extra Message", false);
         return usage;
     }
 

diff --git a/src/main/java/com/beanbeanjuice/command/interaction/HeadPatCommand.java b/src/main/java/com/beanbeanjuice/command/interaction/HeadPatCommand.java
@@ -22,13 +22,39 @@ public class HeadPatCommand implements ICommand {
     public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildMessageReceivedEvent event) {
         String url = CafeBot.getInteractionHandler().getHeadPatImage();
         String sender = user.getName();
-        String receiver = CafeBot.getGeneralHelper().getUser(args.get(0)).getName();
-        String message = "**" + sender + "** gave *headpats* to **" + receiver + "**!";
 
-        if (args.size() == 1) {
+        ArrayList<User> receivers = new ArrayList<>();
+        int count = 0;
+
+        if (!args.isEmpty()) {
+            while (CafeBot.getGeneralHelper().getUser(args.get(count)) != null) {
+                receivers.add(CafeBot.getGeneralHelper().getUser(args.get(count++)));
+                if (count == args.size()) {
+                    break;
+                }
+            }
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = count; i < args.size(); i++) {
+            stringBuilder.append(args.get(i));
+            if (i != args.size() - 1) {
+                stringBuilder.append(" ");
+            }
+        }
+
+        String message;
+
+        if (receivers.size() == 0) {
+            message = "**" + sender + "** *headpats* themselves! This... is just sad.";
+        } else {
+            message = "**" + sender + "** *headpats* **" + CafeBot.getInteractionHandler().getReceiverString(receivers) + "**.";
+        }
+
+        if (stringBuilder.isEmpty()) {
             event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionEmbed(url)).queue();
         } else {
-            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, args)).queue();
+            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, stringBuilder.toString())).queue();
         }
     }
 
@@ -57,8 +83,7 @@ public String exampleUsage() {
     @Override
     public Usage getUsage() {
         Usage usage = new Usage();
-        usage.addUsage(CommandType.USER, "User Mention", true);
-        usage.addUsage(CommandType.SENTENCE, "Extra Message", false);
+        usage.addUsage(CommandType.SENTENCE, "Users + Extra Message", false);
         return usage;
     }
 

diff --git a/src/main/java/com/beanbeanjuice/command/interaction/HmphCommand.java b/src/main/java/com/beanbeanjuice/command/interaction/HmphCommand.java
@@ -22,13 +22,39 @@ public class HmphCommand implements ICommand {
     public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildMessageReceivedEvent event) {
         String url = CafeBot.getInteractionHandler().getHmphImage();
         String sender = user.getName();
-        String receiver = CafeBot.getGeneralHelper().getUser(args.get(0)).getName();
-        String message = "**" + sender + "** *hmphed* at **" + receiver + "**!";
 
-        if (args.size() == 1) {
+        ArrayList<User> receivers = new ArrayList<>();
+        int count = 0;
+
+        if (!args.isEmpty()) {
+            while (CafeBot.getGeneralHelper().getUser(args.get(count)) != null) {
+                receivers.add(CafeBot.getGeneralHelper().getUser(args.get(count++)));
+                if (count == args.size()) {
+                    break;
+                }
+            }
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = count; i < args.size(); i++) {
+            stringBuilder.append(args.get(i));
+            if (i != args.size() - 1) {
+                stringBuilder.append(" ");
+            }
+        }
+
+        String message;
+
+        if (receivers.size() == 0) {
+            message = "**" + sender + "** *hmphed*!";
+        } else {
+            message = "**" + sender + "** *hmphed* at **" + CafeBot.getInteractionHandler().getReceiverString(receivers) + "**.";
+        }
+
+        if (stringBuilder.isEmpty()) {
             event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionEmbed(url)).queue();
         } else {
-            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, args)).queue();
+            event.getChannel().sendMessage(message).embed(CafeBot.getInteractionHandler().actionWithDescriptionEmbed(url, stringBuilder.toString())).queue();
         }
     }
 
@@ -55,8 +81,7 @@ public String exampleUsage() {
     @Override
     public Usage getUsage() {
         Usage usage = new Usage();
-        usage.addUsage(CommandType.USER, "User Mention", true);
-        usage.addUsage(CommandType.SENTENCE, "Extra Message", false);
+        usage.addUsage(CommandType.SENTENCE, "Users + Extra Message", false);
         return usage;
     }