Update dependency org.jsoup:jsoup to v1.21.2

pom.xml

@@ -6,16 +6,14 @@
 
     <groupId>wtf.beatrice.hidekobot</groupId>
     <artifactId>HidekoBot</artifactId>
-    <version>0.9.3-SNAPSHOT</version>
+    <version>0.6.3-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sonar.dependencyCheck.htmlReportPath>./target/dependency-check-report.html
+        <sonar.dependencyCheck.htmlReportPath>./target/dependency-check-report.html</sonar.dependencyCheck.htmlReportPath>
-        </sonar.dependencyCheck.htmlReportPath>
+        <sonar.dependencyCheck.jsonReportPath>./target/dependency-check-report.json</sonar.dependencyCheck.jsonReportPath>
-        <sonar.dependencyCheck.jsonReportPath>./target/dependency-check-report.json
-        </sonar.dependencyCheck.jsonReportPath>
         <sonar.dependencyCheck.summarize>true</sonar.dependencyCheck.summarize>
     </properties>
 
@@ -32,6 +30,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>2.0.17</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.17</version>
+        </dependency>
 
         <!-- Dependency used for SQLite database connections-->
         <dependency>
@@ -51,7 +54,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.19.1</version>
+            <version>1.21.2</version>
         </dependency>
         <!-- Various String manipulation utils -->
         <dependency>
@@ -91,31 +94,6 @@
             <version>5.13.0</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>3.4.5</version>
-        </dependency>
-
-        <!-- Hibernate core + SQLite dialects -->
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>6.6.1.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-community-dialects</artifactId>
-            <version>6.6.1.Final</version>
-        </dependency>
-
-        <!-- Jakarta Persistence API (usually provided via Hibernate, but include explicitly for compile-time types) -->
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>3.1.0</version>
-        </dependency>
     </dependencies>
 
     <!-- override dependencies to use newer versions -->
@@ -139,6 +117,29 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>wtf.beatrice.hidekobot.HidekoBot</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -159,9 +160,7 @@
                     <failBuildOnCVSS>8</failBuildOnCVSS>
                     <!--suppress UnresolvedMavenProperty -->
                     <nvdApiKey>${nvdApiKey}</nvdApiKey>
-                    <knownExploitedUrl>
+                    <knownExploitedUrl>https://raw.githubusercontent.com/EugenMayer/cisa-known-exploited-mirror/main/known_exploited_vulnerabilities.json</knownExploitedUrl>
-                        https://raw.githubusercontent.com/EugenMayer/cisa-known-exploited-mirror/main/known_exploited_vulnerabilities.json
-                    </knownExploitedUrl>
                     <formats>
                         <format>html</format>
                         <format>json</format>
@@ -172,23 +171,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>3.4.5</version>
-                <configuration>
-                    <!-- Replace the main artifact (no classifier) -->
-                    <classifier></classifier>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 

src/main/java/wtf/beatrice/hidekobot/Cache.java

@@ -5,12 +5,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import wtf.beatrice.hidekobot.datasources.ConfigurationEntry;
 import wtf.beatrice.hidekobot.datasources.ConfigurationSource;
+import wtf.beatrice.hidekobot.datasources.DatabaseSource;
 import wtf.beatrice.hidekobot.datasources.PropertiesSource;
 import wtf.beatrice.hidekobot.listeners.MessageCommandListener;
 import wtf.beatrice.hidekobot.listeners.MessageLogger;
 import wtf.beatrice.hidekobot.listeners.SlashCommandCompletionListener;
 import wtf.beatrice.hidekobot.listeners.SlashCommandListener;
-import wtf.beatrice.hidekobot.util.Services;
 
 import java.awt.*;
 import java.lang.reflect.Field;
@@ -27,22 +27,11 @@ public class Cache
         throw new IllegalStateException("Utility class");
     }
 
+
     // todo: make this compatible with the message listener's regex
     private static final String BOT_PREFIX = "hideko";
     private static final Logger LOGGER = LoggerFactory.getLogger(Cache.class);
 
-    private static Services SERVICES;
-
-    public static void setServices(Services services)
-    {
-        SERVICES = services;
-    }
-
-    public static Services getServices()
-    {
-        return SERVICES;
-    }
-
     // map to store results of "love calculator", to avoid people re-running the same command until
     // they get what they wanted.
     // i didn't think this was worthy of a whole database table with a runnable checking for expiration,
@@ -51,6 +40,7 @@ public class Cache
 
     private static PropertiesSource propertiesSource = null;
     private static ConfigurationSource configurationSource = null;
+    private static DatabaseSource databaseSource = null;
     private static boolean verbose = false;
     private static MessageLogger verbosityLogger = null;
     private static final long BOT_MAINTAINER_ID = 979809420714332260L;
@@ -191,6 +181,26 @@ public class Cache
         return DEFAULT_INVITE_LINK.replace("%userid%", botApplicationId);
     }
 
+    /**
+     * Set the already fully-initialized DatabaseSource instance, ready to be accessed and used.
+     *
+     * @param databaseSourceInstance the fully-initialized DatabaseSource instance.
+     */
+    public static void setDatabaseSourceInstance(DatabaseSource databaseSourceInstance)
+    {
+        databaseSource = databaseSourceInstance;
+    }
+
+    /**
+     * Get the fully-initialized DatabaseSource instance, ready to be used.
+     *
+     * @return the DatabaseSource instance.
+     */
+    public static @Nullable DatabaseSource getDatabaseSource()
+    {
+        return databaseSource;
+    }
+
     /**
      * Set the properties source instance loaded from the JAR archive.
      *
@@ -234,7 +244,7 @@ public class Cache
      */
     public static String getBotVersion()
     {
-        return propertiesSource.getProperty("bot.version").toLowerCase();
+        return propertiesSource.getProperty("bot.version");
     }
 
     /**

src/main/java/wtf/beatrice/hidekobot/HidekoBot.java

@@ -6,25 +6,20 @@ import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.system.ApplicationHome;
-import org.springframework.context.ConfigurableApplicationContext;
 import wtf.beatrice.hidekobot.commands.completer.ProfileImageCommandCompleter;
-import wtf.beatrice.hidekobot.commands.message.*;
+import wtf.beatrice.hidekobot.commands.message.HelloCommand;
 import wtf.beatrice.hidekobot.commands.slash.*;
 import wtf.beatrice.hidekobot.datasources.ConfigurationSource;
+import wtf.beatrice.hidekobot.datasources.DatabaseSource;
 import wtf.beatrice.hidekobot.datasources.PropertiesSource;
 import wtf.beatrice.hidekobot.listeners.*;
 import wtf.beatrice.hidekobot.runnables.ExpiredMessageTask;
 import wtf.beatrice.hidekobot.runnables.HeartBeatTask;
 import wtf.beatrice.hidekobot.runnables.RandomOrgSeedTask;
 import wtf.beatrice.hidekobot.runnables.StatusUpdateTask;
-import wtf.beatrice.hidekobot.services.CommandService;
+import wtf.beatrice.hidekobot.util.CommandUtil;
-import wtf.beatrice.hidekobot.services.DatabaseService;
 import wtf.beatrice.hidekobot.util.FormatUtil;
 import wtf.beatrice.hidekobot.util.RandomUtil;
-import wtf.beatrice.hidekobot.util.Services;
 
 import java.io.File;
 import java.time.LocalDateTime;
@@ -35,7 +30,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-@SpringBootApplication
 public class HidekoBot
 {
     private static JDA jda;
@@ -69,18 +63,6 @@ public class HidekoBot
             return;
         }
 
-        ApplicationHome home = new ApplicationHome(HidekoBot.class);
-        System.setProperty("APP_HOME", home.getDir().getAbsolutePath());
-        ConfigurableApplicationContext context = SpringApplication.run(HidekoBot.class, args);
-
-        CommandService commandService = context.getBean(CommandService.class);
-        DatabaseService databaseService = context.getBean(DatabaseService.class);
-        Services services = new wtf.beatrice.hidekobot.util.Services(
-                commandService,
-                databaseService
-        );
-        Cache.setServices(services);
-
         try
         {
             // try to create the bot object and authenticate it with discord.
@@ -132,6 +114,7 @@ public class HidekoBot
 
         }
 
+
         boolean enableRandomSeedUpdaterTask = false;
         // initialize random.org object if API key is provided
         {
@@ -145,55 +128,53 @@ public class HidekoBot
         }
 
         // register slash commands and completers
-        SlashCommandListener slashCommandListener = context.getBean(SlashCommandListener.class);
+        SlashCommandListener slashCommandListener = new SlashCommandListener();
-        SlashCommandCompletionListener slashCommandCompletionListener = context.getBean(SlashCommandCompletionListener.class);
+        SlashCommandCompletionListener slashCommandCompletionListener = new SlashCommandCompletionListener();
-        MessageCommandListener messageCommandListener = context.getBean(MessageCommandListener.class);
+        AvatarCommand avatarCommand = new AvatarCommand();
-        ButtonInteractionListener buttonInteractionListener = context.getBean(ButtonInteractionListener.class);
+        ProfileImageCommandCompleter avatarCommandCompleter = new ProfileImageCommandCompleter(avatarCommand);
-        SelectMenuInteractionListener selectMenuInteractionListener = context.getBean(SelectMenuInteractionListener.class);
+        slashCommandListener.registerCommand(avatarCommand);
-        SlashAvatarCommand slashAvatarCommand = context.getBean(SlashAvatarCommand.class);
-        ProfileImageCommandCompleter avatarCommandCompleter = new ProfileImageCommandCompleter(slashAvatarCommand);
-        slashCommandListener.registerCommand(slashAvatarCommand);
         slashCommandCompletionListener.registerCommandCompleter(avatarCommandCompleter);
-        slashCommandListener.registerCommand(context.getBean(SlashBanCommand.class));
+        slashCommandListener.registerCommand(new BanCommand());
-        SlashBannerCommand slashBannerCommand = context.getBean(SlashBannerCommand.class);
+        BannerCommand bannerCommand = new BannerCommand();
-        ProfileImageCommandCompleter bannerCommandCompleter = new ProfileImageCommandCompleter(slashBannerCommand);
+        ProfileImageCommandCompleter bannerCommandCompleter = new ProfileImageCommandCompleter(bannerCommand);
-        slashCommandListener.registerCommand(slashBannerCommand);
+        slashCommandListener.registerCommand(bannerCommand);
         slashCommandCompletionListener.registerCommandCompleter(bannerCommandCompleter);
-        slashCommandListener.registerCommand(context.getBean(SlashBotInfoCommand.class));
+        slashCommandListener.registerCommand(new BotInfoCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashClearCommand.class));
+        slashCommandListener.registerCommand(new ClearCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashCoinFlipCommand.class));
+        slashCommandListener.registerCommand(new CoinFlipCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashDiceRollCommand.class));
+        slashCommandListener.registerCommand(new DiceRollCommand());
-        slashCommandListener.registerCommand(new SlashDieCommand());
+        slashCommandListener.registerCommand(new DieCommand());
-        slashCommandListener.registerCommand(new SlashHelpCommand());
+        slashCommandListener.registerCommand(new HelpCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashInviteCommand.class));
+        slashCommandListener.registerCommand(new InviteCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashKickCommand.class));
+        slashCommandListener.registerCommand(new KickCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashLoveCalculatorCommand.class));
+        slashCommandListener.registerCommand(new LoveCalculatorCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashMagicBallCommand.class));
+        slashCommandListener.registerCommand(new MagicBallCommand());
-        slashCommandListener.registerCommand(new SlashPingCommand());
+        slashCommandListener.registerCommand(new PingCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashSayCommand.class));
+        slashCommandListener.registerCommand(new SayCommand());
-        slashCommandListener.registerCommand(context.getBean(SlashTimeoutCommand.class));
+        slashCommandListener.registerCommand(new TimeoutCommand());
-        slashCommandListener.registerCommand(new SlashTriviaCommand());
+        slashCommandListener.registerCommand(new TriviaCommand());
-        slashCommandListener.registerCommand(new SlashUrbanDictionaryCommand());
+        slashCommandListener.registerCommand(new UrbanDictionaryCommand());
 
         // register message commands
-        messageCommandListener.registerCommand(new MessageHelloCommand());
+        MessageCommandListener messageCommandListener = new MessageCommandListener();
-        messageCommandListener.registerCommand(context.getBean(MessageAliasCommand.class));
+        messageCommandListener.registerCommand(new HelloCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageAvatarCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.AliasCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageBanCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.AvatarCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageBannerCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.BanCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageBotInfoCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.BannerCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageCoinFlipCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.BotInfoCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageClearCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.CoinFlipCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageDiceRollCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.ClearCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageHelpCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.DiceRollCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageInviteCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.HelpCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageKickCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.InviteCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageLoveCalculatorCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.KickCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageMagicBallCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.LoveCalculatorCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageSayCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.MagicBallCommand());
-        messageCommandListener.registerCommand(context.getBean(MessageTimeoutCommand.class));
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.SayCommand());
-        messageCommandListener.registerCommand(new MessageTriviaCommand());
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.TimeoutCommand());
-        messageCommandListener.registerCommand(new MessageUrbanDictionaryCommand());
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.TriviaCommand());
+        messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.UrbanDictionaryCommand());
 
         // register listeners
         Cache.setSlashCommandListener(slashCommandListener);
@@ -202,28 +183,43 @@ public class HidekoBot
         jda.addEventListener(messageCommandListener);
         jda.addEventListener(slashCommandListener);
         jda.addEventListener(slashCommandCompletionListener);
-        jda.addEventListener(buttonInteractionListener);
+        jda.addEventListener(new ButtonInteractionListener());
-        jda.addEventListener(selectMenuInteractionListener);
+        jda.addEventListener(new SelectMenuInteractionListener());
 
         // update slash commands (delayed)
         final boolean finalForceUpdateCommands = forceUpdateCommands;
         try (ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor())
         {
-            executor.schedule(() -> commandService.updateSlashCommands(finalForceUpdateCommands),
+            executor.schedule(() -> CommandUtil.updateSlashCommands(finalForceUpdateCommands),
                     1, TimeUnit.SECONDS);
         }
 
         // set the bot's status
         jda.getPresence().setStatus(OnlineStatus.ONLINE);
 
+        // connect to database
+        LOGGER.info("Connecting to database...");
+        String dbFilePath = Cache.getExecPath() + File.separator + "db.sqlite"; // in current directory
+        DatabaseSource databaseSource = new DatabaseSource(dbFilePath);
+        if (databaseSource.connect() && databaseSource.initDb())
+        {
+            LOGGER.info("Database connection initialized!");
+            Cache.setDatabaseSourceInstance(databaseSource);
+
+            // load data here...
+
+            LOGGER.info("Database data loaded into memory!");
+        } else
+        {
+            LOGGER.error("Error initializing database connection!");
+        }
+
         // start scheduled runnables
         ScheduledExecutorService scheduler = Cache.getTaskScheduler();
-        ExpiredMessageTask expiredMessageTask = new ExpiredMessageTask(services.databaseService(), services.commandService());
+        ExpiredMessageTask expiredMessageTask = new ExpiredMessageTask();
         scheduler.scheduleAtFixedRate(expiredMessageTask, 5L, 5L, TimeUnit.SECONDS); //every 5 seconds
-
         HeartBeatTask heartBeatTask = new HeartBeatTask();
         scheduler.scheduleAtFixedRate(heartBeatTask, 10L, 30L, TimeUnit.SECONDS); //every 30 seconds
-
         StatusUpdateTask statusUpdateTask = new StatusUpdateTask();
         scheduler.scheduleAtFixedRate(statusUpdateTask, 0L, 60L * 5L, TimeUnit.SECONDS); // every 5 minutes
         if (enableRandomSeedUpdaterTask)

src/main/java/wtf/beatrice/hidekobot/commands/base/Alias.java

@@ -1,15 +1,17 @@
 package wtf.beatrice.hidekobot.commands.base;
 
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
 
 import java.util.LinkedList;
 
-@Component
 public class Alias
 {
+    private Alias()
+    {
+        throw new IllegalStateException("Utility class");
+    }
 
-    public String generateNiceAliases(MessageCommand command)
+    public static String generateNiceAliases(MessageCommand command)
     {
         LinkedList<String> aliases = command.getCommandLabels();
         StringBuilder aliasesStringBuilder = new StringBuilder();

src/main/java/wtf/beatrice/hidekobot/commands/base/BotInfo.java

@@ -2,7 +2,6 @@ package wtf.beatrice.hidekobot.commands.base;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
 import wtf.beatrice.hidekobot.util.FormatUtil;
@@ -12,11 +11,14 @@ import java.lang.management.ManagementFactory;
 import java.text.DecimalFormat;
 import java.util.List;
 
-@Component
 public class BotInfo
 {
+    private BotInfo()
+    {
+        throw new IllegalStateException("Utility class");
+    }
 
-    public MessageEmbed generateEmbed(List<String> commandLabels)
+    public static MessageEmbed generateEmbed(List<String> commandLabels)
     {
         EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setColor(Cache.getBotColor());

src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java

@@ -8,30 +8,33 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Component
 public class ClearChat
 {
-    public String getLabel()
+    private ClearChat()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static String getLabel()
     {
         return "clear";
     }
 
-    public String getDescription()
+    public static String getDescription()
     {
         return "Clear the current channel's chat.";
     }
 
-    public Permission getPermission()
+    public static Permission getPermission()
     {
         return Permission.MESSAGE_MANAGE;
     }
 
-    public String checkDMs(Channel channel)
+    public static String checkDMs(Channel channel)
     {
         if (!(channel instanceof TextChannel))
         {
@@ -41,7 +44,7 @@ public class ClearChat
         return null;
     }
 
-    public String checkDeleteAmount(int toDeleteAmount)
+    public static String checkDeleteAmount(int toDeleteAmount)
     {
         if (toDeleteAmount <= 0)
         {
@@ -51,7 +54,7 @@ public class ClearChat
         return null;
     }
 
-    public int delete(int toDeleteAmount,
+    public static int delete(int toDeleteAmount,
                              long startingMessageId,
                              MessageChannel channel)
     {
@@ -155,13 +158,13 @@ public class ClearChat
         return deleted;
     }
 
-    public Button getDismissButton()
+    public static Button getDismissButton()
     {
         return Button.primary("generic_dismiss", "Dismiss")
                 .withEmoji(Emoji.fromUnicode("❌"));
     }
 
-    public String parseAmount(int deleted)
+    public static String parseAmount(int deleted)
     {
 
         if (deleted < 1)
@@ -177,7 +180,7 @@ public class ClearChat
     }
 
     // cap the amount to avoid abuse.
-    public int getMaxAmount()
+    public static int getMaxAmount()
     {
         return 1000;
     }

src/main/java/wtf/beatrice/hidekobot/commands/base/CoinFlip.java

@@ -6,23 +6,26 @@ import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.util.RandomUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 
-@Component
 public class CoinFlip
 {
-    public Button getReflipButton()
+
+    private CoinFlip()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static Button getReflipButton()
     {
         return Button.primary("coinflip_reflip", "Flip again")
                 .withEmoji(Emoji.fromUnicode("\uD83E\uDE99"));
     }
 
-    public String genRandom()
+    public static String genRandom()
     {
         int rand = RandomUtil.getRandomNumber(0, 1);
         String msg;
@@ -38,53 +41,34 @@ public class CoinFlip
         return msg;
     }
 
-    public void buttonReFlip(ButtonInteractionEvent event)
+    public static void buttonReFlip(ButtonInteractionEvent event)
     {
-        // Ack ASAP to avoid 3s timeout
+        // check if the user interacting is the same one who ran the command
-        event.deferEdit().queue(hook -> {
+        if (!(Cache.getDatabaseSource().isUserTrackedFor(event.getUser().getId(), event.getMessageId())))
-            // Permission check **after** ack
-            if (!Cache.getServices().databaseService().isUserTrackedFor(event.getUser().getId(), event.getMessageId()))
         {
-                hook.sendMessage("❌ You did not run this command!").setEphemeral(true).queue();
+            event.reply("❌ You did not run this command!").setEphemeral(true).queue();
             return;
         }
 
-            // Disable all components on the original message
+        // set old message's button as disabled
-            List<ActionRow> oldRows = event.getMessage().getActionRows();
+        List<ActionRow> actionRows = event.getMessage().getActionRows();
-            List<ActionRow> disabledRows = new ArrayList<>(oldRows.size());
+        actionRows.set(0, actionRows.get(0).asDisabled());
-            for (ActionRow row : oldRows)
+        event.editComponents(actionRows).queue();
-            {
-                disabledRows.add(row.asDisabled());
-            }
-            hook.editOriginalComponents(disabledRows).queue();
 
-            // Send a follow-up with a fresh button
+        // perform coin flip
-            hook.sendMessage(genRandom())
+        event.getHook().sendMessage(genRandom())
                 .addActionRow(getReflipButton())
-                    .queue(msg -> trackAndRestrict(msg, event.getUser()), err -> {
+                .queue((message) ->
-                    });
-        }, failure -> {
-            // Rare: if we couldn't ack, try best-effort fallbacks
-            try
                 {
-                List<ActionRow> oldRows = event.getMessage().getActionRows();
+                    // set the command as expiring and restrict it to the user who ran it
-                List<ActionRow> disabledRows = new ArrayList<>(oldRows.size());
+                    trackAndRestrict(message, event.getUser());
-                for (ActionRow row : oldRows) disabledRows.add(row.asDisabled());
+                }, (error) -> {
-                event.getMessage().editMessageComponents(disabledRows).queue();
-            } catch (Exception ignored)
-            {
-            }
-
-            event.getChannel().sendMessage(genRandom())
-                    .addActionRow(getReflipButton())
-                    .queue(msg -> trackAndRestrict(msg, event.getUser()), err -> {
-                    });
                 });
     }
 
-    public void trackAndRestrict(Message replyMessage, User user)
+    public static void trackAndRestrict(Message replyMessage, User user)
     {
-        Cache.getServices().databaseService().queueDisabling(replyMessage);
+        Cache.getDatabaseSource().queueDisabling(replyMessage);
-        Cache.getServices().databaseService().trackRanCommandReply(replyMessage, user);
+        Cache.getDatabaseSource().trackRanCommandReply(replyMessage, user);
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/base/DiceRoll.java

@@ -2,7 +2,6 @@ package wtf.beatrice.hidekobot.commands.base;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.User;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
 import wtf.beatrice.hidekobot.objects.fun.Dice;
@@ -13,11 +12,15 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.UUID;
 
-@Component
 public class DiceRoll
 {
 
-    public MessageResponse buildResponse(User author, String[] args)
+    private DiceRoll()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static MessageResponse buildResponse(User author, String[] args)
     {
         LinkedHashMap<Dice, Integer> dicesToRoll = new LinkedHashMap<>();
         String diceRegex = "d\\d+";
@@ -126,7 +129,7 @@ public class DiceRoll
         EmbedBuilder embedBuilder = new EmbedBuilder();
 
         embedBuilder.setColor(Cache.getBotColor());
-        embedBuilder.setAuthor(author.getName(), null, author.getAvatarUrl());
+        embedBuilder.setAuthor(author.getAsTag(), null, author.getAvatarUrl());
         embedBuilder.setTitle("Dice Roll");
 
         if (RandomUtil.isRandomOrgKeyValid())

src/main/java/wtf/beatrice/hidekobot/commands/base/Invite.java

@@ -4,15 +4,18 @@ import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
 
-@Component
 public class Invite
 {
 
-    public MessageEmbed generateEmbed()
+    private Invite()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static MessageEmbed generateEmbed()
     {
         EmbedBuilder embedBuilder = new EmbedBuilder();
 
@@ -30,7 +33,7 @@ public class Invite
         return embedBuilder.build();
     }
 
-    public Button getInviteButton()
+    public static Button getInviteButton()
     {
         String inviteUrl = Cache.getInviteUrl();
         return Button.link(inviteUrl, "Invite " + Cache.getBotName())

src/main/java/wtf/beatrice/hidekobot/commands/base/LoveCalculator.java

@@ -3,17 +3,20 @@ package wtf.beatrice.hidekobot.commands.base;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.User;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.util.RandomUtil;
 
 import java.util.concurrent.TimeUnit;
 
-@Component
 public class LoveCalculator
 {
 
-    public MessageEmbed buildEmbedAndCacheResult(User author, User user1, User user2)
+    private LoveCalculator()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static MessageEmbed buildEmbedAndCacheResult(User author, User user1, User user2)
     {
         String userId1 = user1.getId();
         String userId2 = user2.getId();
@@ -35,7 +38,7 @@ public class LoveCalculator
 
         EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setColor(Cache.getBotColor());
-        embedBuilder.setAuthor(author.getName(), null, author.getAvatarUrl());
+        embedBuilder.setAuthor(author.getAsTag(), null, author.getAvatarUrl());
         embedBuilder.setTitle("Love Calculator");
 
         embedBuilder.addField("\uD83D\uDC65 People",

src/main/java/wtf/beatrice/hidekobot/commands/base/MagicBall.java

@@ -3,7 +3,6 @@ package wtf.beatrice.hidekobot.commands.base;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.User;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.util.RandomUtil;
 
@@ -12,16 +11,20 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
 public class MagicBall
 {
 
-    public LinkedList<String> getLabels()
+    private MagicBall()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static LinkedList<String> getLabels()
     {
         return new LinkedList<>(Arrays.asList("8ball", "8b", "eightball", "magicball"));
     }
 
-    private final List<String> answers = new ArrayList<>(
+    private static final List<String> answers = new ArrayList<>(
             Arrays.asList("It is certain.",
                     "It is decidedly so.",
                     "Without a doubt.",
@@ -43,13 +46,13 @@ public class MagicBall
                     "Outlook not so good.",
                     "Very doubtful."));
 
-    public String getRandomAnswer()
+    public static String getRandomAnswer()
     {
         int answerPos = RandomUtil.getRandomNumber(0, answers.size() - 1);
         return answers.get(answerPos);
     }
 
-    public MessageEmbed generateEmbed(String question, User author)
+    public static MessageEmbed generateEmbed(String question, User author)
     {
         // add a question mark at the end, if missing.
         // this might not always apply but it's fun
@@ -58,7 +61,7 @@ public class MagicBall
         String answer = getRandomAnswer();
 
         EmbedBuilder embedBuilder = new EmbedBuilder();
-        embedBuilder.setAuthor(author.getName(), null, author.getAvatarUrl());
+        embedBuilder.setAuthor(author.getAsTag(), null, author.getAvatarUrl());
         embedBuilder.setTitle("Magic Ball");
         embedBuilder.setColor(Cache.getBotColor());
         embedBuilder.addField("❓ Question", question, false);

src/main/java/wtf/beatrice/hidekobot/commands/base/ProfileImage.java

@@ -3,15 +3,18 @@ package wtf.beatrice.hidekobot.commands.base;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.utils.ImageProxy;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
 
-@Component
 public class ProfileImage
 {
 
-    public int parseResolution(int resolution)
+    private ProfileImage()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static int parseResolution(int resolution)
     {
         int[] acceptedSizes = Cache.getSupportedAvatarResolutions();
 
@@ -31,7 +34,7 @@ public class ProfileImage
         return acceptedSizes[idx];
     }
 
-    public MessageResponse buildResponse(int resolution, User user, ImageType imageType)
+    public static MessageResponse buildResponse(int resolution, User user, ImageType imageType)
     {
         String imageTypeName = imageType.name().toLowerCase();
         String resolutionString;

src/main/java/wtf/beatrice/hidekobot/commands/base/Say.java

@@ -1,12 +1,16 @@
 package wtf.beatrice.hidekobot.commands.base;
 
 import net.dv8tion.jda.api.Permission;
-import org.springframework.stereotype.Component;
 
-@Component
 public class Say
 {
-    public Permission getPermission()
+
+    private Say()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static Permission getPermission()
     {
         return Permission.MESSAGE_MANAGE;
     }

src/main/java/wtf/beatrice/hidekobot/commands/base/Trivia.java

@@ -19,6 +19,7 @@ import wtf.beatrice.hidekobot.objects.fun.TriviaCategory;
 import wtf.beatrice.hidekobot.objects.fun.TriviaQuestion;
 import wtf.beatrice.hidekobot.objects.fun.TriviaScore;
 import wtf.beatrice.hidekobot.runnables.TriviaTask;
+import wtf.beatrice.hidekobot.util.CommandUtil;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -26,10 +27,9 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -45,13 +45,13 @@ public class Trivia
     private static final String TRIVIA_API_LINK = "https://opentdb.com/api.php?amount=10&type=multiple&category=";
     private static final String TRIVIA_API_CATEGORIES_LINK = "https://opentdb.com/api_category.php";
 
-    public static List<String> channelsRunningTrivia = Collections.synchronizedList(new ArrayList<>());
+    public static List<String> channelsRunningTrivia = new ArrayList<>();
 
     // first string is the channelId, the list contain all users who responded there
-    public static ConcurrentHashMap<String, List<String>> channelAndWhoResponded = new ConcurrentHashMap<>();
+    public static HashMap<String, List<String>> channelAndWhoResponded = new HashMap<>();
 
     // first string is the channelId, the list contain all score records for that channel
-    public static ConcurrentHashMap<String, LinkedList<TriviaScore>> channelAndScores = new ConcurrentHashMap<>();
+    public static HashMap<String, LinkedList<TriviaScore>> channelAndScores = new HashMap<>();
 
     public static String getTriviaLink(int categoryId)
     {
@@ -181,8 +181,6 @@ public class Trivia
 
     public static void handleAnswer(ButtonInteractionEvent event, AnswerType answerType)
     {
-        // Ack immediately with an ephemeral deferral to avoid 3s timeout
-        event.deferReply(true).queue(hook -> {
         User user = event.getUser();
         String channelId = event.getChannel().getId();
 
@@ -190,7 +188,6 @@ public class Trivia
         {
             LinkedList<TriviaScore> scores = channelAndScores.get(channelId);
             if (scores == null) scores = new LinkedList<>();
-
             TriviaScore currentUserScore = null;
             for (TriviaScore score : scores)
             {
@@ -209,12 +206,13 @@ public class Trivia
 
             if (answerType.equals(AnswerType.CORRECT))
             {
-                    // Public message in channel
+
-                    event.getChannel().sendMessage(user.getAsMention() + " got it right! \uD83E\uDD73 (**+3**)").queue();
+                event.reply(user.getAsMention() + " got it right! \uD83E\uDD73 (**+3**)").queue();
                 currentUserScore.changeScore(3);
+
             } else
             {
-                    event.getChannel().sendMessage("❌ " + user.getAsMention() + ", that's not the right answer! (**-1**)").queue();
+                event.reply("❌ " + user.getAsMention() + ", that's not the right answer! (**-1**)").queue();
                 currentUserScore.changeScore(-1);
             }
 
@@ -222,22 +220,14 @@ public class Trivia
             channelAndScores.put(channelId, scores);
         } else
         {
-                // Show the warning **in the original ephemeral message**, then delete it after 5s.
+            event.reply("☹️ " + user.getAsMention() + ", you can't answer twice!")
-                hook.editOriginal("☹️ " + user.getAsMention() + ", you can't answer twice!").queue(v ->
+                    .queue(interaction ->
-                        hook.deleteOriginal().queueAfter(3, TimeUnit.SECONDS, null, __ -> {
+                            Cache.getTaskScheduler().schedule(() ->
-                        })
+                                    interaction.deleteOriginal().queue(), 3, TimeUnit.SECONDS));
-                );
+        }
-                return; // don't run the generic cleanup below; we want the message visible for ~5s
     }
 
-            // Clean up the ephemeral deferral (no visible ephemeral message left) for the normal path
+    private static boolean trackResponse(User user, MessageChannel channel)
-            hook.deleteOriginal().queue(null, __ -> {
-            });
-        }, __ -> {
-        });
-    }
-
-    private static synchronized boolean trackResponse(User user, MessageChannel channel)
     {
         String userId = user.getId();
         String channelId = channel.getId();
@@ -262,17 +252,15 @@ public class Trivia
 
     public static void handleMenuSelection(StringSelectInteractionEvent event)
     {
-        // Ack immediately (ephemeral) so we can safely do DB/work
-        event.deferReply(true).queue(hook -> {
         // check if the user interacting is the same one who ran the command
-            if (!(Cache.getServices().databaseService().isUserTrackedFor(event.getUser().getId(), event.getMessageId())))
+        if (!(Cache.getDatabaseSource().isUserTrackedFor(event.getUser().getId(), event.getMessageId())))
         {
-                hook.sendMessage("❌ You did not run this command!").setEphemeral(true).queue();
+            event.reply("❌ You did not run this command!").setEphemeral(true).queue();
             return;
         }
 
-            // Disable buttons on the original message via service (uses separate REST calls)
+        // todo: we shouldn't use this method, since it messes with the database... look at coin reflip
-            Cache.getServices().commandService().disableExpired(event.getMessageId());
+        CommandUtil.disableExpired(event.getMessageId());
 
         SelectOption pickedOption = event.getInteraction().getSelectedOptions().get(0);
         String categoryName = pickedOption.getLabel();
@@ -282,12 +270,6 @@ public class Trivia
         TriviaCategory category = new TriviaCategory(categoryName, categoryId);
 
         startTrivia(event, category);
-
-            // remove the ephemeral deferral to keep things clean
-            hook.deleteOriginal().queue(null, __ -> {
-            });
-        }, __ -> {
-        });
     }
 
     public static void startTrivia(StringSelectInteractionEvent event, TriviaCategory category)
@@ -298,19 +280,20 @@ public class Trivia
 
         if (Trivia.channelsRunningTrivia.contains(channel.getId()))
         {
-            // Already running: inform ephemerally via hook (the interaction was deferred in the caller)
+            // todo nicer looking
-            event.getHook().sendMessage(Trivia.getTriviaAlreadyRunningError())
+            // todo: also what if the bot stops (database...?)
-                    .setEphemeral(true)
+            // todo: also what if the message is already deleted
-                    .queue(msg -> Cache.getTaskScheduler().schedule(() -> msg.delete().queue(), 10, TimeUnit.SECONDS));
+            Message err = event.reply("Trivia is already running here!").complete().retrieveOriginal().complete();
+            Cache.getTaskScheduler().schedule(() -> err.delete().queue(), 10, TimeUnit.SECONDS);
             return;
         } else
         {
-            // Public info that a new session is starting
+            // todo nicer looking
-            channel.sendMessage("Starting new Trivia session!").queue();
+            event.reply("Starting new Trivia session!").queue();
         }
 
-        TriviaTask triviaTask = new TriviaTask(author, channel, category,
+
-                Cache.getServices().databaseService(), Cache.getServices().commandService());
+        TriviaTask triviaTask = new TriviaTask(author, channel, category);
         ScheduledFuture<?> future =
                 Cache.getTaskScheduler().scheduleAtFixedRate(triviaTask,
                         0,

src/main/java/wtf/beatrice/hidekobot/commands/base/UrbanDictionary.java

@@ -14,7 +14,7 @@ import org.apache.commons.text.WordUtils;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.services.DatabaseService;
+import wtf.beatrice.hidekobot.datasources.DatabaseSource;
 import wtf.beatrice.hidekobot.util.SerializationUtil;
 
 import java.util.ArrayList;
@@ -88,7 +88,7 @@ public class UrbanDictionary
         EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setColor(Cache.getBotColor());
         embedBuilder.setTitle(term + ", on Urban Dictionary", url);
-        embedBuilder.setAuthor(author.getName(), null, author.getAvatarUrl());
+        embedBuilder.setAuthor(author.getAsTag(), null, author.getAvatarUrl());
         embedBuilder.addField("\uD83D\uDCD6 Definition", search.getPlaintextMeanings().get(page), false);
         embedBuilder.addField("\uD83D\uDCAD Example", search.getPlaintextExamples().get(page), false);
         embedBuilder.addField("\uD83D\uDCCC Submission",
@@ -107,9 +107,9 @@ public class UrbanDictionary
 
     public static void track(Message message, User user, UrbanSearch search, String sanitizedTerm)
     {
-        Cache.getServices().databaseService().queueDisabling(message);
+        Cache.getDatabaseSource().queueDisabling(message);
-        Cache.getServices().databaseService().trackRanCommandReply(message, user);
+        Cache.getDatabaseSource().trackRanCommandReply(message, user);
-        Cache.getServices().databaseService().trackUrban(search.getSerializedMeanings(),
+        Cache.getDatabaseSource().trackUrban(search.getSerializedMeanings(),
                 search.getSerializedExamples(),
                 search.getSerializedContributors(),
                 search.getSerializedDates(),
@@ -119,9 +119,8 @@ public class UrbanDictionary
 
     public static void changePage(ButtonInteractionEvent event, ChangeType changeType)
     {
-        event.deferEdit().queue();
         String messageId = event.getMessageId();
-        DatabaseService database = Cache.getServices().databaseService();
+        DatabaseSource database = Cache.getDatabaseSource();
 
         // check if the user interacting is the same one who ran the command
         if (!(database.isUserTrackedFor(event.getUser().getId(), messageId)))
@@ -131,7 +130,7 @@ public class UrbanDictionary
         }
 
         // get current page and calculate how many pages there are
-        int page = database.getUrbanPage(messageId);
+        int page = Cache.getDatabaseSource().getUrbanPage(messageId);
 
         String term = database.getUrbanTerm(messageId);
         String url = generateUrl(term);
@@ -181,9 +180,7 @@ public class UrbanDictionary
         ActionRow currentRow = ActionRow.of(components);
 
         // update the message
-        event.getHook().editOriginalEmbeds(updatedEmbed)
+        event.editComponents(currentRow).setEmbeds(updatedEmbed).queue();
-                .setComponents(currentRow)
-                .queue();
         database.setUrbanPage(messageId, page);
         database.resetExpiryTimestamp(messageId);
     }

src/main/java/wtf/beatrice/hidekobot/commands/base/UserPunishment.java

@@ -12,7 +12,6 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
 import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
@@ -25,14 +24,18 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-@Component
 public class UserPunishment
 {
 
+    private UserPunishment()
+    {
+        throw new IllegalStateException("Utility class");
+    }
+
     private static final Duration maxTimeoutDuration = Duration.of(28, ChronoUnit.DAYS);
     private static final Duration minTimeoutDuration = Duration.of(30, ChronoUnit.SECONDS);
 
-    public void handle(SlashCommandInteractionEvent event, PunishmentType punishmentType)
+    public static void handle(SlashCommandInteractionEvent event, PunishmentType punishmentType)
     {
         // this might take a sec
         event.deferReply().queue();
@@ -89,7 +92,7 @@ public class UserPunishment
             event.getHook().editOriginal(response.content()).queue();
     }
 
-    public void handle(MessageReceivedEvent event, String[] args, PunishmentType punishmentType)
+    public static void handle(MessageReceivedEvent event, String[] args, PunishmentType punishmentType)
     {
         Mentions msgMentions = event.getMessage().getMentions();
         List<IMentionable> mentions = msgMentions.getMentions();
@@ -106,7 +109,7 @@ public class UserPunishment
             event.getMessage().reply(response.content()).queue();
     }
 
-    public MessageResponse getResponse(User author,
+    public static MessageResponse getResponse(User author,
                                               PunishmentType punishmentType,
                                               MessageChannelUnion channel,
                                               List<IMentionable> mentions,
@@ -179,14 +182,11 @@ public class UserPunishment
                 case KICK -> punishmentAction = guild.kick(mentioned);
                 case TIMEOUT ->
                 {
-                    // Ensure a duration argument is provided at index 1 (after mention/user)
+                    if (args != null)
-                    if (args == null || args.length <= 1)
                     {
-                        return new MessageResponse("Please specify a punishment duration!", null);
-                    }
-
                         String durationStr = args[1];
                         duration = FormatUtil.parseDuration(durationStr);
+                    }
 
                     boolean isDurationValid = true;
 
@@ -197,7 +197,7 @@ public class UserPunishment
                         if (minTimeoutDuration.compareTo(duration) > 0) isDurationValid = false;
                     }
 
-                    if (!isDurationValid)
+                    if (duration == null || !isDurationValid)
                     {
                         // todo nicer looking with emojis
                         return new MessageResponse("Sorry, but the specified duration is invalid!", null);
@@ -222,7 +222,7 @@ public class UserPunishment
         }
 
         if (!reason.isEmpty() && !reasonBuilder.isEmpty())
-            punishmentAction.reason("[" + author.getName() + "] " + reason);
+            punishmentAction.reason("[" + author.getAsTag() + "] " + reason);
 
         try
         {
@@ -236,7 +236,7 @@ public class UserPunishment
 
         EmbedBuilder embedBuilder = new EmbedBuilder();
 
-        embedBuilder.setAuthor(author.getName(), null, author.getAvatarUrl());
+        embedBuilder.setAuthor(author.getAsTag(), null, author.getAvatarUrl());
         embedBuilder.setColor(Cache.getBotColor());
         embedBuilder.setTitle("User " + punishmentType.getPastTense());
 

src/main/java/wtf/beatrice/hidekobot/commands/message/AliasCommand.java

@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.commands.base.Alias;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
@@ -15,17 +13,9 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class AliasCommand implements MessageCommand
-public class MessageAliasCommand implements MessageCommand
 {
 
-    private final Alias alias;
-
-    public MessageAliasCommand(@Autowired Alias alias)
-    {
-        this.alias = alias;
-    }
-
     @Override
     public LinkedList<String> getCommandLabels()
     {
@@ -83,7 +73,7 @@ public class MessageAliasCommand implements MessageCommand
             return;
         }
 
-        String aliases = alias.generateNiceAliases(command);
+        String aliases = Alias.generateNiceAliases(command);
         aliases = "Aliases for **" + command.getCommandLabels().get(0) + "**: " + aliases;
 
         event.getMessage()

src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java

@@ -6,8 +6,6 @@ import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.HidekoBot;
 import wtf.beatrice.hidekobot.commands.base.ProfileImage;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
@@ -18,15 +16,8 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class AvatarCommand implements MessageCommand
-public class MessageAvatarCommand implements MessageCommand
 {
-    private final ProfileImage profileImage;
-
-    public MessageAvatarCommand(@Autowired ProfileImage profileImage)
-    {
-        this.profileImage = profileImage;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -83,7 +74,7 @@ public class MessageAvatarCommand implements MessageCommand
             try
             {
                 int givenRes = Integer.parseInt(arg);
-                resolution = profileImage.parseResolution(givenRes);
+                resolution = ProfileImage.parseResolution(givenRes);
                 resFound = true;
                 break;
             } catch (NumberFormatException ignored)
@@ -93,7 +84,7 @@ public class MessageAvatarCommand implements MessageCommand
         }
 
         // fallback in case we didn't find any specified resolution
-        if (!resFound) resolution = profileImage.parseResolution(512);
+        if (!resFound) resolution = ProfileImage.parseResolution(512);
 
         // check if someone is mentioned
         Mentions mentions = event.getMessage().getMentions();
@@ -110,7 +101,7 @@ public class MessageAvatarCommand implements MessageCommand
         if (user == null) user = event.getAuthor();
 
         // send a response
-        MessageResponse response = profileImage.buildResponse(resolution, user, ProfileImage.ImageType.AVATAR);
+        MessageResponse response = ProfileImage.buildResponse(resolution, user, ProfileImage.ImageType.AVATAR);
         if (response.content() != null)
         {
             event.getMessage().reply(response.content()).queue();

src/main/java/wtf/beatrice/hidekobot/commands/message/BanCommand.java

@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.UserPunishment;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -15,15 +13,8 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class BanCommand implements MessageCommand
-public class MessageBanCommand implements MessageCommand
 {
-    private final UserPunishment userPunishment;
-
-    public MessageBanCommand(@Autowired UserPunishment userPunishment)
-    {
-        this.userPunishment = userPunishment;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -68,6 +59,6 @@ public class MessageBanCommand implements MessageCommand
     @Override
     public void runCommand(MessageReceivedEvent event, String label, String[] args)
     {
-        userPunishment.handle(event, args, UserPunishment.PunishmentType.BAN);
+        UserPunishment.handle(event, args, UserPunishment.PunishmentType.BAN);
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/message/BannerCommand.java

@@ -6,8 +6,6 @@ import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.HidekoBot;
 import wtf.beatrice.hidekobot.commands.base.ProfileImage;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
@@ -18,15 +16,8 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class BannerCommand implements MessageCommand
-public class MessageBannerCommand implements MessageCommand
 {
-    private final ProfileImage profileImage;
-
-    public MessageBannerCommand(@Autowired ProfileImage profileImage)
-    {
-        this.profileImage = profileImage;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -83,7 +74,7 @@ public class MessageBannerCommand implements MessageCommand
             try
             {
                 int givenRes = Integer.parseInt(arg);
-                resolution = profileImage.parseResolution(givenRes);
+                resolution = ProfileImage.parseResolution(givenRes);
                 resFound = true;
                 break;
             } catch (NumberFormatException ignored)
@@ -93,7 +84,7 @@ public class MessageBannerCommand implements MessageCommand
         }
 
         // fallback in case we didn't find any specified resolution
-        if (!resFound) resolution = profileImage.parseResolution(512);
+        if (!resFound) resolution = ProfileImage.parseResolution(512);
 
         // check if someone is mentioned
         Mentions mentions = event.getMessage().getMentions();
@@ -110,7 +101,7 @@ public class MessageBannerCommand implements MessageCommand
         if (user == null) user = event.getAuthor();
 
         // send a response
-        MessageResponse response = profileImage.buildResponse(resolution, user, ProfileImage.ImageType.BANNER);
+        MessageResponse response = ProfileImage.buildResponse(resolution, user, ProfileImage.ImageType.BANNER);
         if (response.content() != null)
         {
             event.getMessage().reply(response.content()).queue();

src/main/java/wtf/beatrice/hidekobot/commands/message/BotInfoCommand.java

@@ -5,8 +5,6 @@ import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.commands.base.BotInfo;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
@@ -16,17 +14,9 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class BotInfoCommand implements MessageCommand
-public class MessageBotInfoCommand implements MessageCommand
 {
 
-    private final BotInfo botInfo;
-
-    public MessageBotInfoCommand(@Autowired BotInfo botInfo)
-    {
-        this.botInfo = botInfo;
-    }
-
     @Override
     public LinkedList<String> getCommandLabels()
     {
@@ -80,7 +70,7 @@ public class MessageBotInfoCommand implements MessageCommand
         }
 
         // send the list
-        MessageEmbed embed = botInfo.generateEmbed(commandNames);
+        MessageEmbed embed = BotInfo.generateEmbed(commandNames);
         event.getMessage().replyEmbeds(embed).queue();
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/message/ClearCommand.java

@@ -6,8 +6,6 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.commands.base.ClearChat;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
@@ -17,27 +15,19 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class ClearCommand implements MessageCommand
-public class MessageClearCommand implements MessageCommand
 {
 
-    private final ClearChat clearChat;
-
-    public MessageClearCommand(@Autowired ClearChat clearChat)
-    {
-        this.clearChat = clearChat;
-    }
-
     @Override
     public LinkedList<String> getCommandLabels()
     {
-        return new LinkedList<>(Collections.singletonList(clearChat.getLabel()));
+        return new LinkedList<>(Collections.singletonList(ClearChat.getLabel()));
     }
 
     @Override
     public List<Permission> getPermissions()
     {
-        return Collections.singletonList(clearChat.getPermission());
+        return Collections.singletonList(ClearChat.getPermission());
     }
 
     @Override
@@ -71,7 +61,7 @@ public class MessageClearCommand implements MessageCommand
     public void runCommand(MessageReceivedEvent event, String label, String[] args)
     {
         // check if user is trying to run command in dms.
-        String error = clearChat.checkDMs(event.getChannel());
+        String error = ClearChat.checkDMs(event.getChannel());
         if (error != null)
         {
             event.getMessage().reply(error).queue();
@@ -93,9 +83,9 @@ public class MessageClearCommand implements MessageCommand
         }
 
         // cap the amount to avoid abuse.
-        if (toDeleteAmount > clearChat.getMaxAmount()) toDeleteAmount = 0;
+        if (toDeleteAmount > ClearChat.getMaxAmount()) toDeleteAmount = 0;
 
-        error = clearChat.checkDeleteAmount(toDeleteAmount);
+        error = ClearChat.checkDeleteAmount(toDeleteAmount);
         if (error != null)
         {
             event.getMessage().reply(error).queue();
@@ -106,20 +96,20 @@ public class MessageClearCommand implements MessageCommand
         String content = "\uD83D\uDEA7 Clearing...";
         Message botMessage = event.getMessage().reply(content).complete();
 
-        int deleted = clearChat.delete(toDeleteAmount,
+        int deleted = ClearChat.delete(toDeleteAmount,
                 event.getMessageIdLong(),
                 event.getChannel());
 
         // get a nicely formatted message that logs the deletion of messages.
-        content = clearChat.parseAmount(deleted);
+        content = ClearChat.parseAmount(deleted);
 
         // edit the message text and attach a button.
-        Button dismiss = clearChat.getDismissButton();
+        Button dismiss = ClearChat.getDismissButton();
         Message finalMessage = event.getChannel().sendMessage(content).setActionRow(dismiss).complete();
 
         // add the message to database.
-        Cache.getServices().databaseService().queueDisabling(finalMessage);
+        Cache.getDatabaseSource().queueDisabling(finalMessage);
-        Cache.getServices().databaseService().trackRanCommandReply(finalMessage, event.getAuthor());
+        Cache.getDatabaseSource().trackRanCommandReply(finalMessage, event.getAuthor());
 
         // delete the sender's message.
         event.getMessage().delete().queue();

src/main/java/wtf/beatrice/hidekobot/commands/message/CoinFlipCommand.java

@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.CoinFlip;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -14,17 +12,9 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class CoinFlipCommand implements MessageCommand
-public class MessageCoinFlipCommand implements MessageCommand
 {
 
-    private final CoinFlip coinFlip;
-
-    public MessageCoinFlipCommand(@Autowired CoinFlip coinFlip)
-    {
-        this.coinFlip = coinFlip;
-    }
-
     @Override
     public LinkedList<String> getCommandLabels()
     {
@@ -70,12 +60,12 @@ public class MessageCoinFlipCommand implements MessageCommand
     {
 
         // perform coin flip
-        event.getMessage().reply(coinFlip.genRandom())
+        event.getMessage().reply(CoinFlip.genRandom())
-                .addActionRow(coinFlip.getReflipButton())
+                .addActionRow(CoinFlip.getReflipButton())
                 .queue((message) ->
                 {
                     // set the command as expiring and restrict it to the user who ran it
-                    coinFlip.trackAndRestrict(message, event.getAuthor());
+                    CoinFlip.trackAndRestrict(message, event.getAuthor());
                 }, (error) -> {
                 });
     }

src/main/java/wtf/beatrice/hidekobot/commands/message/DiceRollCommand.java

@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.DiceRoll;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
@@ -15,16 +13,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class DiceRollCommand implements MessageCommand
-public class MessageDiceRollCommand implements MessageCommand
 {
-    private final DiceRoll diceRoll;
-
-    public MessageDiceRollCommand(@Autowired DiceRoll diceRoll)
-    {
-        this.diceRoll = diceRoll;
-    }
-
     @Override
     public LinkedList<String> getCommandLabels()
     {
@@ -76,7 +66,7 @@ public class MessageDiceRollCommand implements MessageCommand
     public void runCommand(MessageReceivedEvent event, String label, String[] args)
     {
 
-        MessageResponse response = diceRoll.buildResponse(event.getAuthor(), args);
+        MessageResponse response = DiceRoll.buildResponse(event.getAuthor(), args);
 
         if (response.content() != null)
         {

src/main/java/wtf/beatrice/hidekobot/commands/message/HelloCommand.java

@@ -4,7 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
 
@@ -12,8 +11,7 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class HelloCommand implements MessageCommand
-public class MessageHelloCommand implements MessageCommand
 {
 
     @Override

src/main/java/wtf/beatrice/hidekobot/commands/message/HelpCommand.java

@@ -6,8 +6,6 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.apache.commons.text.WordUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.commands.base.Alias;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
@@ -15,16 +13,9 @@ import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
 
 import java.util.*;
 
-@Component
+public class HelpCommand implements MessageCommand
-public class MessageHelpCommand implements MessageCommand
 {
 
-    private final Alias alias;
-
-    public MessageHelpCommand(@Autowired Alias alias)
-    {
-        this.alias = alias;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -136,7 +127,7 @@ public class MessageHelpCommand implements MessageCommand
             if (internalUsage != null) usage += " " + internalUsage;
             usage += "`";
 
-            String aliases = alias.generateNiceAliases(command);
+            String aliases = Alias.generateNiceAliases(command);
 
             List<Permission> permissions = command.getPermissions();
             StringBuilder permissionsStringBuilder = new StringBuilder();

src/main/java/wtf/beatrice/hidekobot/commands/message/InviteCommand.java

@@ -7,8 +7,6 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.Invite;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -17,15 +15,8 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class InviteCommand implements MessageCommand
-public class MessageInviteCommand implements MessageCommand
 {
-    private final Invite invite;
-
-    public MessageInviteCommand(@Autowired Invite invite)
-    {
-        this.invite = invite;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -72,8 +63,8 @@ public class MessageInviteCommand implements MessageCommand
     {
 
 
-        MessageEmbed inviteEmbed = invite.generateEmbed();
+        MessageEmbed inviteEmbed = Invite.generateEmbed();
-        Button inviteButton = invite.getInviteButton();
+        Button inviteButton = Invite.getInviteButton();
 
         // if this is a guild, don't spam the invite in public but DM it
         if (event.getChannelType().isGuild())

src/main/java/wtf/beatrice/hidekobot/commands/message/KickCommand.java

@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.UserPunishment;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -15,15 +13,8 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class KickCommand implements MessageCommand
-public class MessageKickCommand implements MessageCommand
 {
-    private final UserPunishment userPunishment;
-
-    public MessageKickCommand(@Autowired UserPunishment userPunishment)
-    {
-        this.userPunishment = userPunishment;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -68,6 +59,6 @@ public class MessageKickCommand implements MessageCommand
     @Override
     public void runCommand(MessageReceivedEvent event, String label, String[] args)
     {
-        userPunishment.handle(event, args, UserPunishment.PunishmentType.KICK);
+        UserPunishment.handle(event, args, UserPunishment.PunishmentType.KICK);
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java

@@ -8,8 +8,6 @@ import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.HidekoBot;
 import wtf.beatrice.hidekobot.commands.base.LoveCalculator;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
@@ -19,15 +17,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class LoveCalculatorCommand implements MessageCommand
-public class MessageLoveCalculatorCommand implements MessageCommand
 {
-    private final LoveCalculator loveCalculator;
-
-    public MessageLoveCalculatorCommand(@Autowired LoveCalculator loveCalculator)
-    {
-        this.loveCalculator = loveCalculator;
-    }
 
 
     @Override
@@ -100,7 +91,7 @@ public class MessageLoveCalculatorCommand implements MessageCommand
             user2 = HidekoBot.getAPI().retrieveUserById(mentionedUserId).complete();
         }
 
-        MessageEmbed embed = loveCalculator.buildEmbedAndCacheResult(event.getAuthor(), user1, user2);
+        MessageEmbed embed = LoveCalculator.buildEmbedAndCacheResult(event.getAuthor(), user1, user2);
         event.getChannel().sendMessageEmbeds(embed).queue();
 
     }

src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java

@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.MagicBall;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -13,20 +11,13 @@ import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class MagicBallCommand implements MessageCommand
-public class MessageMagicBallCommand implements MessageCommand
 {
-    private final MagicBall magicBall;
-
-    public MessageMagicBallCommand(@Autowired MagicBall magicBall)
-    {
-        this.magicBall = magicBall;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
     {
-        return magicBall.getLabels();
+        return MagicBall.getLabels();
     }
 
     @Nullable
@@ -84,6 +75,6 @@ public class MessageMagicBallCommand implements MessageCommand
         String question = questionBuilder.toString();
 
 
-        event.getChannel().sendMessageEmbeds(magicBall.generateEmbed(question, event.getAuthor())).queue();
+        event.getChannel().sendMessageEmbeds(MagicBall.generateEmbed(question, event.getAuthor())).queue();
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java

@@ -5,8 +5,6 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.Say;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -15,16 +13,9 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class SayCommand implements MessageCommand
-public class MessageSayCommand implements MessageCommand
 {
 
-    private final Say say;
-
-    public MessageSayCommand(@Autowired Say say)
-    {
-        this.say = say;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -36,7 +27,7 @@ public class MessageSayCommand implements MessageCommand
     @Override
     public List<Permission> getPermissions()
     {
-        return Collections.singletonList(say.getPermission());
+        return Collections.singletonList(Say.getPermission());
     }
 
     @Override

src/main/java/wtf/beatrice/hidekobot/commands/message/TimeoutCommand.java

@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.UserPunishment;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -15,15 +13,8 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class TimeoutCommand implements MessageCommand
-public class MessageTimeoutCommand implements MessageCommand
 {
-    private final UserPunishment userPunishment;
-
-    public MessageTimeoutCommand(@Autowired UserPunishment userPunishment)
-    {
-        this.userPunishment = userPunishment;
-    }
 
     @Override
     public LinkedList<String> getCommandLabels()
@@ -68,6 +59,6 @@ public class MessageTimeoutCommand implements MessageCommand
     @Override
     public void runCommand(MessageReceivedEvent event, String label, String[] args)
     {
-        userPunishment.handle(event, args, UserPunishment.PunishmentType.TIMEOUT);
+        UserPunishment.handle(event, args, UserPunishment.PunishmentType.TIMEOUT);
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/message/TriviaCommand.java

@@ -19,7 +19,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-public class MessageTriviaCommand implements MessageCommand
+public class TriviaCommand implements MessageCommand
 {
 
     @Override
@@ -94,8 +94,8 @@ public class MessageTriviaCommand implements MessageCommand
             if (response.components() != null) responseAction = responseAction.addActionRow(response.components());
 
             responseAction.queue(message -> {
-                Cache.getServices().databaseService().trackRanCommandReply(message, event.getAuthor());
+                Cache.getDatabaseSource().trackRanCommandReply(message, event.getAuthor());
-                Cache.getServices().databaseService().queueDisabling(message);
+                Cache.getDatabaseSource().queueDisabling(message);
             });
         }
 

src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java

@@ -17,7 +17,7 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-public class MessageUrbanDictionaryCommand implements MessageCommand
+public class UrbanDictionaryCommand implements MessageCommand
 {
 
     @Override

src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java

@@ -7,21 +7,12 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.ProfileImage;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class AvatarCommand extends SlashCommandImpl
-public class SlashAvatarCommand extends SlashCommandImpl
 {
-    private final ProfileImage profileImage;
-
-    public SlashAvatarCommand(@NotNull ProfileImage profileImage)
-    {
-        this.profileImage = profileImage;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -53,13 +44,13 @@ public class SlashAvatarCommand extends SlashCommandImpl
         OptionMapping sizeArg = event.getOption("size");
         if (sizeArg != null)
         {
-            resolution = profileImage.parseResolution(sizeArg.getAsInt());
+            resolution = ProfileImage.parseResolution(sizeArg.getAsInt());
         } else
         {
-            resolution = profileImage.parseResolution(512);
+            resolution = ProfileImage.parseResolution(512);
         }
 
-        MessageResponse response = profileImage.buildResponse(resolution, user, ProfileImage.ImageType.AVATAR);
+        MessageResponse response = ProfileImage.buildResponse(resolution, user, ProfileImage.ImageType.AVATAR);
         if (response.content() != null)
         {
             event.getHook().editOriginal(response.content()).queue();

src/main/java/wtf/beatrice/hidekobot/commands/slash/BanCommand.java

@@ -7,21 +7,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.UserPunishment;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class BanCommand extends SlashCommandImpl
-public class SlashBanCommand extends SlashCommandImpl
 {
-    private final UserPunishment userPunishment;
-
-    public SlashBanCommand(@Autowired UserPunishment userPunishment)
-    {
-        this.userPunishment = userPunishment;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -41,6 +31,6 @@ public class SlashBanCommand extends SlashCommandImpl
     @Override
     public void runSlashCommand(@NotNull SlashCommandInteractionEvent event)
     {
-        userPunishment.handle(event, UserPunishment.PunishmentType.BAN);
+        UserPunishment.handle(event, UserPunishment.PunishmentType.BAN);
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/BannerCommand.java

@@ -7,21 +7,12 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.ProfileImage;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class BannerCommand extends SlashCommandImpl
-public class SlashBannerCommand extends SlashCommandImpl
 {
-    private final ProfileImage profileImage;
-
-    public SlashBannerCommand(@NotNull ProfileImage profileImage)
-    {
-        this.profileImage = profileImage;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -53,13 +44,13 @@ public class SlashBannerCommand extends SlashCommandImpl
         OptionMapping sizeArg = event.getOption("size");
         if (sizeArg != null)
         {
-            resolution = profileImage.parseResolution(sizeArg.getAsInt());
+            resolution = ProfileImage.parseResolution(sizeArg.getAsInt());
         } else
         {
-            resolution = profileImage.parseResolution(512);
+            resolution = ProfileImage.parseResolution(512);
         }
 
-        MessageResponse response = profileImage.buildResponse(resolution, user, ProfileImage.ImageType.BANNER);
+        MessageResponse response = ProfileImage.buildResponse(resolution, user, ProfileImage.ImageType.BANNER);
         if (response.content() != null)
         {
             event.getHook().editOriginal(response.content()).queue();

src/main/java/wtf/beatrice/hidekobot/commands/slash/BotInfoCommand.java

@@ -5,8 +5,6 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.commands.base.BotInfo;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommand;
@@ -15,17 +13,8 @@ import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 import java.util.LinkedList;
 import java.util.List;
 
-@Component
+public class BotInfoCommand extends SlashCommandImpl
-public class SlashBotInfoCommand extends SlashCommandImpl
 {
-    private final BotInfo botInfo;
-
-    public SlashBotInfoCommand(@Autowired BotInfo botInfo)
-    {
-        this.botInfo = botInfo;
-    }
-
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -48,7 +37,7 @@ public class SlashBotInfoCommand extends SlashCommandImpl
         }
 
         // send the list
-        MessageEmbed embed = botInfo.generateEmbed(registeredCommandNames);
+        MessageEmbed embed = BotInfo.generateEmbed(registeredCommandNames);
         event.getHook().editOriginalEmbeds(embed).queue();
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/ClearCommand.java

@@ -9,29 +9,20 @@ import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.commands.base.ClearChat;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class ClearCommand extends SlashCommandImpl
-public class SlashClearCommand extends SlashCommandImpl
 {
-    private final ClearChat clearChat;
-
-    public SlashClearCommand(@Autowired ClearChat clearChat)
-    {
-        this.clearChat = clearChat;
-    }
 
     @Override
     public CommandData getSlashCommandData()
     {
-        return Commands.slash(clearChat.getLabel(),
+        return Commands.slash(ClearChat.getLabel(),
-                        clearChat.getDescription())
+                        ClearChat.getDescription())
                 .addOption(OptionType.INTEGER, "amount", "The amount of messages to delete.")
-                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(clearChat.getPermission()));
+                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(ClearChat.getPermission()));
     }
 
     @Override
@@ -41,7 +32,7 @@ public class SlashClearCommand extends SlashCommandImpl
         event.deferReply().queue();
 
         // check if user is trying to run command in dms.
-        String error = clearChat.checkDMs(event.getChannel());
+        String error = ClearChat.checkDMs(event.getChannel());
         if (error != null)
         {
             event.getHook().editOriginal(error).queue();
@@ -55,9 +46,9 @@ public class SlashClearCommand extends SlashCommandImpl
         int toDeleteAmount = amountOption == null ? 1 : amountOption.getAsInt();
 
         // cap the amount to avoid abuse.
-        if (toDeleteAmount > clearChat.getMaxAmount()) toDeleteAmount = 0;
+        if (toDeleteAmount > ClearChat.getMaxAmount()) toDeleteAmount = 0;
 
-        error = clearChat.checkDeleteAmount(toDeleteAmount);
+        error = ClearChat.checkDeleteAmount(toDeleteAmount);
         if (error != null)
         {
             event.getHook().editOriginal(error).queue();
@@ -69,20 +60,20 @@ public class SlashClearCommand extends SlashCommandImpl
         Message botMessage = event.getHook().editOriginal(content).complete();
 
         // actually delete the messages.
-        int deleted = clearChat.delete(toDeleteAmount,
+        int deleted = ClearChat.delete(toDeleteAmount,
                 event.getInteraction().getIdLong(),
                 event.getChannel());
 
         // get a nicely formatted message that logs the deletion of messages.
-        content = clearChat.parseAmount(deleted);
+        content = ClearChat.parseAmount(deleted);
 
         // edit the message text and attach a button.
-        Button dismiss = clearChat.getDismissButton();
+        Button dismiss = ClearChat.getDismissButton();
         botMessage = botMessage.editMessage(content).setActionRow(dismiss).complete();
 
         // add the message to database.
-        Cache.getServices().databaseService().queueDisabling(botMessage);
+        Cache.getDatabaseSource().queueDisabling(botMessage);
-        Cache.getServices().databaseService().trackRanCommandReply(botMessage, event.getUser());
+        Cache.getDatabaseSource().trackRanCommandReply(botMessage, event.getUser());
 
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java

@@ -4,20 +4,11 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.CoinFlip;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class CoinFlipCommand extends SlashCommandImpl
-public class SlashCoinFlipCommand extends SlashCommandImpl
 {
-    private final CoinFlip coinFlip;
-
-    public SlashCoinFlipCommand(@Autowired CoinFlip coinFlip)
-    {
-        this.coinFlip = coinFlip;
-    }
 
     @Override
     public CommandData getSlashCommandData()
@@ -30,14 +21,14 @@ public class SlashCoinFlipCommand extends SlashCommandImpl
     public void runSlashCommand(@NotNull SlashCommandInteractionEvent event)
     {
         // perform coin flip
-        event.reply(coinFlip.genRandom())
+        event.reply(CoinFlip.genRandom())
-                .addActionRow(coinFlip.getReflipButton())
+                .addActionRow(CoinFlip.getReflipButton())
                 .queue((interaction) ->
                 {
                     // set the command as expiring and restrict it to the user who ran it
                     interaction.retrieveOriginal().queue((message) ->
                     {
-                        coinFlip.trackAndRestrict(message, event.getUser());
+                        CoinFlip.trackAndRestrict(message, event.getUser());
                     }, (error) -> {
                     });
                 }, (error) -> {

src/main/java/wtf/beatrice/hidekobot/commands/slash/DiceRollCommand.java

@@ -6,21 +6,12 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.DiceRoll;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class DiceRollCommand extends SlashCommandImpl
-public class SlashDiceRollCommand extends SlashCommandImpl
 {
-    private final DiceRoll diceRoll;
-
-    public SlashDiceRollCommand(@NotNull DiceRoll diceRoll)
-    {
-        this.diceRoll = diceRoll;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -46,7 +37,7 @@ public class SlashDiceRollCommand extends SlashCommandImpl
 
         String[] args = messageContent.split("\\s");
 
-        MessageResponse response = diceRoll.buildResponse(event.getUser(), args);
+        MessageResponse response = DiceRoll.buildResponse(event.getUser(), args);
 
         if (response.content() != null)
         {

src/main/java/wtf/beatrice/hidekobot/commands/slash/DieCommand.java

@@ -13,7 +13,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-public class SlashDieCommand extends SlashCommandImpl
+public class DieCommand extends SlashCommandImpl
 {
     @Override
     public CommandData getSlashCommandData()

src/main/java/wtf/beatrice/hidekobot/commands/slash/HelpCommand.java

@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-public class SlashHelpCommand extends SlashCommandImpl
+public class HelpCommand extends SlashCommandImpl
 {
     @Override
     public CommandData getSlashCommandData()

src/main/java/wtf/beatrice/hidekobot/commands/slash/InviteCommand.java

@@ -10,19 +10,11 @@ import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.requests.restaction.WebhookMessageEditAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.Invite;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class InviteCommand extends SlashCommandImpl
-public class SlashInviteCommand extends SlashCommandImpl
 {
-    private final Invite invite;
-
-    public SlashInviteCommand(@NotNull Invite invite)
-    {
-        this.invite = invite;
-    }
 
     @Override
     public CommandData getSlashCommandData()
@@ -44,8 +36,8 @@ public class SlashInviteCommand extends SlashCommandImpl
         }
         replyCallbackAction.queue();
 
-        MessageEmbed inviteEmbed = invite.generateEmbed();
+        MessageEmbed inviteEmbed = Invite.generateEmbed();
-        Button inviteButton = invite.getInviteButton();
+        Button inviteButton = Invite.getInviteButton();
 
         WebhookMessageEditAction<Message> reply =
                 event.getHook()

src/main/java/wtf/beatrice/hidekobot/commands/slash/KickCommand.java

@@ -7,22 +7,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.UserPunishment;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class KickCommand extends SlashCommandImpl
-public class SlashKickCommand extends SlashCommandImpl
 {
-
-    private final UserPunishment userPunishment;
-
-    public SlashKickCommand(@Autowired UserPunishment userPunishment)
-    {
-        this.userPunishment = userPunishment;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -42,6 +31,6 @@ public class SlashKickCommand extends SlashCommandImpl
     @Override
     public void runSlashCommand(@NotNull SlashCommandInteractionEvent event)
     {
-        userPunishment.handle(event, UserPunishment.PunishmentType.KICK);
+        UserPunishment.handle(event, UserPunishment.PunishmentType.KICK);
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/LoveCalculatorCommand.java

@@ -8,20 +8,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.LoveCalculator;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class LoveCalculatorCommand extends SlashCommandImpl
-public class SlashLoveCalculatorCommand extends SlashCommandImpl
 {
-    private final LoveCalculator loveCalculator;
-
-    public SlashLoveCalculatorCommand(@NotNull LoveCalculator loveCalculator)
-    {
-        this.loveCalculator = loveCalculator;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -66,7 +57,7 @@ public class SlashLoveCalculatorCommand extends SlashCommandImpl
             secondUser = event.getUser();
         }
 
-        MessageEmbed embed = loveCalculator.buildEmbedAndCacheResult(event.getUser(), firstUser, secondUser);
+        MessageEmbed embed = LoveCalculator.buildEmbedAndCacheResult(event.getUser(), firstUser, secondUser);
         event.replyEmbeds(embed).queue();
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java

@@ -7,25 +7,16 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.MagicBall;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class MagicBallCommand extends SlashCommandImpl
-public class SlashMagicBallCommand extends SlashCommandImpl
 {
-    private final MagicBall magicBall;
-
-    public SlashMagicBallCommand(@NotNull MagicBall magicBall)
-    {
-        this.magicBall = magicBall;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
 
-        return Commands.slash(magicBall.getLabels().get(0),
+        return Commands.slash(MagicBall.getLabels().get(0),
                         "Ask a question to the magic ball.")
                 .addOption(OptionType.STRING, "question",
                         "The question to ask.",
@@ -52,7 +43,7 @@ public class SlashMagicBallCommand extends SlashCommandImpl
             return;
         }
 
-        MessageEmbed response = magicBall.generateEmbed(question, event.getUser());
+        MessageEmbed response = MagicBall.generateEmbed(question, event.getUser());
         event.replyEmbeds(response).queue();
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/PingCommand.java

@@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-public class SlashPingCommand extends SlashCommandImpl
+public class PingCommand extends SlashCommandImpl
 {
     @Override
     public CommandData getSlashCommandData()

src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java

@@ -8,20 +8,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.Say;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class SayCommand extends SlashCommandImpl
-public class SlashSayCommand extends SlashCommandImpl
 {
-    private final Say say;
-
-    public SlashSayCommand(@NotNull Say say)
-    {
-        this.say = say;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -31,7 +22,7 @@ public class SlashSayCommand extends SlashCommandImpl
                         "The message to send.",
                         true,
                         false)
-                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(say.getPermission()));
+                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Say.getPermission()));
     }
 
     @Override

src/main/java/wtf/beatrice/hidekobot/commands/slash/TimeoutCommand.java

@@ -7,22 +7,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.UserPunishment;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-@Component
+public class TimeoutCommand extends SlashCommandImpl
-public class SlashTimeoutCommand extends SlashCommandImpl
 {
-
-    private final UserPunishment userPunishment;
-
-    public SlashTimeoutCommand(@Autowired UserPunishment userPunishment)
-    {
-        this.userPunishment = userPunishment;
-    }
-
     @Override
     public CommandData getSlashCommandData()
     {
@@ -46,6 +35,6 @@ public class SlashTimeoutCommand extends SlashCommandImpl
     @Override
     public void runSlashCommand(@NotNull SlashCommandInteractionEvent event)
     {
-        userPunishment.handle(event, UserPunishment.PunishmentType.TIMEOUT);
+        UserPunishment.handle(event, UserPunishment.PunishmentType.TIMEOUT);
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/TriviaCommand.java

@@ -11,7 +11,7 @@ import wtf.beatrice.hidekobot.commands.base.Trivia;
 import wtf.beatrice.hidekobot.objects.MessageResponse;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
-public class SlashTriviaCommand extends SlashCommandImpl
+public class TriviaCommand extends SlashCommandImpl
 {
     @Override
     public CommandData getSlashCommandData()
@@ -44,8 +44,8 @@ public class SlashTriviaCommand extends SlashCommandImpl
 
         event.getHook().editOriginalEmbeds(response.embed()).setActionRow(response.components()).queue(message ->
         {
-            Cache.getServices().databaseService().trackRanCommandReply(message, event.getUser());
+            Cache.getDatabaseSource().trackRanCommandReply(message, event.getUser());
-            Cache.getServices().databaseService().queueDisabling(message);
+            Cache.getDatabaseSource().queueDisabling(message);
         });
     }
 }

src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java

@@ -17,7 +17,7 @@ import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 import java.io.IOException;
 
-public class SlashUrbanDictionaryCommand extends SlashCommandImpl
+public class UrbanDictionaryCommand extends SlashCommandImpl
 {
     @Override
     public CommandData getSlashCommandData()

src/main/java/wtf/beatrice/hidekobot/datasources/DatabaseSource.java

@@ -0,0 +1,682 @@
+package wtf.beatrice.hidekobot.datasources;
+
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import org.slf4j.LoggerFactory;
+import wtf.beatrice.hidekobot.Cache;
+
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DatabaseSource
+{
+
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(DatabaseSource.class);
+    private static final String JDBC_URL = "jdbc:sqlite:%path%";
+    private Connection dbConnection = null;
+    private final String dbPath;
+
+    public DatabaseSource(String dbPath)
+    {
+        this.dbPath = dbPath;
+    }
+
+    private void logException(SQLException e)
+    {
+        LOGGER.error("Database Exception", e);
+    }
+
+    public boolean connect()
+    {
+        String url = JDBC_URL.replace("%path%", dbPath);
+
+        if (!close()) return false;
+
+        try
+        {
+            dbConnection = DriverManager.getConnection(url);
+            LOGGER.info("Database connection established!");
+            return true;
+        } catch (SQLException e)
+        {
+            logException(e);
+            return false;
+        }
+
+    }
+
+
+    public boolean close()
+    {
+        if (dbConnection != null)
+        {
+            try
+            {
+                if (!dbConnection.isClosed())
+                {
+                    dbConnection.close();
+                }
+            } catch (SQLException e)
+            {
+                logException(e);
+                return false;
+            }
+
+            dbConnection = null;
+        }
+
+        return true;
+    }
+
+    /*
+     * DB STRUCTURE
+     * TABLE 1: pending_disabled_messages
+     * ----------------------------------------------------------------------------------
+     * | guild_id      | channel_id         | message_id       | expiry_timestamp       |
+     * ----------------------------------------------------------------------------------
+     * |39402849302   | 39402849302        | 39402849302      | 2022-11-20 22:45:53:300 |
+     * ---------------------------------------------------------------------------------
+     *
+     *
+     * TABLE 2: command_runners
+     * --------------------------------------------------------------------------------------------
+     * | guild_id      | channel_id         | message_id       | user_id        | channel_type    |
+     * --------------------------------------------------------------------------------------------
+     * | 39402849302   | 39402849302        | 39402849302      | 39402849302    | PRIVATE         |
+     * --------------------------------------------------------------------------------------------
+     *
+     * TABLE 3: urban_dictionary
+     * -----------------------------------------------------------------------------------------------------
+     * | message_id    | page      | meanings    | examples    | contributors      | dates      | term     |
+     * -----------------------------------------------------------------------------------------------------
+     * | 39402849302   | 0         | base64      | base64      | base64            | base64     | miku     |
+     * -----------------------------------------------------------------------------------------------------
+     */
+
+    //todo: javadocs
+    public boolean initDb()
+    {
+        List<String> newTables = new ArrayList<>();
+
+        newTables.add("""
+                CREATE TABLE IF NOT EXISTS pending_disabled_messages (
+                guild_id TEXT NOT NULL,
+                channel_id TEXT NOT NULL,
+                message_id TEXT NOT NULL,
+                expiry_timestamp TEXT NOT NULL);
+                """);
+
+        newTables.add("""
+                CREATE TABLE IF NOT EXISTS command_runners (
+                guild_id TEXT NOT NULL,
+                channel_id TEXT NOT NULL,
+                message_id TEXT NOT NULL,
+                user_id TEXT NOT NULL,
+                channel_type TEXT NOT NULL);
+                """);
+
+        newTables.add("""
+                CREATE TABLE IF NOT EXISTS urban_dictionary (
+                message_id TEXT NOT NULL,
+                page INTEGER NOT NULL,
+                meanings TEXT NOT NULL,
+                examples TEXT NOT NULL,
+                contributors TEXT NOT NULL,
+                dates TEXT NOT NULL,
+                term TEXT NOT NULL
+                );
+                """);
+
+        for (String sql : newTables)
+        {
+            try (Statement stmt = dbConnection.createStatement())
+            {
+                // execute the statement
+                stmt.execute(sql);
+            } catch (SQLException e)
+            {
+                logException(e);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public boolean trackRanCommandReply(Message message, User user)
+    {
+        String userId = user.getId();
+        String guildId;
+
+        ChannelType channelType = message.getChannelType();
+        if (!(channelType.isGuild()))
+        {
+            guildId = userId;
+        } else
+        {
+            guildId = message.getGuild().getId();
+        }
+
+        String channelId = message.getChannel().getId();
+        String messageId = message.getId();
+
+
+        String query = """
+                INSERT INTO command_runners
+                (guild_id, channel_id, message_id, user_id, channel_type) VALUES
+                 (?, ?, ?, ?, ?);
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, guildId);
+            preparedStatement.setString(2, channelId);
+            preparedStatement.setString(3, messageId);
+            preparedStatement.setString(4, userId);
+            preparedStatement.setString(5, channelType.name());
+
+            preparedStatement.executeUpdate();
+
+            return true;
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return false;
+    }
+
+    public boolean isUserTrackedFor(String userId, String messageId)
+    {
+        String trackedUserId = getTrackedReplyUserId(messageId);
+        if (trackedUserId == null) return false;
+        return userId.equals(trackedUserId);
+    }
+
+    public ChannelType getTrackedMessageChannelType(String messageId)
+    {
+        String query = """
+                SELECT channel_type
+                FROM command_runners
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                String channelTypeName = resultSet.getString("channel_type");
+                return ChannelType.valueOf(channelTypeName);
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+
+    }
+
+    public String getTrackedReplyUserId(String messageId)
+    {
+        String query = """
+                SELECT user_id
+                FROM command_runners
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("user_id");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public boolean queueDisabling(Message message)
+    {
+        String messageId = message.getId();
+        String channelId = message.getChannel().getId();
+        String guildId;
+
+        ChannelType channelType = message.getChannelType();
+        if (!(channelType.isGuild()))
+        {
+            guildId = "PRIVATE";
+        } else
+        {
+            guildId = message.getGuild().getId();
+        }
+
+        LocalDateTime expiryTime = LocalDateTime.now().plusSeconds(Cache.getExpiryTimeSeconds());
+
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(Cache.getExpiryTimestampFormat());
+        String expiryTimeFormatted = dateTimeFormatter.format(expiryTime);
+
+        String query = """
+                INSERT INTO pending_disabled_messages
+                (guild_id, channel_id, message_id, expiry_timestamp) VALUES
+                 (?, ?, ?, ?);
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, guildId);
+            preparedStatement.setString(2, channelId);
+            preparedStatement.setString(3, messageId);
+            preparedStatement.setString(4, expiryTimeFormatted);
+
+            preparedStatement.executeUpdate();
+
+            return true;
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return false;
+    }
+
+    public List<String> getQueuedExpiringMessages()
+    {
+        List<String> messages = new ArrayList<>();
+
+        String query = """
+                SELECT message_id
+                FROM pending_disabled_messages;
+                """;
+
+        try (Statement statement = dbConnection.createStatement())
+        {
+            ResultSet resultSet = statement.executeQuery(query);
+            if (resultSet.isClosed()) return messages;
+            while (resultSet.next())
+            {
+                messages.add(resultSet.getString("message_id"));
+            }
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return messages;
+    }
+
+    public boolean untrackExpiredMessage(String messageId)
+    {
+        String query = "DELETE FROM pending_disabled_messages WHERE message_id = ?;";
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            preparedStatement.execute();
+        } catch (SQLException e)
+        {
+            logException(e);
+            return false;
+        }
+
+        query = "DELETE FROM command_runners WHERE message_id = ?;";
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            preparedStatement.execute();
+        } catch (SQLException e)
+        {
+            logException(e);
+            return false;
+        }
+
+        query = "DELETE FROM urban_dictionary WHERE message_id = ?;";
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            preparedStatement.execute();
+        } catch (SQLException e)
+        {
+            logException(e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public String getQueuedExpiringMessageExpiryDate(String messageId)
+    {
+        String query = """
+                SELECT expiry_timestamp
+                FROM pending_disabled_messages
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("expiry_timestamp");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public String getQueuedExpiringMessageChannel(String messageId)
+    {
+        String query = """
+                SELECT channel_id
+                FROM pending_disabled_messages
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("channel_id");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public String getQueuedExpiringMessageGuild(String messageId)
+    {
+        String query = """
+                SELECT guild_id
+                FROM pending_disabled_messages
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("guild_id");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public boolean trackUrban(String meanings, String examples,
+                              String contributors, String dates,
+                              Message message, String term)
+    {
+
+        String query = """
+                INSERT INTO urban_dictionary
+                (message_id, page, meanings, examples, contributors, dates, term) VALUES
+                 (?, ?, ?, ?, ?, ?, ?);
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, message.getId());
+            preparedStatement.setInt(2, 0);
+            preparedStatement.setString(3, meanings);
+            preparedStatement.setString(4, examples);
+            preparedStatement.setString(5, contributors);
+            preparedStatement.setString(6, dates);
+            preparedStatement.setString(7, term);
+
+            preparedStatement.executeUpdate();
+
+            return true;
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return false;
+    }
+
+    public int getUrbanPage(String messageId)
+    {
+        String query = """
+                SELECT page
+                FROM urban_dictionary
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return 0;
+            while (resultSet.next())
+            {
+                return resultSet.getInt("page");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return 0;
+    }
+
+    public String getUrbanMeanings(String messageId)
+    {
+        String query = """
+                SELECT meanings
+                FROM urban_dictionary
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("meanings");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public String getUrbanExamples(String messageId)
+    {
+        String query = """
+                SELECT examples
+                FROM urban_dictionary
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("examples");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public String getUrbanContributors(String messageId)
+    {
+        String query = """
+                SELECT contributors
+                FROM urban_dictionary
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("contributors");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public String getUrbanDates(String messageId)
+    {
+        String query = """
+                SELECT dates
+                FROM urban_dictionary
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("dates");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public String getUrbanTerm(String messageId)
+    {
+        String query = """
+                SELECT term
+                FROM urban_dictionary
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, messageId);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.isClosed()) return null;
+            while (resultSet.next())
+            {
+                return resultSet.getString("term");
+            }
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return null;
+    }
+
+    public boolean setUrbanPage(String messageId, int page)
+    {
+        String query = """
+                UPDATE urban_dictionary
+                SET page = ? 
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setInt(1, page);
+            preparedStatement.setString(2, messageId);
+            preparedStatement.executeUpdate();
+
+            return true;
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return false;
+    }
+
+    public boolean resetExpiryTimestamp(String messageId)
+    {
+        LocalDateTime expiryTime = LocalDateTime.now().plusSeconds(Cache.getExpiryTimeSeconds());
+
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(Cache.getExpiryTimestampFormat());
+        String expiryTimeFormatted = dateTimeFormatter.format(expiryTime);
+
+        String query = """
+                UPDATE pending_disabled_messages
+                SET expiry_timestamp = ? 
+                WHERE message_id = ?;
+                """;
+
+        try (PreparedStatement preparedStatement = dbConnection.prepareStatement(query))
+        {
+            preparedStatement.setString(1, expiryTimeFormatted);
+            preparedStatement.setString(2, messageId);
+            preparedStatement.executeUpdate();
+
+            return true;
+
+        } catch (SQLException e)
+        {
+            logException(e);
+        }
+
+        return false;
+    }
+
+
+}

src/main/java/wtf/beatrice/hidekobot/entities/CommandRunner.java

@@ -1,77 +0,0 @@
-package wtf.beatrice.hidekobot.entities;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name = "command_runners")
-public class CommandRunner
-{
-    @Id
-    @Column(name = "message_id", nullable = false)
-    private String messageId;
-
-    @Column(name = "guild_id", nullable = false)
-    private String guildId;
-
-    @Column(name = "channel_id", nullable = false)
-    private String channelId;
-
-    @Column(name = "user_id", nullable = false)
-    private String userId;
-
-    @Column(name = "channel_type", nullable = false)
-    private String channelType; // store JDA enum name
-
-    public String getMessageId()
-    {
-        return messageId;
-    }
-
-    public void setMessageId(String messageId)
-    {
-        this.messageId = messageId;
-    }
-
-    public String getGuildId()
-    {
-        return guildId;
-    }
-
-    public void setGuildId(String guildId)
-    {
-        this.guildId = guildId;
-    }
-
-    public String getChannelId()
-    {
-        return channelId;
-    }
-
-    public void setChannelId(String channelId)
-    {
-        this.channelId = channelId;
-    }
-
-    public String getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(String userId)
-    {
-        this.userId = userId;
-    }
-
-    public String getChannelType()
-    {
-        return channelType;
-    }
-
-    public void setChannelType(String channelType)
-    {
-        this.channelType = channelType;
-    }
-}

src/main/java/wtf/beatrice/hidekobot/entities/PendingDisabledMessage.java

@@ -1,64 +0,0 @@
-package wtf.beatrice.hidekobot.entities;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name = "pending_disabled_messages")
-public class PendingDisabledMessage
-{
-    @Id
-    @Column(name = "message_id", nullable = false)
-    private String messageId;
-
-    @Column(name = "guild_id", nullable = false)
-    private String guildId;
-
-    @Column(name = "channel_id", nullable = false)
-    private String channelId;
-
-    @Column(name = "expiry_timestamp", nullable = false)
-    private String expiryTimestamp; // keep as String to match your format for now
-
-    public String getMessageId()
-    {
-        return messageId;
-    }
-
-    public void setMessageId(String messageId)
-    {
-        this.messageId = messageId;
-    }
-
-    public String getGuildId()
-    {
-        return guildId;
-    }
-
-    public void setGuildId(String guildId)
-    {
-        this.guildId = guildId;
-    }
-
-    public String getChannelId()
-    {
-        return channelId;
-    }
-
-    public void setChannelId(String channelId)
-    {
-        this.channelId = channelId;
-    }
-
-    public String getExpiryTimestamp()
-    {
-        return expiryTimestamp;
-    }
-
-    public void setExpiryTimestamp(String expiryTimestamp)
-    {
-        this.expiryTimestamp = expiryTimestamp;
-    }
-}

src/main/java/wtf/beatrice/hidekobot/entities/UrbanDictionaryEntry.java

@@ -1,103 +0,0 @@
-package wtf.beatrice.hidekobot.entities;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name = "urban_dictionary")
-public class UrbanDictionaryEntry
-{
-    @Id
-    @Column(name = "message_id", nullable = false)
-    private String messageId;
-
-    @Column(name = "page", nullable = false)
-    private Integer page;
-
-    @Column(name = "meanings", nullable = false, columnDefinition = "TEXT")
-    private String meanings;
-
-    @Column(name = "examples", nullable = false, columnDefinition = "TEXT")
-    private String examples;
-
-    @Column(name = "contributors", nullable = false, columnDefinition = "TEXT")
-    private String contributors;
-
-    @Column(name = "dates", nullable = false, columnDefinition = "TEXT")
-    private String dates;
-
-    @Column(name = "term", nullable = false)
-    private String term;
-
-    public String getMessageId()
-    {
-        return messageId;
-    }
-
-    public void setMessageId(String messageId)
-    {
-        this.messageId = messageId;
-    }
-
-    public Integer getPage()
-    {
-        return page;
-    }
-
-    public void setPage(Integer page)
-    {
-        this.page = page;
-    }
-
-    public String getMeanings()
-    {
-        return meanings;
-    }
-
-    public void setMeanings(String meanings)
-    {
-        this.meanings = meanings;
-    }
-
-    public String getExamples()
-    {
-        return examples;
-    }
-
-    public void setExamples(String examples)
-    {
-        this.examples = examples;
-    }
-
-    public String getContributors()
-    {
-        return contributors;
-    }
-
-    public void setContributors(String contributors)
-    {
-        this.contributors = contributors;
-    }
-
-    public String getDates()
-    {
-        return dates;
-    }
-
-    public void setDates(String dates)
-    {
-        this.dates = dates;
-    }
-
-    public String getTerm()
-    {
-        return term;
-    }
-
-    public void setTerm(String term)
-    {
-        this.term = term;
-    }
-}

src/main/java/wtf/beatrice/hidekobot/listeners/ButtonInteractionListener.java

@@ -4,28 +4,16 @@ import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.CoinFlip;
 import wtf.beatrice.hidekobot.commands.base.Trivia;
 import wtf.beatrice.hidekobot.commands.base.UrbanDictionary;
-import wtf.beatrice.hidekobot.services.CommandService;
+import wtf.beatrice.hidekobot.util.CommandUtil;
 
-@Component
 public class ButtonInteractionListener extends ListenerAdapter
 {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ButtonInteractionListener.class);
 
-    private final CommandService commandService;
-    private final CoinFlip coinFlip;
-
-    public ButtonInteractionListener(@Autowired CommandService commandService,
-                                     @Autowired CoinFlip coinFlip)
-    {
-        this.commandService = commandService;
-        this.coinFlip = coinFlip;
-    }
-
     @Override
     public void onButtonInteraction(ButtonInteractionEvent event)
     {
@@ -34,10 +22,10 @@ public class ButtonInteractionListener extends ListenerAdapter
         {
 
             // coinflip
-            case "coinflip_reflip" -> coinFlip.buttonReFlip(event);
+            case "coinflip_reflip" -> CoinFlip.buttonReFlip(event);
 
             // generic dismiss button
-            case "generic_dismiss" -> commandService.deleteUserLinkedMessage(event);
+            case "generic_dismiss" -> CommandUtil.delete(event);
 
             // urban dictionary navigation
             case "urban_nextpage" -> UrbanDictionary.changePage(event, UrbanDictionary.ChangeType.NEXT);

src/main/java/wtf/beatrice/hidekobot/listeners/MessageCommandListener.java

@@ -7,7 +7,6 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.objects.commands.CommandCategory;
 import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
@@ -15,7 +14,6 @@ import wtf.beatrice.hidekobot.objects.comparators.MessageCommandAliasesComparato
 
 import java.util.*;
 
-@Component
 public class MessageCommandListener extends ListenerAdapter
 {
 

src/main/java/wtf/beatrice/hidekobot/listeners/MessageLogger.java

@@ -8,9 +8,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 
-@Component
 public class MessageLogger extends ListenerAdapter
 {
     // this class only gets loaded as a listener if verbosity is set to true on startup.
@@ -24,7 +22,7 @@ public class MessageLogger extends ListenerAdapter
     public void onMessageReceived(@NotNull MessageReceivedEvent event)
     {
         String toLog = "";
-        String userName = event.getAuthor().getName();
+        String userName = event.getAuthor().getAsTag();
         String message = event.getMessage().getContentDisplay();
 
         if (event.getChannel() instanceof TextChannel channel)

src/main/java/wtf/beatrice/hidekobot/listeners/SelectMenuInteractionListener.java

@@ -4,10 +4,8 @@ import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionE
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.commands.base.Trivia;
 
-@Component
 public class SelectMenuInteractionListener extends ListenerAdapter
 {
 

src/main/java/wtf/beatrice/hidekobot/listeners/SlashCommandCompletionListener.java

@@ -2,13 +2,11 @@ package wtf.beatrice.hidekobot.listeners;
 
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.objects.commands.SlashArgumentsCompleter;
 
 import java.util.LinkedList;
 import java.util.TreeMap;
 
-@Component
 public class SlashCommandCompletionListener extends ListenerAdapter
 {
 

src/main/java/wtf/beatrice/hidekobot/listeners/SlashCommandListener.java

@@ -3,13 +3,11 @@ package wtf.beatrice.hidekobot.listeners;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommand;
 
 import java.util.LinkedList;
 import java.util.TreeMap;
 
-@Component
 public class SlashCommandListener extends ListenerAdapter
 {
 

src/main/java/wtf/beatrice/hidekobot/objects/fun/TriviaScore.java

@@ -31,7 +31,7 @@ public class TriviaScore
     @Override
     public String toString()
     {
-        return "[" + user.getName() + "," + score + "]";
+        return "[" + user.getAsTag() + "," + score + "]";
     }
 
 }

src/main/java/wtf/beatrice/hidekobot/repositories/CommandRunnerRepository.java

@@ -1,8 +0,0 @@
-package wtf.beatrice.hidekobot.repositories;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import wtf.beatrice.hidekobot.entities.CommandRunner;
-
-public interface CommandRunnerRepository extends JpaRepository<CommandRunner, String>
-{
-}

src/main/java/wtf/beatrice/hidekobot/repositories/PendingDisabledMessageRepository.java

@@ -1,8 +0,0 @@
-package wtf.beatrice.hidekobot.repositories;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import wtf.beatrice.hidekobot.entities.PendingDisabledMessage;
-
-public interface PendingDisabledMessageRepository extends JpaRepository<PendingDisabledMessage, String>
-{
-}

src/main/java/wtf/beatrice/hidekobot/repositories/UrbanDictionaryRepository.java

@@ -1,8 +0,0 @@
-package wtf.beatrice.hidekobot.repositories;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import wtf.beatrice.hidekobot.entities.UrbanDictionaryEntry;
-
-public interface UrbanDictionaryRepository extends JpaRepository<UrbanDictionaryEntry, String>
-{
-}

src/main/java/wtf/beatrice/hidekobot/runnables/ExpiredMessageTask.java

@@ -3,8 +3,8 @@ package wtf.beatrice.hidekobot.runnables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.services.CommandService;
+import wtf.beatrice.hidekobot.datasources.DatabaseSource;
-import wtf.beatrice.hidekobot.services.DatabaseService;
+import wtf.beatrice.hidekobot.util.CommandUtil;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -13,20 +13,16 @@ import java.util.List;
 public class ExpiredMessageTask implements Runnable
 {
 
-    private final DatabaseService databaseService;
-    private final CommandService commandService;
-
     private final DateTimeFormatter formatter;
     private static final Logger LOGGER = LoggerFactory.getLogger(ExpiredMessageTask.class);
+    private DatabaseSource databaseSource;
 
 
-    public ExpiredMessageTask(DatabaseService databaseService,
+    public ExpiredMessageTask()
-                              CommandService commandService)
     {
-        this.databaseService = databaseService;
-        this.commandService = commandService;
         String format = Cache.getExpiryTimestampFormat();
         formatter = DateTimeFormatter.ofPattern(format);
+        databaseSource = Cache.getDatabaseSource();
     }
 
 
@@ -34,7 +30,10 @@ public class ExpiredMessageTask implements Runnable
     public void run()
     {
 
-        List<String> expiringMessages = databaseService.getQueuedExpiringMessages();
+        databaseSource = Cache.getDatabaseSource();
+        if (databaseSource == null) return;
+
+        List<String> expiringMessages = Cache.getDatabaseSource().getQueuedExpiringMessages();
         if (expiringMessages == null || expiringMessages.isEmpty()) return;
 
         LocalDateTime now = LocalDateTime.now();
@@ -44,11 +43,11 @@ public class ExpiredMessageTask implements Runnable
 
             if (Cache.isVerbose()) LOGGER.info("expired check: {}", messageId);
 
-            String expiryTimestamp = databaseService.getQueuedExpiringMessageExpiryDate(messageId);
+            String expiryTimestamp = databaseSource.getQueuedExpiringMessageExpiryDate(messageId);
             if (expiryTimestamp == null || expiryTimestamp.isEmpty()) // if missing timestamp
             {
                 // count it as already expired
-                databaseService.untrackExpiredMessage(messageId);
+                databaseSource.untrackExpiredMessage(messageId);
                 // move on to next message
                 continue;
             }
@@ -58,7 +57,7 @@ public class ExpiredMessageTask implements Runnable
             if (now.isAfter(expiryDate))
             {
                 if (Cache.isVerbose()) LOGGER.info("expired: {}", messageId);
-                commandService.disableExpired(messageId);
+                CommandUtil.disableExpired(messageId);
             }
         }
 

src/main/java/wtf/beatrice/hidekobot/runnables/TriviaTask.java

@@ -13,18 +13,13 @@ import wtf.beatrice.hidekobot.objects.comparators.TriviaScoreComparator;
 import wtf.beatrice.hidekobot.objects.fun.TriviaCategory;
 import wtf.beatrice.hidekobot.objects.fun.TriviaQuestion;
 import wtf.beatrice.hidekobot.objects.fun.TriviaScore;
-import wtf.beatrice.hidekobot.services.CommandService;
+import wtf.beatrice.hidekobot.util.CommandUtil;
-import wtf.beatrice.hidekobot.services.DatabaseService;
 
 import java.util.*;
 import java.util.concurrent.ScheduledFuture;
 
 public class TriviaTask implements Runnable
 {
-
-    private final DatabaseService databaseService;
-    private final CommandService commandService;
-
     private final User author;
     private final MessageChannel channel;
 
@@ -38,17 +33,11 @@ public class TriviaTask implements Runnable
 
     private int iteration = 0;
 
-    public TriviaTask(User author,
+    public TriviaTask(User author, MessageChannel channel, TriviaCategory category)
-                      MessageChannel channel,
-                      TriviaCategory category,
-                      DatabaseService databaseService,
-                      CommandService commandService)
     {
         this.author = author;
         this.channel = channel;
         this.category = category;
-        this.databaseService = databaseService;
-        this.commandService = commandService;
 
         triviaJson = Trivia.fetchJson(Trivia.getTriviaLink(category.categoryId()));
         questions = Trivia.parseQuestions(triviaJson); //todo: null check, rate limiting...
@@ -66,7 +55,7 @@ public class TriviaTask implements Runnable
         if (previousMessage != null)
         {
             // todo: we shouldn't use this method, since it messes with the database... look at coin reflip
-            commandService.disableExpired(previousMessage.getId());
+            CommandUtil.disableExpired(previousMessage.getId());
 
             String previousCorrectAnswer = questions.get(iteration - 1).correctAnswer();
 
@@ -204,12 +193,12 @@ public class TriviaTask implements Runnable
                 .complete();
 
 
-        databaseService.trackRanCommandReply(previousMessage, author);
+        Cache.getDatabaseSource().trackRanCommandReply(previousMessage, author);
         // todo: ^ we should get rid of this tracking, since we don't need to know who started the trivia.
         // todo: however, for now, that's the only way to avoid a thread-locking scenario as some data is
         // todo: only stored in that table. this should be solved when we merge / fix the two main tables.
         // todo: then, we can remove this instruction.
-        databaseService.queueDisabling(previousMessage);
+        Cache.getDatabaseSource().queueDisabling(previousMessage);
 
         iteration++;
     }

src/main/java/wtf/beatrice/hidekobot/services/DatabaseService.java

@@ -1,183 +0,0 @@
-package wtf.beatrice.hidekobot.services;
-
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.entities.CommandRunner;
-import wtf.beatrice.hidekobot.entities.PendingDisabledMessage;
-import wtf.beatrice.hidekobot.entities.UrbanDictionaryEntry;
-import wtf.beatrice.hidekobot.repositories.CommandRunnerRepository;
-import wtf.beatrice.hidekobot.repositories.PendingDisabledMessageRepository;
-import wtf.beatrice.hidekobot.repositories.UrbanDictionaryRepository;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-
-@Service
-@Transactional
-public class DatabaseService
-{
-
-    private final PendingDisabledMessageRepository pendingRepo;
-    private final CommandRunnerRepository runnerRepo;
-    private final UrbanDictionaryRepository urbanRepo;
-
-    public DatabaseService(PendingDisabledMessageRepository p, CommandRunnerRepository c, UrbanDictionaryRepository u)
-    {
-        this.pendingRepo = p;
-        this.runnerRepo = c;
-        this.urbanRepo = u;
-    }
-
-    // trackRanCommandReply
-    public void trackRanCommandReply(Message message, User user)
-    {
-        String userId = user.getId();
-        String guildId = message.getChannelType().isGuild() ? message.getGuild().getId() : userId;
-
-        CommandRunner row = new CommandRunner();
-        row.setMessageId(message.getId());
-        row.setGuildId(guildId);
-        row.setChannelId(message.getChannel().getId());
-        row.setUserId(userId);
-        row.setChannelType(message.getChannelType().name());
-
-        runnerRepo.save(row);
-    }
-
-    public boolean isUserTrackedFor(String userId, String messageId)
-    {
-        return runnerRepo.findById(messageId)
-                .map(r -> userId.equals(r.getUserId()))
-                .orElse(false);
-    }
-
-
-    public ChannelType getTrackedMessageChannelType(String messageId)
-    {
-        return runnerRepo.findById(messageId)
-                .map(r -> ChannelType.valueOf(r.getChannelType()))
-                .orElse(null);
-    }
-
-    public String getTrackedReplyUserId(String messageId)
-    {
-        return runnerRepo.findById(messageId)
-                .map(CommandRunner::getUserId)
-                .orElse(null);
-    }
-    
-    public void queueDisabling(Message message)
-    {
-        String guildId = message.getChannelType().isGuild() ? message.getGuild().getId() : "PRIVATE";
-
-        LocalDateTime expiry = LocalDateTime.now().plusSeconds(Cache.getExpiryTimeSeconds());
-        String formatted = DateTimeFormatter.ofPattern(Cache.getExpiryTimestampFormat()).format(expiry);
-
-        PendingDisabledMessage row = new PendingDisabledMessage();
-        row.setMessageId(message.getId());
-        row.setChannelId(message.getChannel().getId());
-        row.setGuildId(guildId);
-        row.setExpiryTimestamp(formatted);
-
-        pendingRepo.save(row);
-    }
-
-    public List<String> getQueuedExpiringMessages()
-    {
-        return pendingRepo.findAll()
-                .stream()
-                .map(PendingDisabledMessage::getMessageId)
-                .toList();
-    }
-
-    public void untrackExpiredMessage(String messageId)
-    {
-        pendingRepo.deleteById(messageId);
-        runnerRepo.deleteById(messageId);
-        urbanRepo.deleteById(messageId);
-    }
-
-    public String getQueuedExpiringMessageExpiryDate(String messageId)
-    {
-        return pendingRepo.findById(messageId).map(PendingDisabledMessage::getExpiryTimestamp).orElse(null);
-    }
-
-    public String getQueuedExpiringMessageChannel(String messageId)
-    {
-        return pendingRepo.findById(messageId).map(PendingDisabledMessage::getChannelId).orElse(null);
-    }
-
-    public String getQueuedExpiringMessageGuild(String messageId)
-    {
-        return pendingRepo.findById(messageId).map(PendingDisabledMessage::getGuildId).orElse(null);
-    }
-
-    public void trackUrban(String meanings, String examples, String contributors, String dates, Message message, String term)
-    {
-        UrbanDictionaryEntry e = new UrbanDictionaryEntry();
-        e.setMessageId(message.getId());
-        e.setPage(0);
-        e.setMeanings(meanings);
-        e.setExamples(examples);
-        e.setContributors(contributors);
-        e.setDates(dates);
-        e.setTerm(term);
-        urbanRepo.save(e);
-    }
-
-    public int getUrbanPage(String messageId)
-    {
-        return urbanRepo.findById(messageId)
-                .map(UrbanDictionaryEntry::getPage)
-                .orElse(0);
-    }
-
-    public String getUrbanMeanings(String messageId)
-    {
-        return urbanRepo.findById(messageId).map(UrbanDictionaryEntry::getMeanings).orElse(null);
-    }
-
-    public String getUrbanExamples(String messageId)
-    {
-        return urbanRepo.findById(messageId).map(UrbanDictionaryEntry::getExamples).orElse(null);
-    }
-
-    public String getUrbanContributors(String messageId)
-    {
-        return urbanRepo.findById(messageId).map(UrbanDictionaryEntry::getContributors).orElse(null);
-    }
-
-    public String getUrbanDates(String messageId)
-    {
-        return urbanRepo.findById(messageId).map(UrbanDictionaryEntry::getDates).orElse(null);
-    }
-
-    public String getUrbanTerm(String messageId)
-    {
-        return urbanRepo.findById(messageId).map(UrbanDictionaryEntry::getTerm).orElse(null);
-    }
-
-    public void setUrbanPage(String messageId, int page)
-    {
-        urbanRepo.findById(messageId).ifPresent(e -> {
-            e.setPage(page);
-            urbanRepo.save(e);
-        });
-    }
-
-    public void resetExpiryTimestamp(String messageId)
-    {
-        pendingRepo.findById(messageId).ifPresent(row -> {
-            String formatted = DateTimeFormatter
-                    .ofPattern(Cache.getExpiryTimestampFormat())
-                    .format(LocalDateTime.now().plusSeconds(Cache.getExpiryTimeSeconds()));
-            row.setExpiryTimestamp(formatted);
-            pendingRepo.save(row);
-        });
-    }
-}

src/main/java/wtf/beatrice/hidekobot/util/CommandUtil.java

@@ -1,4 +1,4 @@
-package wtf.beatrice.hidekobot.services;
+package wtf.beatrice.hidekobot.util;
 
 
 import net.dv8tion.jda.api.JDA;
@@ -14,26 +14,22 @@ import net.dv8tion.jda.api.interactions.components.LayoutComponent;
 import net.dv8tion.jda.api.requests.RestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
+import wtf.beatrice.hidekobot.datasources.DatabaseSource;
 import wtf.beatrice.hidekobot.objects.commands.SlashCommand;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Component
+public class CommandUtil
-public class CommandService
 {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CommandService.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CommandUtil.class);
 
-    private final DatabaseService databaseService;
+    private CommandUtil()
-
-    public CommandService(@Autowired DatabaseService databaseService)
     {
-        this.databaseService = databaseService;
+        throw new IllegalStateException("Utility class");
     }
 
     /**
@@ -42,37 +38,18 @@ public class CommandService
      *
      * @param event the button interaction event.
      */
-    public void deleteUserLinkedMessage(ButtonInteractionEvent event)
+    public static void delete(ButtonInteractionEvent event)
     {
         // check if the user interacting is the same one who ran the command
-        if (!databaseService.isUserTrackedFor(event.getUser().getId(), event.getMessageId()))
+        if (!(Cache.getDatabaseSource().isUserTrackedFor(event.getUser().getId(), event.getMessageId())))
         {
             event.reply("❌ You did not run this command!").setEphemeral(true).queue();
             return;
         }
 
-        // Acknowledge immediately so the interaction token stays valid
+        // delete the message
-        event.deferEdit().queue(hook -> {
+        event.getInteraction().getMessage().delete().queue();
-                    // Try deleting via the interaction webhook (works for original interaction responses)
+        // no need to manually untrack it from database, it will be purged on the next planned check.
-                    hook.deleteOriginal().queue(
-                            success -> { /* optional: databaseService.untrackExpiredMessage(event.getMessageId()); */ },
-                            failure -> {
-                                // Fallback to channel delete (works even if webhook token expired)
-                                event.getChannel().deleteMessageById(event.getMessageId()).queue(
-                                        null,
-                                        __ -> { /* ignore if already deleted */ }
-                                );
-                            }
-                    );
-                },
-                failure -> {
-                    // If we failed to acknowledge (interaction already expired), try channel delete anyway
-                    event.getChannel().deleteMessageById(event.getMessageId()).queue(
-                            null,
-                            __ -> { /* ignore if already deleted */ }
-                    );
-                }
-        );
     }
 
 
@@ -83,7 +60,7 @@ public class CommandService
      *
      * @param force a boolean specifying if the update should be forced even if no differences were found.
      */
-    public void updateSlashCommands(boolean force)
+    public static void updateSlashCommands(boolean force)
     {
 
         // populate commands list from registered commands
@@ -183,46 +160,48 @@ public class CommandService
      *
      * @param messageId the message id to disable.
      */
-    public void disableExpired(String messageId)
+    public static void disableExpired(String messageId)
     {
-        String channelId = databaseService.getQueuedExpiringMessageChannel(messageId);
+        DatabaseSource databaseSource = Cache.getDatabaseSource();
+
+        String channelId = databaseSource.getQueuedExpiringMessageChannel(messageId);
 
         // todo: warning, the following method + related if check are thread-locking.
         // todo: we should probably merge the two tables somehow, since they have redundant information.
-        ChannelType msgChannelType = databaseService.getTrackedMessageChannelType(messageId);
+        ChannelType msgChannelType = databaseSource.getTrackedMessageChannelType(messageId);
 
         MessageChannel textChannel = null;
 
         // this should never happen, but only message channels are supported.
         if (!msgChannelType.isMessage())
         {
-            databaseService.untrackExpiredMessage(messageId);
+            databaseSource.untrackExpiredMessage(messageId);
             return;
         }
 
         // if this is a DM
         if (!(msgChannelType.isGuild()))
         {
-            String userId = databaseService.getTrackedReplyUserId(messageId);
+            String userId = databaseSource.getTrackedReplyUserId(messageId);
             User user = userId == null ? null : HidekoBot.getAPI().retrieveUserById(userId).complete();
             if (user == null)
             {
                 // if user is not found, consider it expired
                 // (deleted profile, or blocked the bot)
-                databaseService.untrackExpiredMessage(messageId);
+                databaseSource.untrackExpiredMessage(messageId);
                 return;
             }
 
             textChannel = user.openPrivateChannel().complete();
         } else
         {
-            String guildId = databaseService.getQueuedExpiringMessageGuild(messageId);
+            String guildId = databaseSource.getQueuedExpiringMessageGuild(messageId);
             Guild guild = guildId == null ? null : HidekoBot.getAPI().getGuildById(guildId);
             if (guild == null)
             {
                 // if guild is not found, consider it expired
                 // (server was deleted or bot was kicked)
-                databaseService.untrackExpiredMessage(messageId);
+                databaseSource.untrackExpiredMessage(messageId);
                 return;
             }
             textChannel = guild.getTextChannelById(channelId);
@@ -232,7 +211,7 @@ public class CommandService
         {
             // if channel is not found, count it as expired
             // (channel was deleted or bot permissions restricted)
-            databaseService.untrackExpiredMessage(messageId);
+            databaseSource.untrackExpiredMessage(messageId);
             return;
         }
 
@@ -245,7 +224,7 @@ public class CommandService
                 message -> {
                     if (message == null)
                     {
-                        databaseService.untrackExpiredMessage(messageId);
+                        databaseSource.untrackExpiredMessage(messageId);
                         return;
                     }
 
@@ -258,9 +237,9 @@ public class CommandService
                     }
 
                     message.editMessageComponents(newComponents).queue();
-                    databaseService.untrackExpiredMessage(messageId);
+                    databaseSource.untrackExpiredMessage(messageId);
                 },
 
-                error -> databaseService.untrackExpiredMessage(messageId));
+                error -> databaseSource.untrackExpiredMessage(messageId));
     }
 }

src/main/java/wtf/beatrice/hidekobot/util/Logger.java

@@ -0,0 +1,71 @@
+package wtf.beatrice.hidekobot.util;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+@Deprecated(since = "0.5.16", forRemoval = true)
+public class Logger<T>
+{
+
+    // objects that we need to have for a properly formatted message
+    private final String className;
+    private final String format = "[%date% %time%] [%class%] %message%";
+    private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+
+
+    // when initializing a new logger, save variables in that instance
+    public Logger(Class<T> logClass)
+    {
+        className = logClass.getSimpleName();
+    }
+
+    /**
+     * Logs a message to console, following a specific format.
+     *
+     * @param message the message to log
+     */
+    public void log(String message)
+    {
+        LocalDateTime now = LocalDateTime.now();
+        String currentDate = dateFormatter.format(now);
+        String currentTime = timeFormatter.format(now);
+        logRaw(format
+                .replace("%date%", currentDate)
+                .replace("%time%", currentTime)
+                .replace("%class%", className)
+                .replace("%message%", message));
+    }
+
+    /**
+     * Logs a message to console, after delaying it.
+     *
+     * @param message the message to log
+     * @param delay   the time to wait before logging, in seconds
+     */
+    public void log(String message, int delay)
+    {
+        // create a new scheduled executor with an anonymous runnable...
+        //... after waiting <delay> seconds.
+        try (ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor())
+        {
+            executor.schedule(() -> log(message), delay, TimeUnit.SECONDS);
+        }
+
+    }
+
+    /**
+     * Prints a message to console without any formatting.
+     *
+     * @param message the message to log
+     */
+    public void logRaw(String message)
+    {
+        System.out.println(message);
+    }
+
+
+}

src/main/java/wtf/beatrice/hidekobot/util/Services.java

@@ -1,8 +0,0 @@
-package wtf.beatrice.hidekobot.util;
-
-import wtf.beatrice.hidekobot.services.CommandService;
-import wtf.beatrice.hidekobot.services.DatabaseService;
-
-public record Services(CommandService commandService, DatabaseService databaseService)
-{
-}

src/main/resources/application.properties

@@ -1,8 +0,0 @@
-spring.datasource.url=jdbc:sqlite:${APP_HOME}/db.sqlite
-spring.datasource.driver-class-name=org.sqlite.JDBC
-# let Hibernate create/update tables for you during the migration
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect
-# optional logging while migrating
-#spring.jpa.show-sql=true
-#spring.jpa.properties.hibernate.format_sql=true