diff --git a/src/main/java/com/jagrosh/vortex/Constants.java b/src/main/java/com/jagrosh/vortex/Constants.java index 36c4656..d8d6508 100644 --- a/src/main/java/com/jagrosh/vortex/Constants.java +++ b/src/main/java/com/jagrosh/vortex/Constants.java @@ -28,14 +28,14 @@ { public final static OffsetDateTime STARTUP = OffsetDateTime.now(); public final static String PREFIX = ">>"; - public final static String SUCCESS = "<:vSuccess:390202497827864597>"; - public final static String WARNING = "<:vWarning:390208158699618306>"; - public final static String ERROR = "<:vError:390229421228949504>"; - public final static String LOADING = ""; + public final static String SUCCESS = Emoji.SUCCESS; + public final static String WARNING = Emoji.WARNING; + public final static String ERROR = Emoji.ERROR; + public final static String LOADING = Emoji.LOADING; public final static String HELP_REACTION = SUCCESS.replaceAll("", "$1:$2"); public final static String ERROR_REACTION = ERROR.replaceAll("", "$1:$2"); - public final static String VORTEX_EMOJI = "<:Vortex:386971287282515970>"; - public final static int DEFAULT_CACHE_SIZE = 8000; + public final static String VORTEX_EMOJI = Emoji.VORTEX; + public final static int DEFAULT_CACHE_SIZE = 10000; public final static Permission[] PERMISSIONS = {Permission.ADMINISTRATOR, Permission.BAN_MEMBERS, Permission.KICK_MEMBERS, Permission.MANAGE_ROLES, Permission.MANAGE_SERVER, Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_READ, Permission.MESSAGE_WRITE,Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_HISTORY, Permission.MESSAGE_EXT_EMOJI, diff --git a/src/main/java/com/jagrosh/vortex/Emoji.java b/src/main/java/com/jagrosh/vortex/Emoji.java new file mode 100644 index 0000000..60c3d50 --- /dev/null +++ b/src/main/java/com/jagrosh/vortex/Emoji.java @@ -0,0 +1,62 @@ +/* + * Copyright 2021 John Grosh (john.a.grosh@gmail.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jagrosh.vortex; + +/** + * + * @author John Grosh (john.a.grosh@gmail.com) + */ +public class Emoji +{ + // vortex general icons + public final static String VORTEX = "<:vortex:850113634859483176>"; + public final static String SUCCESS = "<:vSuccess:850102850491121725>"; + public final static String WARNING = "<:vWarning:850102850855895110>"; + public final static String ERROR = "<:vError:850102850846457879>"; + public final static String LOADING = ""; + + // bot + public final static String BOT = "<:bot:850113743764717627>"; + public final static String BOT_VERIFIED = "<:botVerified:850113743760654397>"; + public final static String BOT_SYSTEM = "<:botSystem:850113743488811031>"; + + // badges + public final static String BADGE_NITRO = "<:badgeNitro:850113719702781953>"; + public final static String BADGE_BUG_HUNTER = "<:badgeBugHunter:850113719652450315>"; + public final static String BADGE_EARLY_SUPPORTER = "<:badgeEarlySupported:850113719634755624>"; + public final static String BADGE_HYPESQUAD = "<:badgeHypesquad:850113719476027414>"; + public final static String BADGE_HYPESQUAD_BALANCE = "<:badgeBalance:850113719400792065>"; + public final static String BADGE_HYPESQUAD_BRAVERY = "<:badgeBravery:850113719526227969>"; + public final static String BADGE_HYPESQUAD_BRILLIANCE = "<:badgeBrilliance:850113719689412618>"; + public final static String BADGE_PARTNER = "<:badgePartner:850113719752065054>"; + public final static String BADGE_STAFF = "<:badgeStaff:850113719764910111>"; + public final static String BADGE_VERIFIED_DEVELOPER = "<:badgeVerifiedDev:850113719559782401>"; + public final static String BADGE_CERTIFIED_MODERATOR = "<:badgeModerator:850113719551918121>"; + + // status + public final static String STATUS_STREAMING = "<:statusStreaming:850113664873922560>"; + public final static String STATUS_ONLINE = "<:statusOnline:850113664694353941>"; + public final static String STATUS_IDLE = "<:statusAway:850113664873660427>"; + public final static String STATUS_DO_NOT_DISTURB = "<:statusDND:850113664873660426>"; + public final static String STATUS_INVISIBLE = "<:statusInvisible:850113664643891262>"; + public final static String STATUS_OFFLINE = "<:statusOffline:850113664556204124>"; + + // logs + public final static String VOICE_JOIN = "<:voicejoin:850102867687243796>"; + public final static String VOICE_LEAVE = "<:voiceleave:850102867586056232>"; + public final static String VOICE_CHANGE = "<:voicechange:850102867250511903>"; + public final static String GIF_AVATAR = "<:gif:850113698504507445>"; +} 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 3e6e2c1..2beccfd 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java @@ -19,6 +19,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; +import com.jagrosh.vortex.Emoji; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.OtherUtil; import java.util.ArrayList; @@ -38,7 +39,6 @@ */ public class UserinfoCmd extends Command { - private final static String BOT_EMOJI = "<:botTag:230105988211015680>"; private final static String USER_EMOJI = "\uD83D\uDC64"; // 👤 private final static String LINESTART = "\u25AB"; // ▫ @@ -79,11 +79,11 @@ } } User user = member.getUser(); - String title = (user.isBot() ? BOT_EMOJI : USER_EMOJI)+" Information about **"+user.getName()+"** #"+user.getDiscriminator()+":"; + String title = (user.isBot() ? Emoji.BOT : USER_EMOJI)+" Information about **"+user.getName()+"** #"+user.getDiscriminator()+":"; StringBuilder str = new StringBuilder(LINESTART + "Discord ID: **" + user.getId() + "** "); user.getFlags().forEach(flag -> str.append(OtherUtil.getEmoji(flag))); if(user.getAvatarId() != null && user.getAvatarId().startsWith("a_")) - str.append("<:nitro:314068430611415041>"); + str.append(Emoji.BADGE_NITRO); if(member.getNickname()!=null) str.append("\n" + LINESTART + "Nickname: **").append(member.getNickname()).append("**"); String roles=""; @@ -135,13 +135,13 @@ { Activity game = games.isEmpty() ? null : games.get(0); if(game!=null && game.getType()==Activity.ActivityType.STREAMING && game.getUrl()!=null && Activity.isValidStreamingUrl(game.getUrl())) - return "<:streaming:313956277132853248>"; + return Emoji.STATUS_STREAMING; switch(status) { - case ONLINE: return "<:online:313956277808005120>"; - case IDLE: return "<:away:313956277220802560>"; - case DO_NOT_DISTURB: return "<:dnd:313956276893646850>"; - case INVISIBLE: return "<:invisible:313956277107556352>"; - case OFFLINE: return "<:offline:313956277237710868>"; + case ONLINE: return Emoji.STATUS_ONLINE; + case IDLE: return Emoji.STATUS_IDLE; + case DO_NOT_DISTURB: return Emoji.STATUS_DO_NOT_DISTURB; + case INVISIBLE: return Emoji.STATUS_INVISIBLE; + case OFFLINE: return Emoji.STATUS_OFFLINE; default: return ""; } } 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 29d005f..cadd9d9 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java @@ -18,6 +18,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Constants; +import com.jagrosh.vortex.Emoji; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.PremiumManager; import com.jagrosh.vortex.utils.FormatUtil; @@ -40,7 +41,6 @@ */ 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 UNKNOWN_ID = "\uD83C\uDD94"; // 🆔 @@ -123,13 +123,13 @@ catch(Exception ignore) {} if(u == null) return false; - String text = (u.isBot() ? BOT_EMOJI : USER_EMOJI) + " Information about **" + u.getName() + "**#" + u.getDiscriminator() + ":"; + String text = (u.isBot() ? Emoji.BOT : USER_EMOJI) + " Information about **" + u.getName() + "**#" + u.getDiscriminator() + ":"; EmbedBuilder eb = new EmbedBuilder(); eb.setThumbnail(u.getEffectiveAvatarUrl()); StringBuilder str = new StringBuilder(LINESTART + "Discord ID: **" + u.getId() + "** "); u.getFlags().forEach(flag -> str.append(OtherUtil.getEmoji(flag))); if(u.getAvatarId() != null && u.getAvatarId().startsWith("a_")) - str.append("<:nitro:314068430611415041>"); + str.append(Emoji.BADGE_NITRO); str.append("\n" + LINESTART + "Account Creation: **").append(TimeUtil.getDateTimeString(u.getTimeCreated())).append("**"); eb.setDescription(str.toString()); event.reply(new MessageBuilder().append(FormatUtil.filterEveryone(text)).setEmbed(eb.build()).build()); 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 b58e5ad..1a7b7a0 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java @@ -64,7 +64,7 @@ // level to set permission when finished // Cache - private final FixedCache cache = new FixedCache<>(Constants.DEFAULT_CACHE_SIZE); + private final FixedCache cache = new FixedCache<>(Constants.DEFAULT_CACHE_SIZE * 3); private final GuildSettings blankSettings = new GuildSettings(); public GuildSettingsDataManager(DatabaseConnector connector) diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java index dc8a064..954492d 100644 --- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java @@ -15,6 +15,7 @@ */ package com.jagrosh.vortex.logging; +import com.jagrosh.vortex.Emoji; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.logging.MessageCache.CachedMessage; import com.jagrosh.vortex.utils.FormatUtil; @@ -279,7 +280,7 @@ 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()) + log(OffsetDateTime.now(), tc, Emoji.VOICE_JOIN, FormatUtil.formatFullUser(event.getMember().getUser()) +" has joined voice channel _"+event.getChannelJoined().getName()+"_", null); } @@ -288,7 +289,7 @@ 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()) + log(OffsetDateTime.now(), tc, Emoji.VOICE_CHANGE, FormatUtil.formatFullUser(event.getMember().getUser()) +" has moved voice channels from _"+event.getChannelLeft().getName()+"_ to _"+event.getChannelJoined().getName()+"_", null); } @@ -297,7 +298,7 @@ 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()) + log(OffsetDateTime.now(), tc, Emoji.VOICE_LEAVE, FormatUtil.formatFullUser(event.getMember().getUser()) +" has left voice channel _"+event.getChannelLeft().getName()+"_", null); } @@ -318,7 +319,7 @@ byte[] im = avatarSaver.makeAvatarImage(event.getUser(), event.getOldAvatarUrl(), event.getOldAvatarId()); if(im!=null) 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>" : "") + +(event.getUser().getAvatarId()!=null && event.getUser().getAvatarId().startsWith("a_") ? " " + Emoji.GIF_AVATAR : "") +":", im, "AvatarChange.png")); }); } diff --git a/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java b/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java index 0556bbf..4ec1a6b 100644 --- a/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java @@ -15,6 +15,7 @@ */ package com.jagrosh.vortex.utils; +import com.jagrosh.vortex.Emoji; import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; @@ -135,20 +136,21 @@ { switch(flag) { - case BUG_HUNTER_LEVEL_1: return "<:bughunter:585765206769139723>"; - case BUG_HUNTER_LEVEL_2: return "<:bughunter:585765206769139723>"; - case EARLY_SUPPORTER: return "<:supporter:585763690868113455>"; - case HYPESQUAD: return "<:hypesquad_events:585765895939424258>"; - case HYPESQUAD_BALANCE: return "<:balance:585763004574859273>"; - case HYPESQUAD_BRAVERY: return "<:bravery:585763004218343426>"; - case HYPESQUAD_BRILLIANCE: return "<:brilliance:585763004495298575>"; - case PARTNER: return "<:partner:314068430556758017>"; - case STAFF: return "<:staff:314068430787706880>"; - case SYSTEM: return "<:system:738519297265106954>"; + case BUG_HUNTER_LEVEL_1: return Emoji.BADGE_BUG_HUNTER; + case BUG_HUNTER_LEVEL_2: return Emoji.BADGE_BUG_HUNTER; + case EARLY_SUPPORTER: return Emoji.BADGE_EARLY_SUPPORTER; + case HYPESQUAD: return Emoji.BADGE_HYPESQUAD; + case HYPESQUAD_BALANCE: return Emoji.BADGE_HYPESQUAD_BALANCE; + case HYPESQUAD_BRAVERY: return Emoji.BADGE_HYPESQUAD_BRAVERY; + case HYPESQUAD_BRILLIANCE: return Emoji.BADGE_HYPESQUAD_BRILLIANCE; + case PARTNER: return Emoji.BADGE_PARTNER; + case STAFF: return Emoji.BADGE_STAFF; + case VERIFIED_DEVELOPER: return Emoji.BADGE_VERIFIED_DEVELOPER; + case CERTIFIED_MODERATOR: return Emoji.BADGE_CERTIFIED_MODERATOR; case TEAM_USER: return "\u2753"; case UNKNOWN: return "\u2753"; - case VERIFIED_BOT: return "<:verified_bot:738519297265238057>"; - case VERIFIED_DEVELOPER: return "<:badgeVerifiedDev:698313392728834049>"; + case VERIFIED_BOT: return Emoji.BOT_VERIFIED; + case SYSTEM: return Emoji.BOT_SYSTEM; default: return "\u2753"; } }