Make things look nice

YatopiaMC · Jan 31, 2021 · 8fb2689 · 8fb2689
1 parent af53185
commit 8fb2689
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 33 deletions.
diff --git a/src/main/java/org/yatopiamc/bot/YatopiaBot.java b/src/main/java/org/yatopiamc/bot/YatopiaBot.java
@@ -13,7 +13,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.yatopiamc.bot.commands.CommandAsk;
 import org.yatopiamc.bot.commands.CommandDownloadSpecific;
 import org.yatopiamc.bot.commands.CommandJDKSpecific;
 import org.yatopiamc.bot.commands.CommandMappingSpecific;
@@ -121,9 +120,9 @@ public void start() throws LoginException, InterruptedException, IOException {
     settings.setHelpCommandEmbed(
         () ->
             EmbedUtil.defaultEmbed()
-                .setTitle("`()` - optional ; `[]` - required")
+                .setTitle("Yatopia Bot -- `()` - optional, `[]` - required")
                 .setThumbnail(
-                    "https://cdn.discordapp.com/attachments/745296670631395482/745298764788400238/yatipia.png"));
+                    "https://yatopiamc.org/static/img/yatopia-shiny.gif"));
     settings.setFailReasonHandler(null);
     settings.setCommandsPerHelpPage(10);
     settings.setLogExecutedCommands(true);
@@ -137,7 +136,6 @@ public void start() throws LoginException, InterruptedException, IOException {
         new CommandJDKSpecific(),
         new CommandDownloadSpecific(),
         new CommandYatopiaSpecific(),
-        new CommandAsk(),
         new CommandVanilla(),
         new CommandUpstream(),
         new CommandMappingSpecific(this),

diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandAsk.java b/src/main/java/org/yatopiamc/bot/commands/CommandAsk.java
diff --git a/src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java b/src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java
@@ -9,6 +9,7 @@
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
@@ -20,10 +21,12 @@
 import org.slf4j.LoggerFactory;
 import org.yatopiamc.bot.util.NetworkUtils;
 
+import java.awt.*;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -84,7 +87,11 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         final CompletableFuture<Message> inProgress = inProgress(message);
         final CompletableFuture<SimpleHttpResponse> timingsJsonRequest = loadingCache.getUnchecked(timingsHost + "data.php?id=" + timingsId);
         final EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setTitle("Timings Analysis", url);
+        final User messageAuthor = event.getAuthor();
+        embedBuilder.setTitle("Timings Analysis"); //remove url because people delete timings reports
+        embedBuilder.setColor(0xffff00);
+        embedBuilder.setTimestamp(Instant.now());
+        embedBuilder.setAuthor(messageAuthor.getAsTag(), messageAuthor.getEffectiveAvatarUrl(), messageAuthor.getEffectiveAvatarUrl());
         timingsJsonRequest.handleAsync((response, throwable) -> {
             boolean hasError = false;
             long startProcessingTime = System.currentTimeMillis();
@@ -136,7 +143,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
                     }
                     embedBuilder.addField(String.format("Plus %d more recommendations", size - 24), "Create a new timings report after resolving some of the above issues to see more.", false);
                 }
-                embedBuilder.setFooter(String.format("Timing: %dms network, %dms processing", startProcessingTime - startTime, System.currentTimeMillis() - startProcessingTime));
+                embedBuilder.setFooter(String.format("https://yatopiamc.org/ • Timing: %dms network, %dms processing", startProcessingTime - startTime, System.currentTimeMillis() - startProcessingTime),
+                        event.getJDA().getSelfUser().getEffectiveAvatarUrl());
                 inProgress.handle((msg, t) -> {
                     if(msg != null) {
                         msg.editMessage(embedBuilder.build()).queue();
@@ -219,7 +227,7 @@ private void checkSystem(EmbedBuilder embedBuilder, JsonObject timingsMaster) {
     private void checkCPU(EmbedBuilder embedBuilder, JsonObject system) {
         final int cpu = system.get("cpu").getAsInt();
         if(cpu < 4)
-            embedBuilder.addField("CPU Threads", String.format("You have only %d thread(s). Find a better host", cpu), true);
+            embedBuilder.addField("CPU Threads", String.format("You have only %d thread(s). Find a better host.", cpu), true);
     }
 
     private void checkJvmFlags(EmbedBuilder embedBuilder, JsonObject system) {