diff --git a/src/main/java/com/jagrosh/vortex/Listener.java b/src/main/java/com/jagrosh/vortex/Listener.java index 5444ab9..9502101 100644 --- a/src/main/java/com/jagrosh/vortex/Listener.java +++ b/src/main/java/com/jagrosh/vortex/Listener.java @@ -212,7 +212,7 @@ ShardInfo si = event.getJDA().getShardInfo(); String shardinfo = si==null ? "1/1" : (si.getShardId()+1)+"/"+si.getShardTotal(); LOG.info("Shard "+shardinfo+" is ready."); - vortex.getLogWebhook().send("\uD83C\uDF00 Shard `"+shardinfo+"` has connected. Guilds: `" + vortex.getLogWebhook().send("\uD83C\uDF00 Shard `"+shardinfo+"` has connected. Guilds: `" // 🌀 +event.getJDA().getGuildCache().size()+"` Users: `"+event.getJDA().getUserCache().size()+"`"); vortex.getThreadpool().scheduleWithFixedDelay(() -> vortex.getDatabase().tempbans.checkUnbans(event.getJDA()), 0, 2, TimeUnit.MINUTES); vortex.getThreadpool().scheduleWithFixedDelay(() -> vortex.getDatabase().tempmutes.checkUnmutes(event.getJDA(), vortex.getDatabase().settings), 0, 45, TimeUnit.SECONDS); diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java index 2cf574c..1fc0f2f 100644 --- a/src/main/java/com/jagrosh/vortex/Vortex.java +++ b/src/main/java/com/jagrosh/vortex/Vortex.java @@ -183,7 +183,7 @@ try { event.getMessage().addReaction(Constants.HELP_REACTION).queue(s->{}, f->{}); - } catch(PermissionException ex) {} + } catch(PermissionException ignore) {} }, t -> event.replyWarning("Help cannot be sent because you are blocking Direct Messages."))) .setDiscordBotsKey(tokens.get(1)) //.setCarbonitexKey(tokens.get(2)) diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java index 515dd8a..bf67a3e 100644 --- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java +++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java @@ -97,10 +97,12 @@ { vortex.getDatabase().settings.enableRaidMode(guild); if(guild.getVerificationLevel().getKey() + OtherUtil.safeDM(event.getUser(), "Sorry, **"+event.getGuild().getName()+"** is currently under lockdown. " + + "Please try joining again later. Sorry for the inconvenience.", true, () -> { try { event.getGuild().getController().kick(event.getMember(), "Anti-Raid Mode").queue(); - }catch(Exception ex){} + }catch(Exception ignore){} }); } else @@ -174,8 +178,10 @@ { try { - event.getGuild().getController().addSingleRoleToMember(event.getMember(), vortex.getDatabase().settings.getSettings(event.getGuild()).getMutedRole(event.getGuild())).reason(RESTORE_MUTE_ROLE_AUDIT).queue(); - } catch(Exception ex){} + event.getGuild().getController() + .addSingleRoleToMember(event.getMember(), vortex.getDatabase().settings.getSettings(event.getGuild()).getMutedRole(event.getGuild())) + .reason(RESTORE_MUTE_ROLE_AUDIT).queue(); + } catch(Exception ignore){} } dehoist(event.getMember()); } @@ -240,7 +246,7 @@ { OtherUtil.dehoist(member, settings.dehoistChar); } - catch(Exception ex) {} + catch(Exception ignore) {} } public void performAutomod(Message message) @@ -409,7 +415,7 @@ try { message.delete().reason("Automod").queue(v->{}, f->{}); - }catch(PermissionException e){} + }catch(PermissionException ignore){} } // channel mute if applicable (prevent sending messages in that channel for a short time as a 'warning' @@ -429,7 +435,7 @@ try { p.delete().queueAfter(3, TimeUnit.SECONDS, s->{}, f->{}); - } catch(Exception ex) {} + } catch(Exception ignore) {} }, f->{}); } else @@ -440,10 +446,10 @@ try { po.getManager().deny(existingDenied).queueAfter(3, TimeUnit.SECONDS, s->{}, f->{}); - } catch(Exception ex) {} + } catch(Exception ignore) {} }, f->{}); } - } catch(Exception ex) {} + } catch(Exception ignore) {} }, f->{}); } @@ -497,7 +503,7 @@ try { message.delete().reason("Automod").queue(v->{}, f->{}); - }catch(PermissionException e){} + }catch(PermissionException ignore){} vortex.getStrikeHandler().applyStrikes(message.getGuild().getSelfMember(), latestTime(message), message.getAuthor(), rstrikeTotal, rreason); } @@ -515,7 +521,7 @@ if(mtc!=null) mtc.deleteMessageById(m.getIdLong()).queue(s->{}, f->{}); } - catch(PermissionException ex) {} + catch(PermissionException ignore) {} }); } diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java index 50ff089..e5238f9 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java @@ -40,6 +40,9 @@ */ public class CleanCmd extends ModCommand { + private final static String VIEW = "\uD83D\uDCC4"; // 📄 + private final static String DOWNLOAD = "\uD83D\uDCE9"; // 📩 + private final Pattern LINK_PATTERN = Pattern.compile("https?:\\/\\/.+"); private final Pattern QUOTES_PATTERN = Pattern.compile("[\"“”](.*?)[\"“”]", Pattern.DOTALL); private final Pattern CODE_PATTERN = Pattern.compile("`(.*?)`", Pattern.DOTALL); @@ -180,10 +183,11 @@ del.add(msg); continue; } - try{ + try + { if(p!=null && msg.getContentRaw().matches(p)) del.add(msg); - }catch(Exception e){} + } catch(Exception ignore) {} } if(del.isEmpty()) @@ -234,7 +238,7 @@ { vortex.getModLogger().postCleanCase(event.getMember(), event.getMessage().getCreationTime(), del.size(), event.getTextChannel(), params, null, new EmbedBuilder().setColor(event.getSelfMember().getColor()) - .appendDescription("[`\uD83D\uDCC4 View`]("+view+") | [`\uD83D\uDCE9 Download`]("+download+")").build()); + .appendDescription("[`"+VIEW+" View`]("+view+") | [`"+DOWNLOAD+" Download`]("+download+")").build()); }); }); } diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java index 49b6fc4..7ca5235 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java @@ -34,8 +34,8 @@ */ public class SetupCmd extends Command { - private final String CANCEL = "\u274C"; - private final String CONFIRM = "\u2611"; + private final String CANCEL = "\u274C"; // ❌ + private final String CONFIRM = "\u2611"; // ☑ private final Vortex vortex; diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java index 3bce05e..0dea050 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java @@ -42,7 +42,7 @@ public class AuditCmd extends Command { private final String actions; - private final String linestart = "\u25AB"; + private final String linestart = "\u25AB"; // ▫ private final String unknown = "*Unknown*"; public AuditCmd() @@ -232,8 +232,8 @@ case WEBHOOK_REMOVE: return "<:deleteWebhook:417574812098101250>"; case WEBHOOK_UPDATE: return "<:updateWebhook:417574812534439946>"; - case UNKNOWN: return "\u2753"; - default: return "\u2753"; + case UNKNOWN: return "\u2753"; // ❓ + default: return "\u2753"; // ❓ } } } diff --git a/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java b/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java index 4b47543..c30aef7 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java @@ -35,7 +35,7 @@ public final static int MAX_STRIKES = 100; public final static int MENTION_MINIMUM = 4; public final static int ROLE_MENTION_MINIMUM = 2; - private static final String SETTINGS_TITLE = "\uD83D\uDEE1 Automod Settings"; + private static final String SETTINGS_TITLE = "\uD83D\uDEE1 Automod Settings"; // 🛡 public final static SQLColumn GUILD_ID = new LongColumn("GUILD_ID",false,0L,true); @@ -100,7 +100,7 @@ ? "Disabled\n\n" : "Max Lines / Msg: "+(settings.maxLines==0 ? "Disabled\n" : "`"+settings.maxLines+"`\n") + "Copypasta: `" + settings.copypastaStrikes + " " + Action.STRIKE.getEmoji() + "`\n" + - "@\u0435very1 Attempt: `" + settings.everyoneStrikes + " " + Action.STRIKE.getEmoji() + "`\n\n") + "@\u0435very1 Attempt: `" + settings.everyoneStrikes + " " + Action.STRIKE.getEmoji() + "`\n\n") // cyrillic e + "__Miscellaneous__\n" + "Auto AntiRaid: " + (settings.useAutoRaidMode() ? "`" + settings.raidmodeNumber + "` joins/`" + settings.raidmodeTime + "`s\n" diff --git a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java index 33a77a8..f7e2dad 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java @@ -41,7 +41,7 @@ public class GuildSettingsDataManager extends DataManager implements GuildSettingsManager { public final static int PREFIX_MAX_LENGTH = 40; - private static final String SETTINGS_TITLE = "\uD83D\uDCCA Server Settings"; + private static final String SETTINGS_TITLE = "\uD83D\uDCCA Server Settings"; // 📊 private static final ZoneId DEFAULT_TIMEZONE = ZoneId.of("GMT-4"); public final static SQLColumn GUILD_ID = new LongColumn("GUILD_ID",false,0L,true); @@ -56,7 +56,10 @@ public final static SQLColumn PREFIX = new StringColumn("PREFIX", true, null, PREFIX_MAX_LENGTH); public final static SQLColumn TIMEZONE = new StringColumn("TIMEZONE",true,null,32); - public final static SQLColumn RAIDMODE = new IntegerColumn("RAIDMODE",false,-2); // -2 = Raid Mode not activated, -1+ = Raid Mode active, level to set permission when finished + public final static SQLColumn RAIDMODE = new IntegerColumn("RAIDMODE",false,-2); + // -2 = Raid Mode not activated + // -1+ = Raid Mode active + // level to set permission when finished // Cache private final FixedCache cache = new FixedCache<>(1000); diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java index e3753bd..98cb4ca 100644 --- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java @@ -46,6 +46,20 @@ */ public class BasicLogger { + private final static String EDIT = "\u26A0"; // ⚠ + private final static String DELETE = "\u274C"; // ❌ + private final static String BULK_DELETE = "\uD83D\uDEAE"; // 🚮 + private final static String VIEW = "\uD83D\uDCC4"; // 📄 + private final static String DOWNLOAD = "\uD83D\uDCE9"; // 📩 + private final static String REDIRECT = "\uD83D\uDD00"; // 🔀 + private final static String REDIR_MID = "\uD83D\uDD39"; // 🔹 + private final static String REDIR_END = "\uD83D\uDD37"; // 🔷 + private final static String NAME = "\uD83D\uDCDB"; // 📛 + private final static String JOIN = "\uD83D\uDCE5"; // 📥 + private final static String NEW = "\uD83C\uDD95"; // 🆕 + private final static String LEAVE = "\uD83D\uDCE4"; // 📤 + private final static String AVATAR = "\uD83D\uDDBC"; // 🖼 + private final Vortex vortex; public BasicLogger(Vortex vortex) @@ -62,10 +76,7 @@ .setEmbed(embed) .build()).queue(); } - catch(PermissionException ex) - { - - } + catch(PermissionException ignore) {} } private void logFile(OffsetDateTime now, TextChannel tc, String emote, String message, byte[] file, String filename) @@ -76,10 +87,7 @@ .append(FormatUtil.filterEveryone(LogUtil.basiclogFormat(now, vortex.getDatabase().settings.getSettings(tc.getGuild()).getTimezone(), emote, message))) .build()).queue(); } - catch(PermissionException ex) - { - - } + catch(PermissionException ignore) {} } // Message Logs @@ -106,7 +114,7 @@ edit.addField("To:", newm.length()>1024 ? newm.substring(0,1016)+" (...)" : newm, false); else edit.appendDescription("\n**To:** "+newm); - log(newMessage.getEditedTime()==null ? newMessage.getCreationTime() : newMessage.getEditedTime(), tc, "\u26A0", + log(newMessage.getEditedTime()==null ? newMessage.getCreationTime() : newMessage.getEditedTime(), tc, EDIT, FormatUtil.formatFullUser(newMessage.getAuthor())+" edited a message in "+newMessage.getTextChannel().getAsMention()+":", edit.build()); } @@ -132,7 +140,7 @@ .appendDescription(formatted); User author = oldMessage.getAuthor(vortex.getShardManager()); String user = author==null ? FormatUtil.formatCachedMessageFullUser(oldMessage) : FormatUtil.formatFullUser(author); - log(OffsetDateTime.now(), tc, "\u274C", user+"'s message has been deleted from "+mtc.getAsMention()+":", delete.build()); + log(OffsetDateTime.now(), tc, DELETE, user+"'s message has been deleted from "+mtc.getAsMention()+":", delete.build()); } public void logMessageBulkDelete(List messages, int count, TextChannel text) @@ -161,14 +169,14 @@ .appendDescription(formatted); User author = messages.get(0).getAuthor(vortex.getShardManager()); String user = author==null ? FormatUtil.formatCachedMessageFullUser(messages.get(0)) : FormatUtil.formatFullUser(author); - log(OffsetDateTime.now(), tc, "\u274C", user+"'s message has been deleted from "+mtc.getAsMention()+":", delete.build()); + log(OffsetDateTime.now(), tc, DELETE, user+"'s message has been deleted from "+mtc.getAsMention()+":", delete.build()); return; } vortex.getTextUploader().upload(LogUtil.logCachedMessagesForwards("Deleted Messages", messages, vortex.getShardManager()), "DeletedMessages", (view, download) -> { - log(OffsetDateTime.now(), tc, "\uD83D\uDEAE", "**"+count+"** messages were deleted from "+text.getAsMention()+" (**"+messages.size()+"** logged):", + log(OffsetDateTime.now(), tc, BULK_DELETE, "**"+count+"** messages were deleted from "+text.getAsMention()+" (**"+messages.size()+"** logged):", new EmbedBuilder().setColor(Color.RED.darker().darker()) - .appendDescription("[`\uD83D\uDCC4 View`]("+view+") | [`\uD83D\uDCE9 Download`]("+download+")").build()); + .appendDescription("[`"+VIEW+" View`]("+view+") | [`"+DOWNLOAD+" Download`]("+download+")").build()); }); } @@ -177,10 +185,10 @@ TextChannel tc = vortex.getDatabase().settings.getSettings(message.getGuild()).getMessageLogChannel(message.getGuild()); if(tc==null) return; - StringBuilder sb = new StringBuilder("\uD83D\uDD37 **"+link+"**"); + StringBuilder sb = new StringBuilder(REDIR_END+" **"+link+"**"); for(int i=0; i tc!=null) .forEachOrdered(tc -> { - log(now, tc, "\uD83D\uDCDB", - "**"+event.getOldName()+"**#"+event.getUser().getDiscriminator()+" (ID:"+event.getUser().getId()+") has changed names to "+FormatUtil.formatUser(event.getUser()), null); + log(now, tc, NAME, "**"+event.getOldName()+"**#"+event.getUser().getDiscriminator()+" (ID:" + +event.getUser().getId()+") has changed names to "+FormatUtil.formatUser(event.getUser()), null); }); } @@ -209,8 +217,8 @@ .filter(tc -> tc!=null) .forEachOrdered(tc -> { - log(now, tc, "\uD83D\uDCDB", - "**"+event.getUser().getName()+"**#"+event.getOldDiscriminator()+" (ID:"+event.getUser().getId()+") has changed names to "+FormatUtil.formatUser(event.getUser()), null); + log(now, tc, NAME, "**"+event.getUser().getName()+"**#"+event.getOldDiscriminator()+" (ID:" + +event.getUser().getId()+") has changed names to "+FormatUtil.formatUser(event.getUser()), null); }); } @@ -221,8 +229,8 @@ return; OffsetDateTime now = OffsetDateTime.now(); long seconds = event.getUser().getCreationTime().until(now, ChronoUnit.SECONDS); - log(now, tc, "\uD83D\uDCE5", FormatUtil.formatFullUser(event.getUser())+" joined the server. " - +(seconds<16*60 ? "\uD83C\uDD95" : "") + log(now, tc, JOIN, FormatUtil.formatFullUser(event.getUser())+" joined the server. " + +(seconds<16*60 ? NEW : "") +"\nCreation: "+event.getUser().getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+" ("+FormatUtil.secondsToTimeCompact(seconds)+" ago)", null); } @@ -243,7 +251,7 @@ rlist.append("`, `").append(event.getMember().getRoles().get(i).getName()); rlist.append("`"); } - log(now, tc, "\uD83D\uDCE4", FormatUtil.formatFullUser(event.getUser())+" left or was kicked from the server. " + log(now, tc, LEAVE, FormatUtil.formatFullUser(event.getUser())+" left or was kicked from the server. " +"\nJoined: "+event.getMember().getJoinDate().format(DateTimeFormatter.RFC_1123_DATE_TIME)+" ("+FormatUtil.secondsToTimeCompact(seconds)+" ago)" +rlist.toString(), null); } @@ -256,8 +264,8 @@ TextChannel tc = vortex.getDatabase().settings.getSettings(event.getGuild()).getVoiceLogChannel(event.getGuild()); if(tc==null) return; - log(OffsetDateTime.now(), tc, "<:voicejoin:314044543605407757>", - FormatUtil.formatFullUser(event.getMember().getUser())+" has joined voice channel _"+event.getChannelJoined().getName()+"_", null); + log(OffsetDateTime.now(), tc, "<:voicejoin:314044543605407757>", FormatUtil.formatFullUser(event.getMember().getUser()) + +" has joined voice channel _"+event.getChannelJoined().getName()+"_", null); } public void logVoiceMove(GuildVoiceMoveEvent event) @@ -265,8 +273,8 @@ TextChannel tc = vortex.getDatabase().settings.getSettings(event.getGuild()).getVoiceLogChannel(event.getGuild()); if(tc==null) return; - log(OffsetDateTime.now(), tc, "<:voicechange:314043907992190987>", - FormatUtil.formatFullUser(event.getMember().getUser())+" has moved voice channels from _"+event.getChannelLeft().getName()+"_ to _"+event.getChannelJoined().getName()+"_", null); + log(OffsetDateTime.now(), tc, "<:voicechange:314043907992190987>", FormatUtil.formatFullUser(event.getMember().getUser()) + +" has moved voice channels from _"+event.getChannelLeft().getName()+"_ to _"+event.getChannelJoined().getName()+"_", null); } public void logVoiceLeave(GuildVoiceLeaveEvent event) @@ -274,8 +282,8 @@ TextChannel tc = vortex.getDatabase().settings.getSettings(event.getGuild()).getVoiceLogChannel(event.getGuild()); if(tc==null) return; - log(OffsetDateTime.now(), tc, "<:voiceleave:314044543609864193>", - FormatUtil.formatFullUser(event.getMember().getUser())+" has left voice channel _"+event.getChannelLeft().getName()+"_", null); + log(OffsetDateTime.now(), tc, "<:voiceleave:314044543609864193>", FormatUtil.formatFullUser(event.getMember().getUser()) + +" has left voice channel _"+event.getChannelLeft().getName()+"_", null); } @@ -294,7 +302,7 @@ { byte[] im = AvatarUtil.makeAvatarImage(event.getUser(), event.getOldAvatarUrl(), event.getOldAvatarId()); if(im!=null) - logs.forEach(tc -> logFile(now, tc, "\uD83D\uDDBC", FormatUtil.formatFullUser(event.getUser())+" has changed avatars" + logs.forEach(tc -> logFile(now, tc, AVATAR, FormatUtil.formatFullUser(event.getUser())+" has changed avatars" +(event.getUser().getAvatarId()!=null && event.getUser().getAvatarId().startsWith("a_") ? " <:gif:314068430624129039>" : "") +":", im, "AvatarChange.png")); }); diff --git a/src/main/java/com/jagrosh/vortex/logging/ModLogger.java b/src/main/java/com/jagrosh/vortex/logging/ModLogger.java index 330f716..1a7ddaa 100644 --- a/src/main/java/com/jagrosh/vortex/logging/ModLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/ModLogger.java @@ -144,7 +144,7 @@ i, moderator.getUser(), numMessages, target, criteria, reason))) .build()).queue(); } - catch(PermissionException ex) {} + catch(PermissionException ignore) {} }); } @@ -221,9 +221,15 @@ Action act = null; switch(ale.getType()) { - case BAN: act = Action.BAN; break; - case KICK: act = Action.KICK; break; - case UNBAN: act = Action.UNBAN; break; + case BAN: + act = Action.BAN; + break; + case KICK: + act = Action.KICK; + break; + case UNBAN: + act = Action.UNBAN; + break; case MEMBER_ROLE_UPDATE: if(mRole==null) break; @@ -246,6 +252,7 @@ } } break; + default: } if(act!=null) { @@ -340,6 +347,22 @@ } } + private static int getCaseNumber(Message m) + { + if(m.getAuthor().getIdLong()!=m.getJDA().getSelfUser().getIdLong()) + return -1; + if(!m.getContentRaw().startsWith("`[")) + return -1; + try + { + return Integer.parseInt(m.getContentRaw().substring(15, m.getContentRaw().indexOf("]` ",15))); + } + catch(Exception e) + { + return -1; + } + } + private void getCaseNumberAsync(TextChannel tc, Consumer result) { if(caseNum.containsKey(tc.getGuild().getIdLong())) @@ -373,20 +396,4 @@ { return ale.getGuild().getId()+"|"+ale.getTargetId()+"|"+mod.getId(); } - - private static int getCaseNumber(Message m) - { - if(m.getAuthor().getIdLong()!=m.getJDA().getSelfUser().getIdLong()) - return -1; - if(!m.getContentRaw().startsWith("`[")) - return -1; - try - { - return Integer.parseInt(m.getContentRaw().substring(15, m.getContentRaw().indexOf("]` ",15))); - } - catch(Exception e) - { - return -1; - } - } } diff --git a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java index 14bf8d6..f6230c8 100644 --- a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java @@ -41,11 +41,13 @@ public class FormatUtil { private final static String MULTIPLE_FOUND = "**Multiple %s found matching \"%s\":**"; - private final static String CMD_EMOJI = "\uD83D\uDCDC"; + private final static String CMD_EMOJI = "\uD83D\uDCDC"; // 📜 public static String filterEveryone(String input) { - return input.replace("@everyone","@\u0435veryone").replace("@here","@h\u0435re").replace("discord.gg/", "dis\u0441ord.gg/"); + return input.replace("@everyone","@\u0435veryone") // cyrillic e + .replace("@here","@h\u0435re") // cyrillic e + .replace("discord.gg/", "dis\u0441ord.gg/"); // cyrillic c } public static String formatMessage(Message m) @@ -297,9 +299,9 @@ public static String helpLinks(CommandEvent event) { - return "\uD83D\uDD17 ["+event.getSelfUser().getName()+" Wiki]("+Constants.Wiki.WIKI_BASE+")\n" + return "\uD83D\uDD17 ["+event.getSelfUser().getName()+" Wiki]("+Constants.Wiki.WIKI_BASE+")\n" // 🔗 + "<:discord:314003252830011395> [Support Server]("+event.getClient().getServerInvite()+")\n" - + "\uD83D\uDCDC [Full Command Reference]("+Constants.Wiki.COMMANDS+")\n" + + CMD_EMOJI + " [Full Command Reference]("+Constants.Wiki.COMMANDS+")\n" + "<:patreon:417455429145329665> [Donations]("+Constants.DONATION_LINK+")"; } }