diff --git a/src/main/java/com/jagrosh/vortex/Constants.java b/src/main/java/com/jagrosh/vortex/Constants.java index 530b2dd..b643327 100644 --- a/src/main/java/com/jagrosh/vortex/Constants.java +++ b/src/main/java/com/jagrosh/vortex/Constants.java @@ -27,7 +27,7 @@ public class Constants { public final static OffsetDateTime STARTUP = OffsetDateTime.now(); - public final static String PREFIX = ">>"; + public final static String PREFIX = ""; public final static String SUCCESS = Emoji.SUCCESS; public final static String WARNING = Emoji.WARNING; public final static String ERROR = Emoji.ERROR; @@ -43,25 +43,25 @@ Permission.VOICE_MUTE_OTHERS, Permission.NICKNAME_CHANGE, Permission.NICKNAME_MANAGE, Permission.VIEW_AUDIT_LOGS}; public final static EnumSet INTENTS = EnumSet.of(GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MODERATION, GatewayIntent.GUILD_INVITES, GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES); - public final static String SERVER_INVITE = "https://discord.gg/pQNtuyT3TZ"; + public final static String SERVER_INVITE = "https://discord.gg/U3Rjt9bZYx"; //public final static String BOT_INVITE = "https://discordapp.com/oauth2/authorize?client_id=240254129333731328&scope=bot&permissions="+Permission.getRaw(PERMISSIONS); // public final static String BOT_INVITE = "https://discordapp.com/oauth2/authorize?client_id=169463754382114816&scope=bot&permissions="+Permission.getRaw(PERMISSIONS); public final static String OWNER_ID = "507605578600808449"; - public final static String DONATION_LINK = "https://frye.perditum.com/donate"; + public final static String DONATION_LINK = "https://cromabot.com/donate"; public final static class Wiki { - public final static String PRIMARY_LINK = "https://frye.perditum.com"; + public final static String PRIMARY_LINK = "https://wiki.cromabot.com"; - public final static String SHORT_WIKI = "https://frye.perditum.com"; - public final static String SHORT_COMMANDS = "https://frye.perditum.com/cmds"; + public final static String SHORT_WIKI = "https://wiki.cromabot.com"; + public final static String SHORT_COMMANDS = "https://wiki.cromabot.com/cmds"; - public final static String WIKI_BASE = "https://frye.perditum.com"; + public final static String WIKI_BASE = "https://wiki.cromabot.com"; public final static String START = WIKI_BASE + "/gettingstarted"; public final static String LOG_TIMEZONE = WIKI_BASE + "/log-timezone"; public final static String RAID_MODE = WIKI_BASE + "/raid-mode"; public final static String COMMANDS = WIKI_BASE + "/cmds"; public final static String AUTOMOD = WIKI_BASE + "/automod"; - public final static String VORTEX_PRO = WIKI_BASE + "/frye-pro"; + public final static String VORTEX_PRO = WIKI_BASE + "/croma-pro"; } } diff --git a/src/main/java/com/jagrosh/vortex/Emoji.java b/src/main/java/com/jagrosh/vortex/Emoji.java index 1442025..e95bfde 100644 --- a/src/main/java/com/jagrosh/vortex/Emoji.java +++ b/src/main/java/com/jagrosh/vortex/Emoji.java @@ -18,41 +18,43 @@ /** * * @author John Grosh (john.a.grosh@gmail.com) + * @author SolidStateDrive (ssdrive@perditum.com) */ public class Emoji { // vortex general icons - public final static String VORTEX = "<:check:1508781509124034601>"; - public final static String SUCCESS = "<:check:1508781509124034601>"; - public final static String WARNING = ":warning:"; - public final static String ERROR = "<:x_:1508781485228818582>"; - public final static String LOADING = ""; + public final static String VORTEX = "<:check:1509250323846533304>"; + public final static String SUCCESS = "<:check:1509250323846533304>"; + public final static String WARNING = "<:warning:1509251232080855091>"; + public final static String ERROR = "<:x_:1509250338379530350>"; + 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_VERIFIED = "<:verifbot:1509255641863032892>"; 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>"; + public final static String BADGE_NITRO = "<:nitro:1509256548449390725>"; + public final static String BADGE_BUG_HUNTER = "<:bughunter:1509255501530267718>"; + public final static String BADGE_EARLY_SUPPORTER = "<:earlysupporter:1509255646732619946>"; + public final static String BADGE_HYPESQUAD = "<:hypesquad:1509255648431308920>"; + public final static String BADGE_HYPESQUAD_BALANCE = "<:balance:1509255455514427535>"; + public final static String BADGE_HYPESQUAD_BRAVERY = "<:bravery:1509255494651478170>"; + public final static String BADGE_HYPESQUAD_BRILLIANCE = "<:brilliance:1509255497801535609>"; + public final static String BADGE_PARTNER = "<:partner:1509255640260935721>"; + public final static String BADGE_STAFF = "<:discordstaff:1509255502717255761>"; + public final static String BADGE_VERIFIED_DEVELOPER = "<:verifiedbotdev:1509255643435897072>"; + public final static String BADGE_CERTIFIED_MODERATOR = "<:alumni:1509255315831390431>"; // 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>"; + // public final static String STATUS_STREAMING = "<:statusStreaming:850113664873922560>"; + public final static String STATUS_STREAMING = "<:online:1509255638654521535>"; + public final static String STATUS_ONLINE = "<:online:1509255638654521535>"; + public final static String STATUS_IDLE = "<:idle:1509255650192916631>"; + public final static String STATUS_DO_NOT_DISTURB = "<:dnd:1509255644992241804>"; + public final static String STATUS_INVISIBLE = "<:invis:1509255652206444645>"; + public final static String STATUS_OFFLINE = "<:invis:1509255652206444645>"; // logs public final static String VOICE_JOIN = "<:voicejoin:850102867687243796>"; diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java index 88b716e..b047fc4 100644 --- a/src/main/java/com/jagrosh/vortex/Vortex.java +++ b/src/main/java/com/jagrosh/vortex/Vortex.java @@ -100,7 +100,7 @@ listener = new CommandExceptionListener(); CommandClient client = new CommandClientBuilder() .setPrefix(Constants.PREFIX) - .setActivity(Activity.playing("chilling in splatsville")) + .setActivity(Activity.playing("listening to klubb")) .setOwnerId(Constants.OWNER_ID) .setServerInvite(Constants.SERVER_INVITE) .setEmojis(Constants.SUCCESS, Constants.WARNING, Constants.ERROR) @@ -199,7 +199,7 @@ .disableCache(CacheFlag.EMOJI, CacheFlag.ACTIVITY, CacheFlag.CLIENT_STATUS, CacheFlag.ONLINE_STATUS) .addEventListeners(new Listener(this), client, waiter) .setStatus(OnlineStatus.DO_NOT_DISTURB) - .setActivity(Activity.playing("Loading Frye...")) + .setActivity(Activity.playing("Loading Croma...")) .build(); modlog.start(); diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java index 0c34066..ec2cd60 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java @@ -80,11 +80,11 @@ @Override protected void execute(CommandEvent event) { - if(!vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PRO)) - { - event.reply(PremiumManager.Level.PRO.getRequirementMessage()); - return; - } + // if(!vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PRO)) + // { + // event.reply(PremiumManager.Level.PRO.getRequirementMessage()); + // return; + // } String[] parts = event.getArgs().split("\\s+", 3); if(parts.length < 3) diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java index cde0f18..7a738cc 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java @@ -52,7 +52,7 @@ event.replySuccess("Link Resolving has been turned `"+event.getArgs().toUpperCase()+"`"); } else - event.reply(PremiumManager.Level.PRO.getRequirementMessage()); + event.reply(PremiumManager.Level.PLUS.getRequirementMessage()); } else { diff --git a/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java index 7a7b199..5d2a38d 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java @@ -47,12 +47,12 @@ { ShardManager sm = event.getJDA().getShardManager(); event.reply(new MessageCreateBuilder() - .setContent(Constants.VORTEX_EMOJI + " **All about Frye** " + Constants.VORTEX_EMOJI) + .setContent(Constants.VORTEX_EMOJI + " **Croma** " + Constants.VORTEX_EMOJI) .setEmbeds(new EmbedBuilder() .setColor(!event.isFromType(ChannelType.TEXT) ? Color.GRAY : event.getSelfMember().getColor()) - .setDescription("Hello, I am **Frye**#7106, a bot designed to keep your server safe and make moderating fast and easy!\n" - + "I was written in Java by **ssdrive** using [JDA](" + JDAInfo.GITHUB + ") and [JDA-Utilities](" + JDAUtilitiesInfo.GITHUB + ")\n" - + "I'm based on the Vortex bot by **jagrosh**, with some modern improvements.\n" + .setDescription("Hello, I am **Croma**, a bot designed to keep your server safe and make moderating fast and easy!\n" + + "I was written in Java by **ssdrive** and **RusticMaple** using [JDA v6](" + JDAInfo.GITHUB + ") and [JDA-Chewtils](" + JDAUtilitiesInfo.GITHUB + ")\n" + + "I'm based on the Vortex bot by **jagrosh**, but upgraded with more commands and features.\n" + "Type `" + event.getClient().getPrefix() + event.getClient().getHelpWord() + "` for help and information.\n\n" + FormatUtil.helpLinks(event)) .addField("Stats", sm.getShardsTotal()+ " Shards\n" + sm.getGuildCache().size() + " Servers", true) diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java index fa08102..6de1d29 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java @@ -48,7 +48,7 @@ +(event.getSelfMember().hasPermission(tc, REQUIRED_PERMS) ? "" : "\n"+event.getClient().getWarning()+String.format(REQUIRED_ERROR, tc.getAsMention()))); } else - event.reply(PremiumManager.Level.ULTRA.getRequirementMessage()); + event.reply(PremiumManager.Level.ULTRA.getUltraMessage()); } @Override @@ -63,6 +63,6 @@ event.replySuccess("Avatar Logs will now be sent in "+tc.getAsMention()); } else - event.reply(PremiumManager.Level.ULTRA.getRequirementMessage()); + event.reply(PremiumManager.Level.ULTRA.getUltraMessage()); } } diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/MuteroleCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/MuteroleCmd.java index 223163c..93c1a5f 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/MuteroleCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/MuteroleCmd.java @@ -49,14 +49,15 @@ { if(event.getArgs().isEmpty()) { - event.replyError("Please include the name of a role to use as the Muted role. If set to `none`, Vortex will use Timeouts instead of applying a role."); + // event.replyError("Please include the name of a role to use as the Muted role. If set to `none`, Vortex will use Timeouts instead of applying a role."); + event.replyError("Please include the name of a role to use as the Muted role."); return; } else if(event.getArgs().equalsIgnoreCase("none") || event.getArgs().equalsIgnoreCase("off")) { - vortex.getDatabase().settings.setMutedRole(event.getGuild(), null); - event.replySuccess("Frye will use Timeouts instead of a Mute role."); + // vortex.getDatabase().settings.setMutedRole(event.getGuild(), null); + event.replyError("Please include the name of a role to use as the Muted role."); return; } diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java index 0f7b060..8baa58a 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java @@ -48,15 +48,15 @@ @Override protected void setLogChannel(CommandEvent event, TextChannel tc) { - if(vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PLUS)) - { + // if(vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PLUS)) + // { vortex.getDatabase().settings.setServerLogChannel(event.getGuild(), tc); if(tc==null) event.replySuccess("Server Logs will not be sent"); else event.replySuccess("Server Logs will now be sent in "+tc.getAsMention()); - } - else - event.reply(PremiumManager.Level.PLUS.getRequirementMessage()); + // } + // else + // event.reply(PremiumManager.Level.PLUS.getRequirementMessage()); } } 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 d334625..5041af7 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java @@ -32,7 +32,7 @@ this.guildOnly = true; this.userPermissions = new Permission[]{Permission.MANAGE_SERVER}; this.botPermissions = new Permission[]{Permission.ADMINISTRATOR}; - this.children = new Command[]{new MuteSetupCmd(), new AutomodSetupCmd(), new VerificationSetupCmd()}; + this.children = new Command[]{new MuteSetupCmd(), new AutomodSetupCmd()}; } @Override @@ -232,31 +232,31 @@ }).build().display(event.getTextChannel()); } - private class VerificationSetupCmd extends Command - { - private VerificationSetupCmd() - { - this.name = "verification"; - this.category = new Category("Settings"); - this.help = "sets up the verification system"; - this.guildOnly = true; - this.userPermissions = new Permission[]{Permission.MANAGE_SERVER}; - this.botPermissions = new Permission[]{Permission.ADMINISTRATOR}; - } + // private class VerificationSetupCmd extends Command + // { + // private VerificationSetupCmd() + // { + // this.name = "verification"; + // this.category = new Category("Settings"); + // this.help = "sets up the verification system"; + // this.guildOnly = true; + // this.userPermissions = new Permission[]{Permission.MANAGE_SERVER}; + // this.botPermissions = new Permission[]{Permission.ADMINISTRATOR}; + // } - @Override - protected void execute(CommandEvent event) - { - String verificationMessage = "**How to setup verification**\n" - + "Text version: Go into Roles, and create your member role if you haven't already.\n\n" - + "Then, in your Member role, click 'Links' and add Frye to it.\n\n" - + "Make sure to enable the requirement, it is required.\n\n" - + "Then, simply instruct users who join to click the server name, and click 'Linked Roles' to verify!\n\n" - + "P.S. This can also be used for any role, not just for verification.\n\n" - + "[Video](https://cdn.abmanagement.al/frye-1.mov)"; + // @Override + // protected void execute(CommandEvent event) + // { + // String verificationMessage = "**How to setup verification**\n" + // + "Text version: Go into Roles, and create your member role if you haven't already.\n\n" + // + "Then, in your Member role, click 'Links' and add Frye to it.\n\n" + // + "Make sure to enable the requirement, it is required.\n\n" + // + "Then, simply instruct users who join to click the server name, and click 'Linked Roles' to verify!\n\n" + // + "P.S. This can also be used for any role, not just for verification.\n\n" + // + "[Video](https://cdn.abmanagement.al/frye-1.mov)"; - event.replySuccess(verificationMessage); - } - } + // event.replySuccess(verificationMessage); + // } + // } } 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 4b4ac60..cae4a1d 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java @@ -56,11 +56,11 @@ protected void execute(CommandEvent event) { // require Vortex Plus for invite pruning - if(!vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PLUS)) - { - event.reply(PremiumManager.Level.PLUS.getRequirementMessage()); - return; - } + // if(!vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PLUS)) + // { + // event.reply(PremiumManager.Level.PLUS.getRequirementMessage()); + // return; + // } int uses; if(event.getArgs().isEmpty()) diff --git a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java index 199f258..bcdfac9 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java @@ -232,9 +232,9 @@ public static enum Level { NONE("No Premium"), - PLUS("Frye Pro Lite"), - PRO("Frye Pro"), - ULTRA("Frye Experimental"); + PLUS("Croma Advanced"), + PRO("Croma Pro"), + ULTRA("Croma Experimental"); public final String name; @@ -252,6 +252,10 @@ { return Constants.WARNING + " Sorry, this feature requires " + name + ". See <" + Constants.Wiki.VORTEX_PRO + "> for more information."; } + + public String getUltraMessage() { + return Constants.WARNING + " Sorry, this feature is not currently available. It will be re-added in a future update. Join the support server for more details."; + } } public class PremiumInfo