Merge pull request #175 from beanbeanjuice/integration

Ready for Release v2.2.0

README.md

@@ -132,9 +132,10 @@ As you can see, this was shown using the command `!!help order`. It shows each p
 
 ##### 1. **GENERIC**
 * `help` - Shows the list of command sections and command list for those sections.
-* `ping` - Show bot information! Currently, you can only have 3 polls per Discord server due to server costs.
+* `ping` - Show bot information!
 * `feature-request` - Request a bot feature.
 * `bug-report` - Report a bug with the bot.
+* `user-info` - Get user information about someone.
 ##### 2. **CAFE**
 * `menu` - Show the list of Cafe menu items.
 * `serve` - Get beanCoins! Essentially you run this command by doing `!!serve (dictionary word)`! This must be an english word. The longer the word, the more money you get. However, the more popular the word is, the less money you will get for it.
@@ -143,11 +144,12 @@ As you can see, this was shown using the command `!!help order`. It shows each p
 ##### 3. **FUN**
 * `meme` - Send a meme in the current channel. (SFW)
 * `joke` - Send a joke in the current channel. (SFW)
-* `add-poll` - Create a poll!
-* `add-raffle` - Create a raffle!
+* `add-poll` - Create a poll! Currently, you can only have 3 polls due to server costs. This will go up in the future!
+* `add-raffle` - Create a raffle! Currently, you can only have 3 raffles due to server costs. This will go up in the future!
 * `avatar` - Get yours or someone else's avatar image!
 * `get-birthday` - Get yours or someone else's birthday!
 * `set-birthday` - Set your birthday! (YYYY-MM-DD)
+* `counting-statistics` - Get counting information for your server!
 ##### 4. **INTERACTION**
 * `hug` - Hug someone!
 * `punch` - Punch someone!
@@ -169,6 +171,7 @@ As you can see, this was shown using the command `!!help order`. It shows each p
 * `yell` - Yell at someone!
 * `headpat` - Give head pats to someone!
 * `cry` - Cry at someone!
+* `dance` - Dance with someone!
 ##### 5. **MUSIC**
 * `play` - Play a song or playlist!
 * `now-playing` - Show the current song playing.

build.gradle

@@ -17,7 +17,7 @@ task buildWithDependencies(type: Jar) {
 
 group 'com.beanbeanjuice'
 mainClassName = 'com.beanbeanjuice.main.CafeBot'
-version 'v2.1.2'
+version 'v2.2.0'
 
 repositories {
 
@@ -75,6 +75,9 @@ dependencies {
     // Time Stuff (For Birthdays)
     implementation group: 'joda-time', name: 'joda-time', version: '2.10.10'
 
+    // Apple Music/Itunes API
+    implementation group: 'be.ceau', name: 'itunes-api', version: '4.6.0'
+
 }
 
 test {

src/main/java/com/beanbeanjuice/command/cafe/BalanceCommand.java

@@ -50,7 +50,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
 
     public MessageEmbed selfBalanceEmbed(@NotNull CafeCustomer cafeCustomer) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("beanCoin Balance");
+        embedBuilder.setTitle("beanCoin Balance");
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         embedBuilder.addField("Orders Bought", cafeCustomer.getOrdersBought().toString(), true);
         embedBuilder.addField("Orders Received", cafeCustomer.getOrdersReceived().toString(), true);
@@ -60,7 +60,7 @@ public MessageEmbed selfBalanceEmbed(@NotNull CafeCustomer cafeCustomer) {
 
     public MessageEmbed otherBalanceEmbed(@NotNull User user, @NotNull CafeCustomer cafeCustomer) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("beanCoin Balance");
+        embedBuilder.setTitle("beanCoin Balance");
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         embedBuilder.addField("Orders Bought", cafeCustomer.getOrdersBought().toString(), true);
         embedBuilder.addField("Orders Received", cafeCustomer.getOrdersReceived().toString(), true);

src/main/java/com/beanbeanjuice/command/cafe/MenuCommand.java

@@ -57,7 +57,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     @NotNull
     private MessageEmbed menuItemEmbed(@NotNull MenuItem menuItem, @NotNull Integer itemIndex) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Menu Item - " + menuItem.getName());
+        embedBuilder.setTitle("Menu Item - " + menuItem.getName());
         embedBuilder.addField("Price", "`$" + menuItem.getPrice() + "` beanCoins", true);
         embedBuilder.addField("Item Number", String.valueOf(itemIndex+1), true);
         embedBuilder.setDescription(menuItem.getDescription());
@@ -69,7 +69,7 @@ private MessageEmbed menuItemEmbed(@NotNull MenuItem menuItem, @NotNull Integer
     @NotNull
     private MessageEmbed menuEmbed(@NotNull String description) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Menu Items");
+        embedBuilder.setTitle("Menu Items");
         embedBuilder.setDescription(description);
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         embedBuilder.setFooter("I hope you enjoy your stay!~");

src/main/java/com/beanbeanjuice/command/cafe/OrderCommand.java

@@ -85,7 +85,7 @@ private MessageEmbed orderEmbed(@NotNull CafeCustomer orderer, @NotNull CafeCust
         User receiverUser = CafeBot.getJDA().getUserById(receiver.getUserID());
 
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Order Bought!");
+        embedBuilder.setTitle("Order Bought!");
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
 
         // Adding a personalised message.

src/main/java/com/beanbeanjuice/command/cafe/ServeCommand.java

@@ -81,7 +81,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
 
     private MessageEmbed cannotServeEmbed(@NotNull Integer minutesLeft) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Cannot Serve - Cooldown");
+        embedBuilder.setTitle("Cannot Serve - Cooldown");
         int cooldownAmount = CafeBot.getServeHandler().getMinutesUntilCanServe() - minutesLeft;
         embedBuilder.setDescription("You cannot serve anything right now because you are on a cooldown for `" + cooldownAmount + "` more minutes!");
         embedBuilder.setColor(Color.red);
@@ -90,7 +90,7 @@ private MessageEmbed cannotServeEmbed(@NotNull Integer minutesLeft) {
 
     private MessageEmbed serveSingleEmbed(@NotNull String word, @NotNull Double tipFromWord, @NotNull Double currentBalance) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Successfully Served!");
+        embedBuilder.setTitle("Successfully Served!");
         embedBuilder.setDescription("You have successfully served a `" + word + "`!");
         embedBuilder.addField("Tip From Serving", CafeBot.getServeHandler().roundDouble(tipFromWord).toString(), true);
         embedBuilder.addField("Current Balance", CafeBot.getServeHandler().roundDouble(currentBalance).toString(), true);
@@ -100,7 +100,7 @@ private MessageEmbed serveSingleEmbed(@NotNull String word, @NotNull Double tipF
 
     private MessageEmbed serveSomeoneEmbed(@NotNull String word, @NotNull Double tipFromWord, @NotNull Double currentBalance, @NotNull User server, @NotNull User userServed) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Successfully Served!");
+        embedBuilder.setTitle("Successfully Served!");
         embedBuilder.setDescription(server.getAsMention() + " has successfully served a `" + word + "` to " + userServed.getAsMention() + "!");
         embedBuilder.addField("Tip From Serving", CafeBot.getServeHandler().roundDouble(tipFromWord).toString(), true);
         embedBuilder.addField("Current Balance", CafeBot.getServeHandler().roundDouble(currentBalance).toString(), true);

src/main/java/com/beanbeanjuice/command/fun/AddPollCommand.java

@@ -98,7 +98,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     @NotNull
     private MessageEmbed startingPollEmbed() {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Setting Up Polls...");
+        embedBuilder.setTitle("Setting Up Polls...");
         embedBuilder.setDescription("The poll is currently being setup. Please hold on.");
         embedBuilder.setColor(Color.orange);
         return embedBuilder.build();
@@ -108,7 +108,7 @@ private MessageEmbed startingPollEmbed() {
     private MessageEmbed pollEmbed(@NotNull String pollTitle, @NotNull String pollDescription,
                                    @NotNull Integer pollTime, @NotNull ArrayList<String> arguments) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor(pollTitle);
+        embedBuilder.setTitle(pollTitle);
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
 
         ArrayList<PollEmoji> pollEmojis = new ArrayList<>(Arrays.asList(PollEmoji.values()));

src/main/java/com/beanbeanjuice/command/fun/AddRaffleCommand.java

@@ -78,7 +78,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     private MessageEmbed raffleEmbed(@NotNull String title, @NotNull String description,
                                      @NotNull Integer minutes, @NotNull Integer winnerAmount) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor(title);
+        embedBuilder.setTitle(title);
         embedBuilder.addField("Raffle Details", description, false);
         embedBuilder.addField("Winner Amount", winnerAmount.toString(), false);
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
@@ -92,7 +92,7 @@ private MessageEmbed raffleEmbed(@NotNull String title, @NotNull String descript
 
     private MessageEmbed creatingRaffle() {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Creating Raffle...");
+        embedBuilder.setTitle("Creating Raffle...");
         embedBuilder.setDescription("Please wait while the raffle is created.");
         embedBuilder.setColor(Color.orange);
         return embedBuilder.build();

src/main/java/com/beanbeanjuice/command/fun/AvatarCommand.java

@@ -35,7 +35,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     @NotNull
     private MessageEmbed avatarEmbed(@NotNull User user) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor(user.getName() + "'s Avatar", user.getAvatarUrl());
+        embedBuilder.setTitle(user.getName() + "'s Avatar", user.getAvatarUrl());
         embedBuilder.setImage(user.getAvatarUrl() + "?size=512");
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         return embedBuilder.build();

src/main/java/com/beanbeanjuice/command/fun/CountingStatisticsCommand.java

@@ -0,0 +1,84 @@
+package com.beanbeanjuice.command.fun;
+
+import com.beanbeanjuice.main.CafeBot;
+import com.beanbeanjuice.utility.command.CommandContext;
+import com.beanbeanjuice.utility.command.ICommand;
+import com.beanbeanjuice.utility.command.usage.Usage;
+import com.beanbeanjuice.utility.command.usage.categories.CategoryType;
+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.message.guild.GuildMessageReceivedEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+/**
+ * An {@link ICommand} to get the current number for the {@link net.dv8tion.jda.api.entities.Guild Guild}.
+ *
+ * @author beanbeanjuice
+ */
+public class CountingStatisticsCommand implements ICommand {
+
+    @Override
+    public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildMessageReceivedEvent event) {
+        Integer highestNumber = CafeBot.getCountingHelper().getHighestNumber(event.getGuild());
+        Integer currentNumber = CafeBot.getCountingHelper().getLastNumber(event.getGuild());
+
+        if (highestNumber == null || currentNumber == null) {
+            event.getChannel().sendMessage(CafeBot.getGeneralHelper().sqlServerError()).queue();
+            return;
+        }
+
+        event.getChannel().sendMessage(countingStatisticsEmbed(highestNumber, currentNumber)).queue();
+    }
+
+    @NotNull
+    private MessageEmbed countingStatisticsEmbed(@NotNull Integer highestNumber, @NotNull Integer currentNumber) {
+        EmbedBuilder embedBuilder = new EmbedBuilder();
+        embedBuilder.setTitle("Current Number");
+        embedBuilder.addField("Highest Number", highestNumber.toString(), true);
+        embedBuilder.addField("Current Number", currentNumber.toString(), true);
+        embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
+        return embedBuilder.build();
+    }
+
+    @Override
+    public String getName() {
+        return "counting-statistics";
+    }
+
+    @Override
+    public ArrayList<String> getAliases() {
+        ArrayList<String> arrayList = new ArrayList<>();
+        arrayList.add("current-number");
+        arrayList.add("currentnumber");
+        arrayList.add("highest-number");
+        arrayList.add("highestnumber");
+        arrayList.add("countingstatistics");
+        arrayList.add("counting-stats");
+        arrayList.add("countingstats");
+        return arrayList;
+    }
+
+    @Override
+    public String getDescription() {
+        return "Get the counting stats for the server!";
+    }
+
+    @Override
+    public String exampleUsage() {
+        return "`!!counting-stats`";
+    }
+
+    @Override
+    public Usage getUsage() {
+        return new Usage();
+    }
+
+    @Override
+    public CategoryType getCategoryType() {
+        return CategoryType.FUN;
+    }
+
+}

src/main/java/com/beanbeanjuice/command/fun/GetBirthdayCommand.java

@@ -48,7 +48,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     private MessageEmbed birthdayEmbed(@NotNull User user, @NotNull Date birthday) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
-        embedBuilder.setAuthor(user.getName() + "'s Birthday");
+        embedBuilder.setTitle(user.getName() + "'s Birthday");
         embedBuilder.setDescription("Their birthday is on " + birthday.toString() + ". (YYYY/MM/DD)");
         return embedBuilder.build();
     }

src/main/java/com/beanbeanjuice/command/fun/JokeCommand.java

@@ -45,7 +45,7 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     @NotNull
     private MessageEmbed messageEmbed(@NotNull String title, @NotNull String url, @NotNull String body) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor(title, url);
+        embedBuilder.setTitle(title, url);
         embedBuilder.setDescription(body);
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         return embedBuilder.build();
@@ -54,7 +54,7 @@ private MessageEmbed messageEmbed(@NotNull String title, @NotNull String url, @N
     @NotNull
     private MessageEmbed cannotGetJSONEmbed() {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("Error");
+        embedBuilder.setTitle("Error");
         embedBuilder.setColor(Color.red);
         embedBuilder.setDescription("Unable to get JSON.");
         return embedBuilder.build();

src/main/java/com/beanbeanjuice/command/fun/MemeCommand.java

@@ -53,7 +53,7 @@ private MessageEmbed cannotGetJSONEmbed() {
     @NotNull
     private MessageEmbed messageEmbed(@NotNull String title, @NotNull String url, @NotNull String image) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor(title, url);
+        embedBuilder.setTitle(title, url);
         embedBuilder.setImage(image);
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         return embedBuilder.build();

src/main/java/com/beanbeanjuice/command/generic/BugReportCommand.java

@@ -28,7 +28,7 @@ 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.setTitle("Bug Report", BUG_REPORT_URL);
         embedBuilder.setDescription("""
                 If you want to submit a bug report, please click on the title above.
 

src/main/java/com/beanbeanjuice/command/generic/FeatureRequestCommand.java

@@ -28,7 +28,7 @@ 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.setTitle("Feature Request", FEATURE_REQUEST_URL);
         embedBuilder.setDescription("""
                 If you want to submit a feature request, please click on the title above.
 

src/main/java/com/beanbeanjuice/command/generic/HelpCommand.java

@@ -64,7 +64,7 @@ private MessageEmbed commandEmbed(@NotNull String prefix, @NotNull ICommand comm
 
         stringBuilder.append("`").append(prefix).append(command.getName());
         StringBuilder paramBuilder = new StringBuilder();
-        embedBuilder.setAuthor(command.getName().toUpperCase() + " Command");
+        embedBuilder.setTitle(command.getName().toUpperCase() + " Command");
         ArrayList<CommandUsage> usages = command.getUsage().getUsages();
         paramBuilder.append("`");
 
@@ -150,7 +150,7 @@ private MessageEmbed categoryEmbed() {
     @NotNull
     private MessageEmbed noCommandFoundEmbed(@NotNull String commandName) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor("No Command Found");
+        embedBuilder.setTitle("No Command Found");
         embedBuilder.setDescription("No command has been found for `" + commandName + "`.");
         embedBuilder.setColor(Color.red);
         embedBuilder.setFooter("If you need more help with commands, visit https://www.github.com/beanbeanjuice/cafeBot!");

src/main/java/com/beanbeanjuice/command/generic/PingCommand.java

@@ -32,15 +32,15 @@ public void handle(CommandContext ctx, ArrayList<String> args, User user, GuildM
     @NotNull
     private MessageEmbed messageEmbed(@NotNull Long botPing, @NotNull Long gatewayPing) {
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor(getName() + "!", "https://www.beanbeanjuice.com/cafeBot.html");
+        embedBuilder.setTitle(getName() + "!", "https://www.beanbeanjuice.com/cafeBot.html");
         StringBuilder descriptionBuilder = new StringBuilder();
         descriptionBuilder.append("**Rest Ping** - `").append(botPing.toString()).append("`\n")
                 .append("**Gateway Ping** - `").append(gatewayPing.toString()).append("`\n")
                 .append("**Current Version** - `").append(CafeBot.getBotVersion()).append("`\n\n")
                 .append("Hello there! How are you? Would you like to order some coffee?");
         embedBuilder.setDescription(descriptionBuilder.toString());
         embedBuilder.setFooter("Author: beanbeanjuice - " + "https://github.com/beanbeanjuice/cafeBot");
-        embedBuilder.setThumbnail(CafeBot.getJDA().getSelfUser().getAvatarUrl());
+        embedBuilder.setThumbnail(CafeBot.getDiscordAvatarUrl());
         embedBuilder.setColor(CafeBot.getGeneralHelper().getRandomColor());
         return embedBuilder.build();
     }