Skip to content
This repository was archived by the owner on Jun 19, 2021. It is now read-only.

Commit 8fb2689

Browse files
committed
Make things look nice
1 parent af53185 commit 8fb2689

File tree

3 files changed

+13
-33
lines changed

3 files changed

+13
-33
lines changed

src/main/java/org/yatopiamc/bot/YatopiaBot.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.jetbrains.annotations.NotNull;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
16-
import org.yatopiamc.bot.commands.CommandAsk;
1716
import org.yatopiamc.bot.commands.CommandDownloadSpecific;
1817
import org.yatopiamc.bot.commands.CommandJDKSpecific;
1918
import org.yatopiamc.bot.commands.CommandMappingSpecific;
@@ -121,9 +120,9 @@ public void start() throws LoginException, InterruptedException, IOException {
121120
settings.setHelpCommandEmbed(
122121
() ->
123122
EmbedUtil.defaultEmbed()
124-
.setTitle("`()` - optional ; `[]` - required")
123+
.setTitle("Yatopia Bot -- `()` - optional, `[]` - required")
125124
.setThumbnail(
126-
"https://cdn.discordapp.com/attachments/745296670631395482/745298764788400238/yatipia.png"));
125+
"https://yatopiamc.org/static/img/yatopia-shiny.gif"));
127126
settings.setFailReasonHandler(null);
128127
settings.setCommandsPerHelpPage(10);
129128
settings.setLogExecutedCommands(true);
@@ -137,7 +136,6 @@ public void start() throws LoginException, InterruptedException, IOException {
137136
new CommandJDKSpecific(),
138137
new CommandDownloadSpecific(),
139138
new CommandYatopiaSpecific(),
140-
new CommandAsk(),
141139
new CommandVanilla(),
142140
new CommandUpstream(),
143141
new CommandMappingSpecific(this),

src/main/java/org/yatopiamc/bot/commands/CommandAsk.java

-26
This file was deleted.

src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java

+11-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.dv8tion.jda.api.EmbedBuilder;
1010
import net.dv8tion.jda.api.entities.Message;
1111
import net.dv8tion.jda.api.entities.MessageEmbed;
12+
import net.dv8tion.jda.api.entities.User;
1213
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
1314
import net.dv8tion.jda.api.hooks.ListenerAdapter;
1415
import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
@@ -20,10 +21,12 @@
2021
import org.slf4j.LoggerFactory;
2122
import org.yatopiamc.bot.util.NetworkUtils;
2223

24+
import java.awt.*;
2325
import java.net.MalformedURLException;
2426
import java.net.URI;
2527
import java.net.URISyntaxException;
2628
import java.net.URL;
29+
import java.time.Instant;
2730
import java.util.ArrayList;
2831
import java.util.Arrays;
2932
import java.util.List;
@@ -84,7 +87,11 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
8487
final CompletableFuture<Message> inProgress = inProgress(message);
8588
final CompletableFuture<SimpleHttpResponse> timingsJsonRequest = loadingCache.getUnchecked(timingsHost + "data.php?id=" + timingsId);
8689
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());
8895
timingsJsonRequest.handleAsync((response, throwable) -> {
8996
boolean hasError = false;
9097
long startProcessingTime = System.currentTimeMillis();
@@ -136,7 +143,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
136143
}
137144
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);
138145
}
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());
140148
inProgress.handle((msg, t) -> {
141149
if(msg != null) {
142150
msg.editMessage(embedBuilder.build()).queue();
@@ -219,7 +227,7 @@ private void checkSystem(EmbedBuilder embedBuilder, JsonObject timingsMaster) {
219227
private void checkCPU(EmbedBuilder embedBuilder, JsonObject system) {
220228
final int cpu = system.get("cpu").getAsInt();
221229
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);
223231
}
224232

225233
private void checkJvmFlags(EmbedBuilder embedBuilder, JsonObject system) {

0 commit comments

Comments
 (0)