Donation System

src/main/java/org/cascadebot/cascadebot/CascadeBot.java

@@ -29,7 +29,9 @@
 import org.cascadebot.cascadebot.commandmeta.CommandManager;
 import org.cascadebot.cascadebot.data.Config;
 import org.cascadebot.cascadebot.data.database.DatabaseManager;
+import org.cascadebot.cascadebot.data.managers.CascadeUserDataManager;
 import org.cascadebot.cascadebot.data.managers.GuildDataManager;
+import org.cascadebot.cascadebot.data.objects.donation.Tier;
 import org.cascadebot.cascadebot.events.ButtonEventListener;
 import org.cascadebot.cascadebot.events.CommandListener;
 import org.cascadebot.cascadebot.events.GeneralEventListener;
@@ -200,6 +202,8 @@ private void init() {
                 defaultShardManagerBuilder.setAudioSendFactory(new NativeAudioSendFactory());
             }
 
+            Tier.Companion.parseTiers();
+
             shardManager = defaultShardManagerBuilder.build();
         } catch (LoginException e) {
             LOGGER.error("Error building JDA", e);
@@ -215,6 +219,7 @@ private void init() {
         moderationManager = new ModerationManager();
 
         Metrics.INS.cacheMetrics.addCache("guilds", GuildDataManager.getGuilds());
+        Metrics.INS.cacheMetrics.addCache("users", CascadeUserDataManager.getUsers());
 
         Thread.setDefaultUncaughtExceptionHandler(((t, e) -> LOGGER.error("Uncaught exception in thread " + t, MDCException.from(e))));
         Thread.currentThread()

src/main/java/org/cascadebot/cascadebot/commandmeta/CommandManager.java

@@ -9,7 +9,7 @@
 import org.apache.commons.lang3.reflect.ConstructorUtils;
 import org.cascadebot.cascadebot.ShutdownHandler;
 import org.cascadebot.cascadebot.data.language.Locale;
-import org.cascadebot.cascadebot.data.objects.GuildData;
+import org.cascadebot.cascadebot.data.objects.guild.GuildData;
 import org.cascadebot.cascadebot.utils.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/cascadebot/cascadebot/commandmeta/ICommandExecutable.java

@@ -8,7 +8,7 @@
 import net.dv8tion.jda.api.entities.Member;
 import org.cascadebot.cascadebot.data.language.Language;
 import org.cascadebot.cascadebot.data.language.Locale;
-import org.cascadebot.cascadebot.data.objects.Flag;
+import org.cascadebot.cascadebot.data.objects.donation.Flag;
 import org.cascadebot.cascadebot.permissions.CascadePermission;
 
 import java.util.Set;
@@ -61,8 +61,8 @@ default boolean deleteMessages() {
         return true;
     }
 
-    default Set<Flag> getFlags() {
-        return Set.of();
+    default String getRequiredFlag() {
+        return null;
     }
 
 }

src/main/java/org/cascadebot/cascadebot/commands/core/DonateCommand.java

@@ -0,0 +1,49 @@
+package org.cascadebot.cascadebot.commands.core;
+
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Member;
+import org.apache.commons.lang3.StringUtils;
+import org.cascadebot.cascadebot.commandmeta.CommandContext;
+import org.cascadebot.cascadebot.commandmeta.ICommandCore;
+import org.cascadebot.cascadebot.data.objects.donation.Tier;
+import org.cascadebot.cascadebot.messaging.MessagingObjects;
+import org.cascadebot.cascadebot.utils.pagination.Page;
+import org.cascadebot.cascadebot.utils.pagination.PageObjects;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class DonateCommand implements ICommandCore {
+
+    @Override
+    public void onCommand(Member sender, CommandContext context) {
+        EmbedBuilder builder = MessagingObjects.getClearThreadLocalEmbedBuilder();
+        List<Page> pages = new ArrayList<>();
+
+        builder.setTitle(context.i18n("commands.donate.embed_title"));
+        builder.setDescription(context.i18n("commands.donate.embed_description"));
+        builder.setFooter(context.i18n("commands.donate.embed_footer"), context.getSelfUser().getAvatarUrl());
+        builder.addField("Patreon", context.i18n("commands.donate.embed_patreon"), true);
+
+        pages.add(new PageObjects.EmbedPage(builder));
+        for (Map.Entry<String, Tier> tier : Tier.Companion.getTiers().entrySet()) {
+            if (tier.getKey().equals("default") || tier.getKey().equals("nitro")) {
+                continue;
+            }
+            String title = tier.getKey();
+            pages.add(new PageObjects.EmbedPage(new EmbedBuilder()
+                    .setDescription((tier.getValue().getGuildTierString(context.getLocale(), null)))
+                    .setTitle(StringUtils.capitalize(title))
+            ));
+        }
+
+        context.getUiMessaging().sendPagedMessage(pages);
+    }
+
+    @Override
+    public String command() {
+        return "donate";
+    }
+
+}

src/main/java/org/cascadebot/cascadebot/commands/core/PrefixCommand.java

@@ -9,6 +9,7 @@
 import org.cascadebot.cascadebot.commandmeta.CommandContext;
 import org.cascadebot.cascadebot.commandmeta.ICommandCore;
 import org.cascadebot.cascadebot.data.Config;
+import org.cascadebot.cascadebot.data.objects.donation.AmountFlag;
 
 public class PrefixCommand implements ICommandCore {
 
@@ -32,7 +33,12 @@ public void onCommand(Member sender, CommandContext context) {
                 return;
             }
 
-            if (newPrefix.length() > 5) {
+            AmountFlag prefixFlag = (AmountFlag) context.getData().getAllFlags().getFlag("prefix_length");
+            if (prefixFlag == null) {
+                context.getTypedMessaging().replyDanger(context.i18n("commands.prefix.prefix_too_long"));
+                return;
+            }
+            if (newPrefix.length() > prefixFlag.getAmount()) {
                 context.getTypedMessaging().replyDanger(context.i18n("commands.prefix.prefix_too_long"));
                 return;
             }

src/main/java/org/cascadebot/cascadebot/commands/developer/EvalCommand.java

@@ -86,6 +86,7 @@ public void onCommand(Member sender, CommandContext context) {
                 scriptEngine.put("context", context);
                 scriptEngine.put("channel", context.getChannel());
                 scriptEngine.put("guild", context.getGuild());
+                scriptEngine.put("data", context.getData());
 
                 String imports = IMPORTS.stream().map(s -> "import " + s + ".*;").collect(Collectors.joining(" "));
 

src/main/java/org/cascadebot/cascadebot/commands/developer/GuildCommand.java

@@ -38,7 +38,7 @@ public SecurityLevel getCommandLevel() {
 
     @Override
     public Set<ISubCommand> getSubCommands() {
-        return Set.of(new GuildSaveSubCommand(), new GuildLeaveSubCommand(), new GuildFlagSubCommand(), new GuildInfoSubCommand());
+        return Set.of(new GuildSaveSubCommand(), new GuildLeaveSubCommand(), new GuildInfoSubCommand());
     }
 
     @Override

src/main/java/org/cascadebot/cascadebot/commands/developer/GuildInfoSubCommand.java

@@ -14,8 +14,7 @@
 import org.cascadebot.cascadebot.commandmeta.ISubCommand;
 import org.cascadebot.cascadebot.commandmeta.Module;
 import org.cascadebot.cascadebot.data.managers.GuildDataManager;
-import org.cascadebot.cascadebot.data.objects.Flag;
-import org.cascadebot.cascadebot.data.objects.GuildData;
+import org.cascadebot.cascadebot.data.objects.guild.GuildData;
 import org.cascadebot.cascadebot.messaging.MessagingObjects;
 import org.cascadebot.cascadebot.permissions.CascadePermission;
 import org.cascadebot.cascadebot.utils.FormatUtils;
@@ -45,18 +44,20 @@ public void onCommand(Member sender, CommandContext context) {
 
 
         GuildData finalDataForList = dataForList;
+        /*
         String flags = Arrays.stream(Flag.values())
                              .map(flag -> FormatUtils.formatEnum(flag) + " - " +
                                      (finalDataForList.isFlagEnabled(flag) ? UnicodeConstants.TICK : UnicodeConstants.RED_CROSS))
                              .collect(Collectors.joining("\n"));
+         */
 
         String modules = Arrays.stream(Module.values())
                              .map(module -> FormatUtils.formatEnum(module) + " - " +
                                      (finalDataForList.getCoreSettings().isModuleEnabled(module) ? UnicodeConstants.TICK : UnicodeConstants.RED_CROSS))
                              .collect(Collectors.joining("\n"));
 
 
-        builder.addField("Flags", flags, false);
+        //builder.addField("Flags", flags, false);
         builder.addField("Modules", modules, false);
         builder.addField("Join Date", FormatUtils.formatDateTime(context.getSelfMember().getTimeJoined()), false);
 

src/main/java/org/cascadebot/cascadebot/commands/developer/GuildSaveSubCommand.java

@@ -9,7 +9,7 @@
 import org.cascadebot.cascadebot.commandmeta.CommandContext;
 import org.cascadebot.cascadebot.commandmeta.ISubCommand;
 import org.cascadebot.cascadebot.data.managers.GuildDataManager;
-import org.cascadebot.cascadebot.data.objects.GuildData;
+import org.cascadebot.cascadebot.data.objects.guild.GuildData;
 import org.cascadebot.cascadebot.permissions.CascadePermission;
 
 public class GuildSaveSubCommand implements ISubCommand {

src/main/java/org/cascadebot/cascadebot/commands/management/FlagsCommand.java

@@ -1,26 +1,16 @@
 package org.cascadebot.cascadebot.commands.management;
 
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
-import org.apache.commons.lang3.StringUtils;
-import org.cascadebot.cascadebot.UnicodeConstants;
 import org.cascadebot.cascadebot.commandmeta.CommandContext;
 import org.cascadebot.cascadebot.commandmeta.ICommandMain;
 import org.cascadebot.cascadebot.commandmeta.Module;
-import org.cascadebot.cascadebot.data.objects.Flag;
-import org.cascadebot.cascadebot.data.objects.GuildData;
-import org.cascadebot.cascadebot.messaging.MessagingObjects;
 import org.cascadebot.cascadebot.permissions.CascadePermission;
-import org.cascadebot.cascadebot.utils.FormatUtils;
-
-import java.util.Arrays;
-import java.util.stream.Collectors;
 
 public class FlagsCommand implements ICommandMain {
 
     @Override
     public void onCommand(Member sender, CommandContext context) {
+        /*
         GuildData dataForList = context.getData();
         Guild guildForList = context.getGuild();
 
@@ -36,6 +26,7 @@ public void onCommand(Member sender, CommandContext context) {
         builder.addField(context.i18n("words.flags"), flags, false);
 
         context.getTypedMessaging().replyInfo(builder);
+        */
     }
 
     @Override

src/main/java/org/cascadebot/cascadebot/commands/management/SettingsCommand.java

@@ -48,10 +48,12 @@ public void onCommand(Member sender, CommandContext context) {
                 try {
                     Setting settingAnnotation = field.getAnnotation(Setting.class);
                     if (settingAnnotation != null) {
-                        if (!context.getData().getEnabledFlags().containsAll(Arrays.asList(settingAnnotation.flagRequired()))) {
-                            String niceName = Language.i18n(context.getGuild().getIdLong(), "settings." + field.getDeclaringClass().getAnnotation(SettingsContainer.class).module().name().toLowerCase() + "." + field.getName() + ".nice_name");
-                            context.getTypedMessaging().replyDanger(context.i18n("commands.settings.cannot_edit", niceName));
-                            return;
+                        for (String flag : settingAnnotation.flagsRequired()) {
+                            if (!context.getData().getAllFlags().hasFlag(flag)) {
+                                String niceName = Language.i18n(context.getGuild().getIdLong(), "settings." + field.getDeclaringClass().getAnnotation(SettingsContainer.class).module().name().toLowerCase() + "." + field.getName() + ".nice_name");
+                                context.getTypedMessaging().replyDanger(context.i18n("commands.settings.cannot_edit", niceName));
+                                return;
+                            }
                         }
                     }
 

src/main/java/org/cascadebot/cascadebot/commands/management/permission/GroupPermissionListSubCommand.java

@@ -10,7 +10,7 @@
 import org.cascadebot.cascadebot.commandmeta.CommandContext;
 import org.cascadebot.cascadebot.commandmeta.ISubCommand;
 import org.cascadebot.cascadebot.commandmeta.Module;
-import org.cascadebot.cascadebot.data.objects.GuildPermissions;
+import org.cascadebot.cascadebot.data.objects.guild.GuildPermissions;
 import org.cascadebot.cascadebot.permissions.CascadePermission;
 import org.cascadebot.cascadebot.permissions.objects.Group;
 import org.cascadebot.cascadebot.utils.pagination.Page;

src/main/java/org/cascadebot/cascadebot/commands/management/permission/GroupPermissionMoveSubCommand.java

@@ -10,7 +10,7 @@
 import org.cascadebot.cascadebot.commandmeta.CommandContext;
 import org.cascadebot.cascadebot.commandmeta.ISubCommand;
 import org.cascadebot.cascadebot.commandmeta.Module;
-import org.cascadebot.cascadebot.data.objects.GuildPermissions;
+import org.cascadebot.cascadebot.data.objects.guild.GuildPermissions;
 import org.cascadebot.cascadebot.permissions.CascadePermission;
 import org.cascadebot.cascadebot.permissions.objects.Group;
 import org.cascadebot.cascadebot.utils.PermissionCommandUtils;

src/main/java/org/cascadebot/cascadebot/commands/management/permission/GroupPermissionSwitchSubCommand.java

@@ -10,7 +10,7 @@
 import org.cascadebot.cascadebot.commandmeta.CommandContext;
 import org.cascadebot.cascadebot.commandmeta.ISubCommand;
 import org.cascadebot.cascadebot.commandmeta.Module;
-import org.cascadebot.cascadebot.data.objects.GuildPermissions;
+import org.cascadebot.cascadebot.data.objects.guild.GuildPermissions;
 import org.cascadebot.cascadebot.permissions.CascadePermission;
 import org.cascadebot.cascadebot.utils.FormatUtils;
 

src/main/java/org/cascadebot/cascadebot/commands/music/EqualizerCommand.java

@@ -228,4 +228,10 @@ public CascadePermission getPermission() {
     public Set<ISubCommand> getSubCommands() {
         return Set.of(new EqualizerResetSubCommand());
     }
+
+    @Override
+    public String getRequiredFlag() {
+        return "music_controls";
+    }
+
 }

src/main/java/org/cascadebot/cascadebot/commands/music/EqualizerResetSubCommand.java

@@ -54,4 +54,9 @@ public CascadePermission getPermission() {
         return CascadePermission.of("equalizer.reset", true);
     }
 
+    @Override
+    public String getRequiredFlag() {
+        return "music_controls";
+    }
+
 }