diff --git a/src/main/java/com/jagrosh/vortex/Action.java b/src/main/java/com/jagrosh/vortex/Action.java index f948871..ea324b9 100644 --- a/src/main/java/com/jagrosh/vortex/Action.java +++ b/src/main/java/com/jagrosh/vortex/Action.java @@ -21,23 +21,22 @@ */ public enum Action { - NORAIDMODE("", "\uD83D\uDD13", 15), - PARDON( "pardoned", "\uD83C\uDFF3", 14), - RAIDMODE( "", "\uD83D\uDD12", 13), - STRIKE( "", "\uD83D\uDEA9", 12), - UNMUTE( "unmuted", "\uD83D\uDD0A", 11), - UNBAN( "unbanned", "\uD83D\uDD27", 10), - - BAN( "banned", "\uD83D\uDD28", 9), - TEMPBAN( "tempbanned", "\u23F2", 8), - SOFTBAN( "softbanned", "\uD83C\uDF4C", 7), - KICK( "kicked", "\uD83D\uDC62", 6), - MUTE( "muted", "\uD83D\uDD07", 5), - TEMPMUTE( "tempmuted", "\uD83E\uDD10", 4), - WARN( "warned", "\uD83D\uDDE3", 3), - CLEAN( "cleaned", "\uD83D\uDDD1", 2), - DELETE( "deleted", "\uD83D\uDDD1", 1), - NONE( "did not act", "\uD83D\uDE36", 0); + NORAIDMODE("", "\uD83D\uDD13", 15), // ๐Ÿ”“ + PARDON( "pardoned", "\uD83C\uDFF3", 14), // ๐Ÿณ + RAIDMODE( "", "\uD83D\uDD12", 13), // ๐Ÿ”’ + STRIKE( "", "\uD83D\uDEA9", 12), // ๐Ÿšฉ + UNMUTE( "unmuted", "\uD83D\uDD0A", 11), // ๐Ÿ”Š + UNBAN( "unbanned", "\uD83D\uDD27", 10), // ๐Ÿ”ง + BAN( "banned", "\uD83D\uDD28", 9), // ๐Ÿ”จ + TEMPBAN( "tempbanned", "\u23F2", 8), // โฒ + SOFTBAN( "softbanned", "\uD83C\uDF4C", 7), // ๐ŸŒ + KICK( "kicked", "\uD83D\uDC62", 6), // ๐Ÿ‘ข + MUTE( "muted", "\uD83D\uDD07", 5), // ๐Ÿ”‡ + TEMPMUTE( "tempmuted", "\uD83E\uDD10", 4), // ๐Ÿค + WARN( "warned", "\uD83D\uDDE3", 3), // ๐Ÿ—ฃ + CLEAN( "cleaned", "\uD83D\uDDD1", 2), // ๐Ÿ—‘ + DELETE( "deleted", "\uD83D\uDDD1", 1), // ๐Ÿ—‘ + NONE( "did not act", "\uD83D\uDE36", 0); // ๐Ÿ˜ถ private final String verb; private final String emoji; diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java index bf67a3e..be1d0ad 100644 --- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java +++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java @@ -382,7 +382,7 @@ || message.getMentionedRoles().stream().anyMatch(role -> role.getName().equalsIgnoreCase("everyone") || role.getName().equalsIgnoreCase("here"))) { strikeTotal += settings.everyoneStrikes; - reason.append(", ").append("Attempted @\u0435veryone/here"); + reason.append(", ").append("Attempted @\u0435veryone/here"); // cyrillic e shouldDelete = true; } } diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java index 29c59b2..405fb99 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java @@ -38,7 +38,7 @@ this.aliases = new String[]{"antiateveryone", "anti-everyone", "anti-ateveryone"}; this.category = new Category("AutoMod"); this.arguments = ""; - this.help = "sets strikes for failed @\u0435veryone/here attempts"; + this.help = "sets strikes for failed @\u0435veryone/here attempts"; // cyrillic e this.userPermissions = new Permission[]{Permission.MANAGE_SERVER}; } @@ -72,7 +72,7 @@ } vortex.getDatabase().automod.setEveryoneStrikes(event.getGuild(), numstrikes); boolean also = vortex.getDatabase().actions.useDefaultSettings(event.getGuild()); - event.replySuccess("Users will now receive `"+numstrikes+"` strikes for attempting to ping @\u0435veryone/here. " + event.replySuccess("Users will now receive `"+numstrikes+"` strikes for attempting to ping @\u0435veryone/here. " // cyrillic e + "This also considers pingable roles called 'everyone' and 'here'. This will not affect users that actually " + "have permission to ping everyone."+(also ? PunishmentManager.DEFAULT_SETUP_MESSAGE : "")); } diff --git a/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java index 7ec5915..83267d0 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java @@ -37,7 +37,7 @@ { event.reply("Hello. I am **"+event.getJDA().getSelfUser().getName()+"**, a simple moderation bot built by **jagrosh**#4824." + "\nYou can find out how to add me to your server with the link below:" - + "\n\n\uD83D\uDD17 **<"+Constants.Wiki.START+">**" + + "\n\n\uD83D\uDD17 **<"+Constants.Wiki.START+">**" // ๐Ÿ”— + "\n\nFor assistance, check out the wiki: <"+Constants.Wiki.WIKI_BASE+">"); } } diff --git a/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java index 27d447d..054be0c 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java @@ -34,7 +34,8 @@ */ public class RoleinfoCmd extends Command { - private final String linestart = "\u25AB"; + private final static String LINESTART = "\u25AB"; // โ–ซ + private final static String ROLE_EMOJI = "\uD83C\uDFAD"; // ๐ŸŽญ public RoleinfoCmd() { @@ -71,21 +72,21 @@ } } - String title = "\uD83C\uDFAD Information about **"+role.getName()+"**:"; + String title = ROLE_EMOJI + " Information about **"+role.getName()+"**:"; List list = role.isPublicRole() ? event.getGuild().getMembers() : event.getGuild().getMembersWithRoles(role); - StringBuilder desr = new StringBuilder(linestart+"ID: **"+role.getId()+"**\n" - + linestart+"Creation: **"+role.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" - + linestart+"Position: **"+role.getPosition()+"**\n" - + linestart+"Color: **#"+(role.getColor()==null ? "000000" : Integer.toHexString(role.getColor().getRGB()).toUpperCase().substring(2))+"**\n" - + linestart+"Mentionable: **"+role.isMentionable()+"**\n" - + linestart+"Hoisted: **"+role.isHoisted()+"**\n" - + linestart+"Managed: **"+role.isManaged()+"**\n" - + linestart+"Permissions: "); + StringBuilder desr = new StringBuilder(LINESTART+"ID: **"+role.getId()+"**\n" + + LINESTART+"Creation: **"+role.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" + + LINESTART+"Position: **"+role.getPosition()+"**\n" + + LINESTART+"Color: **#"+(role.getColor()==null ? "000000" : Integer.toHexString(role.getColor().getRGB()).toUpperCase().substring(2))+"**\n" + + LINESTART+"Mentionable: **"+role.isMentionable()+"**\n" + + LINESTART+"Hoisted: **"+role.isHoisted()+"**\n" + + LINESTART+"Managed: **"+role.isManaged()+"**\n" + + LINESTART+"Permissions: "); if(role.getPermissions().isEmpty()) desr.append("None"); else desr.append(role.getPermissions().stream().map(p -> "`, `"+p.getName()).reduce("", String::concat).substring(3)).append("`"); - desr.append("\n").append(linestart).append("Members: **").append(list.size()).append("**\n"); + desr.append("\n").append(LINESTART).append("Members: **").append(list.size()).append("**\n"); if(list.size()*24<=2048-desr.length()) list.forEach(m -> desr.append("<@").append(m.getUser().getId()).append("> ")); diff --git a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java index 15f3690..1d31d68 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java @@ -31,7 +31,9 @@ */ public class ServerinfoCmd extends Command { - private final static String LINESTART = "\u25AB"; + private final static String LINESTART = "\u25AB"; // โ–ซ + private final static String GUILD_EMOJI = "\uD83D\uDDA5"; // ๐Ÿ–ฅ + private final static String NO_REGION = "\u2754"; // โ” public ServerinfoCmd() { @@ -49,16 +51,22 @@ long onlineCount = guild.getMembers().stream().filter((u) -> (u.getOnlineStatus()!=OnlineStatus.OFFLINE)).count(); long botCount = guild.getMembers().stream().filter(m -> m.getUser().isBot()).count(); EmbedBuilder builder = new EmbedBuilder(); - String title = FormatUtil.filterEveryone("\uD83D\uDDA5 Information about **"+guild.getName()+"**:"); + String title = FormatUtil.filterEveryone(GUILD_EMOJI + " Information about **"+guild.getName()+"**:"); String verif; switch(guild.getVerificationLevel()) { - case VERY_HIGH: verif = "โ”ปโ”โ”ปใƒŸใƒฝ(เฒ ็›Šเฒ )ใƒŽๅฝกโ”ปโ”โ”ป"; break; - case HIGH: verif = "(โ•ฏยฐโ–กยฐ๏ผ‰โ•ฏ๏ธต โ”ปโ”โ”ป"; break; - default: verif = guild.getVerificationLevel().name(); break; + case VERY_HIGH: + verif = "โ”ปโ”โ”ปใƒŸใƒฝ(เฒ ็›Šเฒ )ใƒŽๅฝกโ”ปโ”โ”ป"; + break; + case HIGH: + verif = "(โ•ฏยฐโ–กยฐ๏ผ‰โ•ฏ๏ธต โ”ปโ”โ”ป"; + break; + default: + verif = guild.getVerificationLevel().name(); + break; } String str = LINESTART+"ID: **"+guild.getId()+"**\n" +LINESTART+"Owner: "+FormatUtil.formatUser(guild.getOwner().getUser())+"\n" - +LINESTART+"Location: "+(guild.getRegion().getEmoji()==null ? "\u2754" : guild.getRegion().getEmoji())+" **"+guild.getRegion().getName()+"**\n" + +LINESTART+"Location: "+(guild.getRegion().getEmoji()==null ? NO_REGION : guild.getRegion().getEmoji())+" **"+guild.getRegion().getName()+"**\n" +LINESTART+"Creation: **"+guild.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" +LINESTART+"Users: **"+guild.getMemberCache().size()+"** ("+onlineCount+" online, "+botCount+" bots)\n" +LINESTART+"Channels: **"+guild.getTextChannelCache().size()+"** Text, **"+guild.getVoiceChannelCache().size()+"** Voice, **"+guild.getCategoryCache().size()+"** Categories\n" diff --git a/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java index f2fb250..cec0145 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java @@ -38,7 +38,9 @@ */ public class UserinfoCmd extends Command { - private final String linestart = "\u25AB"; + private final static String BOT_EMOJI = "<:botTag:230105988211015680>"; + private final static String USER_EMOJI = "\uD83D\uDC64"; // ๐Ÿ‘ค + private final static String LINESTART = "\u25AB"; // โ–ซ public UserinfoCmd() { @@ -77,31 +79,31 @@ } } User user = member.getUser(); - String title = (user.isBot() ? "\uD83E\uDD16":"\uD83D\uDC64")+" Information about **"+user.getName()+"** #"+user.getDiscriminator()+":"; - String str = linestart+"Discord ID: **"+user.getId()+"**"+(user.getAvatarId()!=null && user.getAvatarId().startsWith("a_")?" <:nitro:314068430611415041>":""); + String title = (user.isBot() ? BOT_EMOJI : USER_EMOJI)+" Information about **"+user.getName()+"** #"+user.getDiscriminator()+":"; + String str = LINESTART+"Discord ID: **"+user.getId()+"**"+(user.getAvatarId()!=null && user.getAvatarId().startsWith("a_")?" <:nitro:314068430611415041>":""); if(member.getNickname()!=null) - str+="\n"+linestart+"Nickname: **"+member.getNickname()+"**"; + str+="\n"+LINESTART+"Nickname: **"+member.getNickname()+"**"; String roles=""; - roles = member.getRoles().stream().map((rol) -> rol.getName()).filter((r) -> (!r.equalsIgnoreCase("@everyone"))).map((r) -> "`, `"+r).reduce(roles, String::concat); + roles = member.getRoles().stream().map((rol) -> "`, `"+rol.getName()).reduce(roles, String::concat); if(roles.isEmpty()) roles="None"; else roles=roles.substring(3)+"`"; - str+="\n"+linestart+"Roles: "+roles; - str+="\n"+linestart+"Status: "+statusToEmote(member.getOnlineStatus(), member.getGame())+"**"+member.getOnlineStatus().name()+"**"; + str+="\n"+LINESTART+"Roles: "+roles; + str+="\n"+LINESTART+"Status: "+statusToEmote(member.getOnlineStatus(), member.getGame())+"**"+member.getOnlineStatus().name()+"**"; Game game = member.getGame(); if(game!=null) str+=" ("+formatGame(game)+")"; - str+="\n"+linestart+"Account Creation: **"+MiscUtil.getDateTimeString(MiscUtil.getCreationTime(user))+"**"; + str+="\n"+LINESTART+"Account Creation: **"+MiscUtil.getDateTimeString(MiscUtil.getCreationTime(user))+"**"; List joins = new ArrayList<>(event.getGuild().getMembers()); Collections.sort(joins, (Member a, Member b) -> a.getJoinDate().compareTo(b.getJoinDate())); int index = joins.indexOf(member); - str+="\n"+linestart+"Guild Join Date: **"+member.getJoinDate().format(DateTimeFormatter.RFC_1123_DATE_TIME) + "** `(#"+(index+1)+")`"; + str+="\n"+LINESTART+"Guild Join Date: **"+member.getJoinDate().format(DateTimeFormatter.RFC_1123_DATE_TIME) + "** `(#"+(index+1)+")`"; index-=3; if(index<0) index=0; - str+="\n"+linestart+"Join Order: "; + str+="\n"+LINESTART+"Join Order: "; if(joins.get(index).equals(member)) str+="[**"+joins.get(index).getUser().getName()+"**]()"; else diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java index 743dbbb..abb6305 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/VoicemoveCmd.java @@ -85,9 +85,12 @@ event.replyError("I don't have permission to move users out of **"+vc.getName()+"**!"); return; } - try { + try + { event.getGuild().getAudioManager().openAudioConnection(vc); - } catch(Exception e) { + } + catch(Exception e) + { event.replyWarning("I could not connect to **"+vc.getName()+"**"); return; } @@ -101,7 +104,7 @@ event.getGuild().getAudioManager().closeAudioConnection(); event.replyWarning("You waited too long, "+event.getMember().getAsMention()); }); - event.reply("\uD83C\uDF9B Now, move me and I'll drag users to a new voice channel."); + event.reply("\uD83C\uDF9B Now, move me and I'll drag users to a new voice channel."); // ๐ŸŽ› } } 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 0dea050..90b31a6 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java @@ -41,9 +41,10 @@ */ public class AuditCmd extends Command { + private final static String LINESTART = "\u25AB"; // โ–ซ + private final static String UNKNOWN = "*Unknown*"; + private final String actions; - private final String linestart = "\u25AB"; // โ–ซ - private final String unknown = "*Unknown*"; public AuditCmd() { @@ -115,19 +116,19 @@ list.forEach(ale -> { StringBuilder sb = new StringBuilder(); - sb.append(linestart).append("User: ").append(FormatUtil.formatFullUser(ale.getUser())); + sb.append(LINESTART).append("User: ").append(FormatUtil.formatFullUser(ale.getUser())); switch(ale.getTargetType()) { case CHANNEL: TextChannel tc = event.getGuild().getTextChannelById(ale.getTargetIdLong()); - sb.append("\n").append(linestart).append("Channel: ") - .append(tc==null ? unknown : "**#"+tc.getName()+"**") + sb.append("\n").append(LINESTART).append("Channel: ") + .append(tc==null ? UNKNOWN : "**#"+tc.getName()+"**") .append(" (ID:").append(ale.getTargetId()).append(")"); break; case EMOTE: Emote e = event.getGuild().getEmoteById(ale.getTargetIdLong()); - sb.append("\n").append(linestart).append("Emote: ") - .append(e==null ? unknown : e.getAsMention()) + sb.append("\n").append(LINESTART).append("Emote: ") + .append(e==null ? UNKNOWN : e.getAsMention()) .append(" (ID:").append(ale.getTargetId()).append(")"); break; case GUILD: @@ -136,38 +137,38 @@ break; case MEMBER: User u = event.getJDA().getUserById(ale.getTargetIdLong()); - sb.append("\n").append(linestart).append("Member: ") - .append(u==null ? unknown : FormatUtil.formatUser(u)) + sb.append("\n").append(LINESTART).append("Member: ") + .append(u==null ? UNKNOWN : FormatUtil.formatUser(u)) .append(" (ID:").append(ale.getTargetId()).append(")"); break; case ROLE: Role r = event.getGuild().getRoleById(ale.getTargetIdLong()); - sb.append("\n").append(linestart).append("Role: ") - .append(r==null ? unknown : "**"+r.getName()+"**") + sb.append("\n").append(LINESTART).append("Role: ") + .append(r==null ? UNKNOWN : "**"+r.getName()+"**") .append(" (ID:").append(ale.getTargetId()).append(")"); break; case WEBHOOK: - sb.append("\n").append(linestart).append("Webhook ID: ").append(ale.getTargetId()); + sb.append("\n").append(LINESTART).append("Webhook ID: ").append(ale.getTargetId()); break; case UNKNOWN: default: - sb.append("\n").append(linestart).append("Target ID: ").append(ale.getTargetId()); + sb.append("\n").append(LINESTART).append("Target ID: ").append(ale.getTargetId()); } ale.getChanges().keySet().forEach(change -> { - sb.append("\n").append(linestart).append(fixCase(change)).append(": ") + sb.append("\n").append(LINESTART).append(fixCase(change)).append(": ") .append(ale.getChangeByKey(change).getOldValue()==null ? "" : "**"+ale.getChangeByKey(change).getOldValue()+"**") .append(ale.getChangeByKey(change).getOldValue()==null || ale.getChangeByKey(change).getNewValue()==null ? "" : " โ†’ ") .append(ale.getChangeByKey(change).getNewValue()==null ? "" : "**"+ale.getChangeByKey(change).getNewValue()+"**"); }); ale.getOptions().keySet().forEach(option -> { - sb.append("\n").append(linestart).append(fixCase(option)).append(": ") - .append(ale.getOptionByName(option)==null ? unknown : "**"+ale.getOptionByName(option)+"**"); + sb.append("\n").append(LINESTART).append(fixCase(option)).append(": ") + .append(ale.getOptionByName(option)==null ? UNKNOWN : "**"+ale.getOptionByName(option)+"**"); }); if(ale.getReason()!=null) - sb.append("\n").append(linestart).append("Reason: ").append(ale.getReason()); - sb.append("\n").append(linestart).append("Time: **").append(ale.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)).append("**\n\u200B"); + sb.append("\n").append(LINESTART).append("Reason: ").append(ale.getReason()); + sb.append("\n").append(LINESTART).append("Time: **").append(ale.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)).append("**\n\u200B"); String str = sb.length()>1024 ? sb.substring(0,1020)+" ..." : sb.toString(); eb.addField(actionToEmote(ale.getType())+" "+fixCase(ale.getType().name()), str, true); }); diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java index e0afa39..1bdce00 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java @@ -34,9 +34,10 @@ */ public class InvitepruneCmd extends Command { + private final static String CANCEL = "\u274C"; // โŒ + private final static String CONFIRM = "\u2611"; // โ˜‘ + private final Vortex vortex; - private final String CANCEL = "\u274C"; - private final String CONFIRM = "\u2611"; public InvitepruneCmd(Vortex vortex) { diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java index 9eb5b92..0d75c25 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java @@ -35,8 +35,12 @@ */ public class LookupCmd extends Command { + private final static String BOT_EMOJI = "<:botTag:230105988211015680>"; + private final static String USER_EMOJI = "\uD83D\uDC64"; // ๐Ÿ‘ค + private final static String GUILD_EMOJI = "\uD83D\uDDA5"; // ๐Ÿ–ฅ + private final static String LINESTART = "\u25AB"; // โ–ซ + private final Vortex vortex; - private final String linestart = "\u25AB"; public LookupCmd(Vortex vortex) { @@ -69,16 +73,16 @@ { u = event.getJDA().retrieveUserById(id).complete(); } - catch(Exception ex) {} + catch(Exception ignore) {} if(u!=null) { - String text = (u.isBot()?"<:botTag:230105988211015680>":"\uD83D\uDC64")+" Information about **"+u.getName()+"**#"+u.getDiscriminator()+":"; + String text = (u.isBot() ? BOT_EMOJI : USER_EMOJI)+" Information about **"+u.getName()+"**#"+u.getDiscriminator()+":"; EmbedBuilder eb = new EmbedBuilder(); eb.setThumbnail(u.getEffectiveAvatarUrl()); - String str = linestart+"Discord ID: **"+u.getId()+"**"; + String str = LINESTART+"Discord ID: **"+u.getId()+"**"; if(u.getAvatarId()!=null && u.getAvatarId().startsWith("a_")) str+= " <:nitro:314068430611415041>"; - str+="\n"+linestart+"Account Creation: **"+MiscUtil.getDateTimeString(u.getCreationTime())+"**"; + str+="\n"+LINESTART+"Account Creation: **"+MiscUtil.getDateTimeString(u.getCreationTime())+"**"; eb.setDescription(str); event.reply(new MessageBuilder().append(text).setEmbed(eb.build()).build()); return; @@ -99,22 +103,23 @@ { inv = Invite.resolve(event.getJDA(), widget.getInviteCode()).complete(); } - catch(Exception ex){} + catch(Exception ignore){} } - String text = "\uD83D\uDDA5 Information about **"+widget.getName()+"**:"; + String text = GUILD_EMOJI + " Information about **"+widget.getName()+"**:"; EmbedBuilder eb = new EmbedBuilder(); - String str = linestart+"ID: **"+widget.getId()+"**\n" - +linestart+"Creation: **"+widget.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" - +linestart+"Channels: **"+widget.getVoiceChannels().size()+"** Voice\n" - +linestart+"Users: **"+widget.getMembers().size()+"** online\n"; + String str = LINESTART+"ID: **"+widget.getId()+"**\n" + +LINESTART+"Creation: **"+widget.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" + +LINESTART+"Channels: **"+widget.getVoiceChannels().size()+"** Voice\n" + +LINESTART+"Users: **"+widget.getMembers().size()+"** online\n"; if(inv!=null) { eb.setThumbnail(inv.getGuild().getIconUrl()); - str+=linestart+"Invite: **"+inv.getCode()+"** "+(inv.getChannel().getType()==ChannelType.TEXT + str+=LINESTART+"Invite: **"+inv.getCode()+"** "+(inv.getChannel().getType()==ChannelType.TEXT ? "#"+inv.getChannel().getName() : inv.getChannel().getName())+" (ID:"+inv.getChannel().getId()+")"; + if(inv.getGuild().getSplashId()!=null) { - str+="\n\n<:partner:314068430556758017> **Discord Partner** <:partner:314068430556758017>"; + str += "\n"+LINESTART+"Splash: "; eb.setImage(inv.getGuild().getSplashUrl()+"?size=1024"); } } @@ -123,9 +128,7 @@ return; } } - catch(NumberFormatException ex) - { - } + catch(NumberFormatException ignore) {} catch(RateLimitedException ex) { event.reactWarning(); @@ -141,7 +144,7 @@ { inv = Invite.resolve(event.getJDA(), code).complete(); } - catch(Exception ex){} + catch(Exception ignore){} if(inv==null) { event.replyError("No users, guilds, or invites found."); @@ -152,22 +155,22 @@ { widget = WidgetUtil.getWidget(inv.getGuild().getIdLong()); } - catch(RateLimitedException ex) {} - String text = "\uD83D\uDDA5 Information about Invite Code **"+code+"**:"; + catch(RateLimitedException ignore) {} + String text = GUILD_EMOJI + " Information about Invite Code **"+code+"**:"; EmbedBuilder eb = new EmbedBuilder(); eb.setThumbnail(inv.getGuild().getIconUrl()); - String str = linestart+"Guild: **"+inv.getGuild().getName()+"**\n" - + linestart+"Channel: **"+(inv.getChannel().getType()==ChannelType.TEXT?"#":"")+inv.getChannel().getName()+"** (ID:"+inv.getChannel().getId()+")\n" - + linestart+"Inviter: "+(inv.getInviter()==null?"N/A":"**"+inv.getInviter().getName()+"**#"+inv.getInviter().getDiscriminator()+" (ID:"+inv.getInviter().getId()+")"); + String str = LINESTART+"Guild: **"+inv.getGuild().getName()+"**\n" + + LINESTART+"Channel: **"+(inv.getChannel().getType()==ChannelType.TEXT?"#":"")+inv.getChannel().getName()+"** (ID:"+inv.getChannel().getId()+")\n" + + LINESTART+"Inviter: "+(inv.getInviter()==null?"N/A":"**"+inv.getInviter().getName()+"**#"+inv.getInviter().getDiscriminator()+" (ID:"+inv.getInviter().getId()+")"); eb.setDescription(str); - str = linestart+"ID: **"+inv.getGuild().getId()+"**\n" - +linestart+"Creation: **"+inv.getGuild().getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n"; + str = LINESTART+"ID: **"+inv.getGuild().getId()+"**\n" + +LINESTART+"Creation: **"+inv.getGuild().getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n"; if(widget!=null && widget.isAvailable()) - str += linestart+"Channels: **"+widget.getVoiceChannels().size()+"** Voice\n" - +linestart+"Users: **"+widget.getMembers().size()+"** online"; + str += LINESTART+"Channels: **"+widget.getVoiceChannels().size()+"** Voice\n" + +LINESTART+"Users: **"+widget.getMembers().size()+"** online"; if(inv.getGuild().getSplashId()!=null) { - str+="\n\n<:partner:314068430556758017> **Discord Partner** <:partner:314068430556758017>"; + str += "\n"+LINESTART+"Splash: "; eb.setImage(inv.getGuild().getSplashUrl()+"?size=1024"); } eb.addField("Guild Info", str, false); diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java index 98cb4ca..5d9842f 100644 --- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java @@ -187,7 +187,7 @@ return; StringBuilder sb = new StringBuilder(REDIR_END+" **"+link+"**"); for(int i=0; i pc.sendMessage(message).queue(s->then.run(), f->then.run()), f->then.run()); } - catch(Exception ex){} + catch(Exception ignore) {} } public static Member findMember(String username, String discriminator, Guild guild)