|
9 | 9 | import net.dv8tion.jda.api.EmbedBuilder;
|
10 | 10 | import net.dv8tion.jda.api.entities.Message;
|
11 | 11 | import net.dv8tion.jda.api.entities.MessageEmbed;
|
| 12 | +import net.dv8tion.jda.api.entities.User; |
12 | 13 | import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
13 | 14 | import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
14 | 15 | import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
|
|
20 | 21 | import org.slf4j.LoggerFactory;
|
21 | 22 | import org.yatopiamc.bot.util.NetworkUtils;
|
22 | 23 |
|
| 24 | +import java.awt.*; |
23 | 25 | import java.net.MalformedURLException;
|
24 | 26 | import java.net.URI;
|
25 | 27 | import java.net.URISyntaxException;
|
26 | 28 | import java.net.URL;
|
| 29 | +import java.time.Instant; |
27 | 30 | import java.util.ArrayList;
|
28 | 31 | import java.util.Arrays;
|
29 | 32 | import java.util.List;
|
@@ -84,7 +87,11 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
|
84 | 87 | final CompletableFuture<Message> inProgress = inProgress(message);
|
85 | 88 | final CompletableFuture<SimpleHttpResponse> timingsJsonRequest = loadingCache.getUnchecked(timingsHost + "data.php?id=" + timingsId);
|
86 | 89 | final EmbedBuilder embedBuilder = new EmbedBuilder();
|
87 |
| - embedBuilder.setTitle("Timings Analysis", url); |
| 90 | + final User messageAuthor = event.getAuthor(); |
| 91 | + embedBuilder.setTitle("Timings Analysis"); //remove url because people delete timings reports |
| 92 | + embedBuilder.setColor(0xffff00); |
| 93 | + embedBuilder.setTimestamp(Instant.now()); |
| 94 | + embedBuilder.setAuthor(messageAuthor.getAsTag(), messageAuthor.getEffectiveAvatarUrl(), messageAuthor.getEffectiveAvatarUrl()); |
88 | 95 | timingsJsonRequest.handleAsync((response, throwable) -> {
|
89 | 96 | boolean hasError = false;
|
90 | 97 | long startProcessingTime = System.currentTimeMillis();
|
@@ -136,7 +143,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
|
136 | 143 | }
|
137 | 144 | 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);
|
138 | 145 | }
|
139 |
| - embedBuilder.setFooter(String.format("Timing: %dms network, %dms processing", startProcessingTime - startTime, System.currentTimeMillis() - startProcessingTime)); |
| 146 | + embedBuilder.setFooter(String.format("https://yatopiamc.org/ • Timing: %dms network, %dms processing", startProcessingTime - startTime, System.currentTimeMillis() - startProcessingTime), |
| 147 | + event.getJDA().getSelfUser().getEffectiveAvatarUrl()); |
140 | 148 | inProgress.handle((msg, t) -> {
|
141 | 149 | if(msg != null) {
|
142 | 150 | msg.editMessage(embedBuilder.build()).queue();
|
@@ -219,7 +227,7 @@ private void checkSystem(EmbedBuilder embedBuilder, JsonObject timingsMaster) {
|
219 | 227 | private void checkCPU(EmbedBuilder embedBuilder, JsonObject system) {
|
220 | 228 | final int cpu = system.get("cpu").getAsInt();
|
221 | 229 | if(cpu < 4)
|
222 |
| - embedBuilder.addField("CPU Threads", String.format("You have only %d thread(s). Find a better host", cpu), true); |
| 230 | + embedBuilder.addField("CPU Threads", String.format("You have only %d thread(s). Find a better host.", cpu), true); |
223 | 231 | }
|
224 | 232 |
|
225 | 233 | private void checkJvmFlags(EmbedBuilder embedBuilder, JsonObject system) {
|
|
0 commit comments