From 4f6b41c40fc72d1906e2807a6adf53115aa3d049 Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Sun, 15 Nov 2020 14:30:49 +0300 Subject: [PATCH 1/4] cleanup --- src/corebot/Commands.java | 9 +++++---- src/corebot/Messages.java | 13 ++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/corebot/Commands.java b/src/corebot/Commands.java index 39599bb0..0f29acc6 100644 --- a/src/corebot/Commands.java +++ b/src/corebot/Commands.java @@ -111,7 +111,7 @@ public class Commands{ builder.addField("Downloads", args[0] + (args[0].endsWith("/") ? "" : "/") + "releases", false); - messages.channel.getGuild().getTextChannelById(pluginChannelID).sendMessage(builder.build()).queue(); + messages.guild.getTextChannelById(pluginChannelID).sendMessage(builder.build()).queue(); messages.text("*Plugin posted.*"); }catch(IOException e){ @@ -147,7 +147,7 @@ public class Commands{ if(map.description != null) builder.setFooter(map.description); - messages.channel.getGuild().getTextChannelById(mapsChannelID).sendFile(mapFile).addFile(imageFile.file()).embed(builder.build()).queue(); + messages.guild.getTextChannelById(mapsChannelID).sendFile(mapFile).addFile(imageFile.file()).embed(builder.build()).queue(); messages.text("*Map posted successfully.*"); }catch(Exception e){ @@ -244,7 +244,7 @@ public class Commands{ messages.text("**@**, you've been warned *@*.", user.getAsMention(), warningStrings[Mathf.clamp(warnings - 1, 0, warningStrings.length - 1)]); prefs.put("warnings-" + l, warnings + ""); if(warnings >= 3){ - messages.lastMessage.getGuild().getTextChannelById(moderationChannelID) + messages.guild.getTextChannelById(moderationChannelID) .sendMessage("User " + user.getAsMention() + " has been warned 3 or more times!").queue(); } }catch(Exception e){ @@ -368,7 +368,8 @@ void handle(Message message){ EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor).setColor(messages.normalColor) .setImage("attachment://" + previewFile.getName()) - .setAuthor(message.getAuthor().getName(), message.getAuthor().getAvatarUrl(), message.getAuthor().getAvatarUrl()).setTitle(schem.name()); + .setAuthor(message.getAuthor().getName(), message.getAuthor().getAvatarUrl(), message.getAuthor().getEffectiveAvatarUrl()) + .setTitle(schem.name()); if(!schem.description().isEmpty()) builder.setFooter(schem.description()); diff --git a/src/corebot/Messages.java b/src/corebot/Messages.java index 9446698a..e26ff15d 100644 --- a/src/corebot/Messages.java +++ b/src/corebot/Messages.java @@ -87,7 +87,7 @@ private static String durFormat(Duration duration){ if(duration.toHours() > 0) return duration.toHours() + "h"; return duration.toMinutes() + "m"; } - + @Override public void onMessageReceived(MessageReceivedEvent event){ try{ @@ -172,13 +172,12 @@ public void sendCrash(JsonValue value){ } public void text(String text, Object... args){ - lastSentMessage = channel.sendMessage(format(text, args)).complete(); + lastSentMessage = channel.sendMessage(Strings.format(text, args)).complete(); } public void info(String title, String text, Object... args){ MessageEmbed object = new EmbedBuilder() - .addField(title, format(text, args), true).setColor(normalColor).build(); - + .setTitle(title).setDescription(Strings.format(text, args)).setColor(normalColor).build(); lastSentMessage = channel.sendMessage(object).complete(); } @@ -188,11 +187,7 @@ public void err(String text, Object... args){ public void err(String title, String text, Object... args){ MessageEmbed e = new EmbedBuilder() - .addField(title, format(text, args), true).setColor(errorColor).build(); + .setTitle(title).setDescription(Strings.format(text, args)).setColor(errorColor).build(); lastSentMessage = channel.sendMessage(e).complete(); } - - private String format(String text, Object... args){ - return Strings.format(text, args); - } } From 3607d84e119b17e8f30efd602e741c291d83f1b7 Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Sun, 15 Nov 2020 14:40:43 +0300 Subject: [PATCH 2/4] getEffectiveAvatarUrl() --- src/corebot/Commands.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/corebot/Commands.java b/src/corebot/Commands.java index 0f29acc6..a2283701 100644 --- a/src/corebot/Commands.java +++ b/src/corebot/Commands.java @@ -100,7 +100,7 @@ public class Commands{ EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor). setColor(messages.normalColor) - .setAuthor(messages.lastUser.getName(), messages.lastUser.getAvatarUrl(), messages.lastUser.getAvatarUrl()).setTitle(doc.select("strong[itemprop=name]").text()); + .setAuthor(messages.lastUser.getName(), messages.lastUser.getEffectiveAvatarUrl(), messages.lastUser.getEffectiveAvatarUrl()).setTitle(doc.select("strong[itemprop=name]").text()); Elements elem = doc.select("span[itemprop=about]"); if(!elem.isEmpty()){ @@ -140,10 +140,10 @@ public class Commands{ Streams.copy(net.download(a.getUrl()), new FileOutputStream(mapFile)); ImageIO.write(map.image, "png", imageFile.file()); - EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor).setColor(messages.normalColor) + EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor) .setImage("attachment://" + imageFile.name()) - .setAuthor(messages.lastUser.getName(), messages.lastUser.getAvatarUrl(), messages.lastUser.getAvatarUrl()).setTitle(map.name == null ? a.getFileName().replace(".msav", "") : map.name); + .setAuthor(messages.lastUser.getName(), messages.lastUser.getEffectiveAvatarUrl(), messages.lastUser.getEffectiveAvatarUrl()).setTitle(map.name == null ? a.getFileName().replace(".msav", "") : map.name); if(map.description != null) builder.setFooter(map.description); @@ -368,7 +368,7 @@ void handle(Message message){ EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor).setColor(messages.normalColor) .setImage("attachment://" + previewFile.getName()) - .setAuthor(message.getAuthor().getName(), message.getAuthor().getAvatarUrl(), message.getAuthor().getEffectiveAvatarUrl()) + .setAuthor(message.getAuthor().getName(), message.getAuthor().getEffectiveAvatarUrl(), message.getAuthor().getEffectiveAvatarUrl()) .setTitle(schem.name()); if(!schem.description().isEmpty()) builder.setFooter(schem.description()); @@ -428,11 +428,10 @@ boolean handleResponse(CommandResponse response, boolean logUnknown){ }else if(response.type == ResponseType.manyArguments || response.type == ResponseType.fewArguments){ if(response.command.params.length == 0){ messages.err("Invalid arguments.", "Usage: @@", prefix, response.command.text); - messages.deleteMessages(); }else{ messages.err("Invalid arguments.", "Usage: @@ *@*", prefix, response.command.text, response.command.paramText); - messages.deleteMessages(); } + messages.deleteMessages(); return false; } return true; From e5d65c147202fbc8ee777231c3072f381d1fbd52 Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Fri, 20 Nov 2020 14:56:25 +0300 Subject: [PATCH 3/4] Some fixes --- src/corebot/Commands.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corebot/Commands.java b/src/corebot/Commands.java index a2283701..08a74dc0 100644 --- a/src/corebot/Commands.java +++ b/src/corebot/Commands.java @@ -85,7 +85,7 @@ public class Commands{ Info info = Info.valueOf(args[0]); messages.info(info.title, info.text); }catch(IllegalArgumentException e){ - messages.err("Error", "Invalid topic '@'.\nValid topics: *@*", args[0], Arrays.toString(Info.values())); + messages.err("Invalid topic '@'.\nValid topics: *@*", args[0], Arrays.toString(Info.values())); messages.deleteMessages(); } }); @@ -98,9 +98,9 @@ public class Commands{ try{ Document doc = Jsoup.connect(args[0]).get(); - EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor). - setColor(messages.normalColor) - .setAuthor(messages.lastUser.getName(), messages.lastUser.getEffectiveAvatarUrl(), messages.lastUser.getEffectiveAvatarUrl()).setTitle(doc.select("strong[itemprop=name]").text()); + EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor) + .setAuthor(messages.lastUser.getName(), messages.lastUser.getEffectiveAvatarUrl(), messages.lastUser.getEffectiveAvatarUrl()) + .setTitle(doc.select("strong[itemprop=name]").text()); Elements elem = doc.select("span[itemprop=about]"); if(!elem.isEmpty()){ From ce022bc22e8390234bc9f334ce130bdc7016c043 Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Fri, 20 Nov 2020 15:10:50 +0300 Subject: [PATCH 4/4] And more --- src/corebot/Commands.java | 5 ++--- src/corebot/Messages.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/corebot/Commands.java b/src/corebot/Commands.java index 08a74dc0..43c74c55 100644 --- a/src/corebot/Commands.java +++ b/src/corebot/Commands.java @@ -142,8 +142,8 @@ public class Commands{ EmbedBuilder builder = new EmbedBuilder().setColor(messages.normalColor) .setImage("attachment://" + imageFile.name()) - - .setAuthor(messages.lastUser.getName(), messages.lastUser.getEffectiveAvatarUrl(), messages.lastUser.getEffectiveAvatarUrl()).setTitle(map.name == null ? a.getFileName().replace(".msav", "") : map.name); + .setAuthor(messages.lastUser.getName(), messages.lastUser.getEffectiveAvatarUrl(), messages.lastUser.getEffectiveAvatarUrl()) + .setTitle(map.name == null ? a.getFileName().replace(".msav", "") : map.name); if(map.description != null) builder.setFooter(map.description); @@ -210,7 +210,6 @@ public class Commands{ Streams.copy(add.read(), zos); zos.closeEntry(); } - } messages.channel.sendFile(destFile.file()).queue(); diff --git a/src/corebot/Messages.java b/src/corebot/Messages.java index e26ff15d..19a0c0e3 100644 --- a/src/corebot/Messages.java +++ b/src/corebot/Messages.java @@ -168,7 +168,7 @@ public void sendCrash(JsonValue value){ builder.append("\n"); value = value.next; } - guild.getTextChannelById(CoreBot.crashReportChannelID).sendMessage(builder.toString()).queue(); + guild.getTextChannelById(crashReportChannelID).sendMessage(builder.toString()).queue(); } public void text(String text, Object... args){