Updated plugin to support JDA v4 (#2)

* Updated bot to JDA 4

* Update CI build version

* Update plugin version and Ava version requirement

* Remove unused imports

Co-authored-by: Codixer <stefano@stefanocoding.me>
Co-authored-by: Alexis Tan <alexis@sen-dev.com>

Author: Xeravax

build.gradle

@@ -6,7 +6,7 @@ plugins {
 apply plugin: 'java'
 
 group 'com.avairebot'
-version '1.2.2'
+version '1.3.0'
 description 'Adds a starboard command to Ava, allowing servers to define a starboard channel'
 
 sourceCompatibility = 1.8
@@ -22,6 +22,6 @@ dependencies {
     // This is nice for local development if you want to use a custom build of Ava.
     // compileOnly files('./AvaIre.jar')
 
-    // Version 0.9.165
-    compileOnly tc(buildTypeId: 'Avaire_Build', version: '1', artifactPath: 'AvaIre.jar')
+    // Version 0.10.15
+    compileOnly tc(buildTypeId: 'Avaire_Build', version: '60', artifactPath: 'AvaIre.jar')
 }

src/main/java/com/avairebot/starboard/Starboard.java

@@ -44,7 +44,7 @@ public boolean getIgnoreOwnMessages() {
     }
 
     public Color getColor(float percentage) {
-        percentage = percentage > 1.0F ? 1.0F : percentage;
+        percentage = Math.min(percentage, 1.0F);
         percentage = percentage < 0.0F ? 0.05F : percentage;
 
         float inverse_blending = 1 - percentage;
@@ -97,9 +97,7 @@ public boolean updateStarboardDatabaseValue(String guildId, String value) {
         try {
             getDatabase().newQueryBuilder(Constants.GUILD_TABLE_NAME)
                     .where("id", guildId)
-                    .update(statement -> {
-                        statement.set("starboard", value);
-                    });
+                    .update(statement -> statement.set("starboard", value));
 
             starboardCache.put(guildId, value);
 

src/main/java/com/avairebot/starboard/command/StarboardCommand.java

@@ -8,8 +8,8 @@
 import com.avairebot.starboard.Starboard;
 import com.avairebot.utilities.ComparatorUtil;
 import com.avairebot.utilities.MentionableUtil;
-import net.dv8tion.jda.core.entities.Channel;
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.entities.GuildChannel;
+import net.dv8tion.jda.api.entities.TextChannel;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -102,8 +102,8 @@ public boolean onCommand(CommandMessage context, String[] args) {
             return sendErrorMessage(context, "Failed to update the starboard value for the server, please try again later.");
         }
 
-        Channel channel = MentionableUtil.getChannel(context.getMessage(), args);
-        if (channel == null || !(channel instanceof TextChannel)) {
+        GuildChannel channel = MentionableUtil.getChannel(context.getMessage(), args);
+        if (!(channel instanceof TextChannel)) {
             return sendErrorMessage(context, "Invalid channel mentioned, you just mention or name a valid text channel.");
         }
 

src/main/java/com/avairebot/starboard/handlers/EmoteEventListener.java

@@ -3,11 +3,11 @@
 import com.avairebot.contracts.handlers.EventListener;
 import com.avairebot.starboard.Starboard;
 import com.avairebot.utilities.RestActionUtil;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.MessageReaction;
-import net.dv8tion.jda.core.entities.TextChannel;
-import net.dv8tion.jda.core.events.message.guild.react.GuildMessageReactionAddEvent;
-import net.dv8tion.jda.core.events.message.guild.react.GuildMessageReactionRemoveEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.MessageReaction;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.events.message.guild.react.GuildMessageReactionAddEvent;
+import net.dv8tion.jda.api.events.message.guild.react.GuildMessageReactionRemoveEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +54,7 @@ private void handleStarEvent(MessageReaction messageReaction, Member member, lon
             return;
         }
 
-        messageReaction.getTextChannel().getMessageById(messageId).queue(message -> {
+        messageReaction.getTextChannel().retrieveMessageById(messageId).queue(message -> {
             if (starboard.getIgnoreOwnMessages() && message.getAuthor().getIdLong() == member.getUser().getIdLong()) {
                 return;
             }

src/main/java/com/avairebot/starboard/handlers/StarReaction.java

@@ -1,7 +1,8 @@
 package com.avairebot.starboard.handlers;
 
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.TextChannel;
+
 
 public class StarReaction {
 

src/main/java/com/avairebot/starboard/job/UpdateStarJob.java

@@ -7,11 +7,11 @@
 import com.avairebot.starboard.handlers.EmoteEventListener;
 import com.avairebot.starboard.handlers.StarReaction;
 import com.avairebot.utilities.RestActionUtil;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.MessageBuilder;
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.entities.MessageReaction;
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageReaction;
+import net.dv8tion.jda.api.entities.TextChannel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,7 +69,7 @@ private void handleReaction(Message message, TextChannel starboardChannel, long
                 return;
             }
 
-            starboardChannel.getMessageById(row.getString("message_id")).queue(starboardMessage -> {
+            starboardChannel.retrieveMessageById(row.getString("message_id")).queue(starboardMessage -> {
                 starboardMessage.delete().queue(aVoid -> {
                     try {
                         starboard.getDatabase()
@@ -86,7 +86,7 @@ private void handleReaction(Message message, TextChannel starboardChannel, long
 
         EmbedBuilder embedBuilder = MessageFactory.createEmbeddedBuilder()
                 .setColor(starboard.getColor((float) emoteCount / 13))
-                .setTimestamp(message.getCreationTime())
+                .setTimestamp(message.getTimeCreated())
                 .setAuthor(message.getAuthor().getName(), null, message.getAuthor().getEffectiveAvatarUrl())
                 .setDescription(message.getContentRaw());
 
@@ -120,7 +120,7 @@ private void handleReaction(Message message, TextChannel starboardChannel, long
             }
             starboardChannel.sendMessage(build).queue(consumer -> createNewRecord(consumer, messageId));
         } else {
-            starboardChannel.getMessageById(row.getString("message_id")).queue(starMessage -> {
+            starboardChannel.retrieveMessageById(row.getString("message_id")).queue(starMessage -> {
                 if (emoteCount < starboard.getReactionRequirement()) {
                     starMessage.delete().queue(aVoid -> deleteMessageRecord(messageId));
 

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: 'Starboard'
 main: 'com.avairebot.starboard.Starboard'
-version: '1.2.2'
+version: '1.3.0'
 author: 'Alexis Tan <Senither#0001>'
 description: 'Starboard is a simple plugin that can be used to define a starboard channel per-server, users can then react to messages using the star emoji to get messages showing up on in the starboard channel.'
-requires: '0.7.71'
+requires: '0.10.15'