updated BotInfo.java & extracted Uptime String

Author: jasonlessenich

src/main/java/com/javadiscord/javabot/commands/user_commands/BotInfo.java

@@ -5,6 +5,7 @@
 import com.javadiscord.javabot.other.Constants;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
+import net.dv8tion.jda.api.interactions.components.Button;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
 
 import java.lang.management.ManagementFactory;
@@ -13,43 +14,28 @@
 import java.util.concurrent.TimeUnit;
 
 public class BotInfo implements SlashCommandHandler {
+
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
+
         long ping = event.getJDA().getGatewayPing();
         var bot = event.getJDA().getSelfUser();
-        String botImage = bot.getAvatarUrl();
-        String botTag = bot.getAsTag();
-        String botName = bot.getName();
-        String botOS = System.getProperty("os.name");
-
-        RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
-        long uptimeMS = rb.getUptime();
-
-        long uptimeDAYS = TimeUnit.MILLISECONDS.toDays(uptimeMS);
-        uptimeMS -= TimeUnit.DAYS.toMillis(uptimeDAYS);
-        long uptimeHRS = TimeUnit.MILLISECONDS.toHours(uptimeMS);
-        uptimeMS -= TimeUnit.HOURS.toMillis(uptimeHRS);
-        long uptimeMIN = TimeUnit.MILLISECONDS.toMinutes(uptimeMS);
-        uptimeMS -= TimeUnit.MINUTES.toMillis(uptimeMIN);
-        long uptimeSEC = TimeUnit.MILLISECONDS.toSeconds(uptimeMS);
-
-        long botMemTotal = Runtime.getRuntime().totalMemory() / 1048576;
-        long botMemFree = Runtime.getRuntime().freeMemory() / 1048576;
-        long botMemUsed = botMemTotal - botMemFree;
 
-        EmbedBuilder eb = new EmbedBuilder()
+        var e = new EmbedBuilder()
             .setColor(Constants.GRAY)
-            .setDescription("**" + botName + "** - currently running version `" + new Version().getVersion(event.getJDA()) + "`")
-            .setThumbnail(botImage)
-            .setAuthor(botName + " | Info", null, botImage)
-            .addField("Name", "```" + botTag + "```", true)
-            .addField("OS", "```" + botOS + "```", true)
-            .addField("Library", "```JDA (Java)```", true)
+            .setThumbnail(bot.getEffectiveAvatarUrl())
+            .setAuthor(bot.getName() + " | Info", null, bot.getEffectiveAvatarUrl())
+            .setDescription("**" + bot.getName() + "** - currently running Version `" + new Version().getVersion(event.getJDA()) + "`")
+            .addField("OS", "```" + System.getProperty("os.name") + "```", true)
+            .addField("Library", "```JDA```", true)
+            .addField("JDK", "```" + System.getProperty("java.version") + "```", true)
             .addField("Ping", "```" + ping + "ms```", true)
-            .addField("Uptime", "```" + uptimeDAYS + "d " + uptimeHRS + "h " + uptimeMIN + "min " + uptimeSEC + "s```", true)
-            .addField("Memory (current Runtime)", "```" + botMemUsed + "MB / " + botMemTotal + "MB```", false)
-            .setTimestamp(new Date().toInstant());
+            .addField("Uptime", "```" + new Uptime().getUptime() + "```", true)
+            .setTimestamp(new Date().toInstant())
+            .build();
 
-        return event.replyEmbeds(eb.build());
+        return event.replyEmbeds(e).addActionRow(
+                Button.link(Constants.GITHUB_LINK, "View on GitHub")
+        );
     }
 }

src/main/java/com/javadiscord/javabot/commands/user_commands/Uptime.java

@@ -12,8 +12,8 @@
 
 public class Uptime implements SlashCommandHandler {
 
-    @Override
-    public ReplyAction handle(SlashCommandEvent event) {
+    public String getUptime() {
+
         RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
         long uptimeMS = rb.getUptime();
 
@@ -25,12 +25,19 @@ public ReplyAction handle(SlashCommandEvent event) {
         uptimeMS -= TimeUnit.MINUTES.toMillis(uptimeMIN);
         long uptimeSEC = TimeUnit.MILLISECONDS.toSeconds(uptimeMS);
 
+        return String.format("%sd %sh %smin %ss",
+                uptimeDAYS, uptimeHRS, uptimeMIN, uptimeSEC);
+    }
+
+    @Override
+    public ReplyAction handle(SlashCommandEvent event) {
+
         String botImage = event.getJDA().getSelfUser().getAvatarUrl();
 
-        EmbedBuilder eb = new EmbedBuilder()
+        var e = new EmbedBuilder()
             .setColor(Constants.GRAY)
-            .setAuthor(uptimeDAYS + "d " + uptimeHRS + "h " + uptimeMIN + "min " + uptimeSEC + "s", null, botImage);
+            .setAuthor(getUptime(), null, botImage);
 
-        return event.replyEmbeds(eb.build());
+        return event.replyEmbeds(e.build());
     }
 }

src/main/java/com/javadiscord/javabot/other/Constants.java

@@ -14,6 +14,7 @@ public class Constants {
         public static final String WEBSITE  = "https://javadiscord.net";
         public static final String HELP_LINK  = "https://pages.javadiscord.net/archived/commands"; //Archived, /help is unnecessary due to slash-commands
         public static final String QOTW_LINK  = "https://pages.javadiscord.net/qotw/qotw";
+        public static final String GITHUB_LINK = "https://github.com/Java-Discord/JavaBot/";
 
         //              EMOTES