Implement mysql/mariadb locally to get rid of web database (#297)

* Now I know this sounds bad

* Add first mysql query

* Add sql dialects

* I can mostly copy-paste this shit :D

* Implement loading of guild settings

* Bot boots on mysql

* Edit keys in prod

* Mutes and stuff

* Most moderator actions

* Finish mysql implementation

* Strip out web database

* Lint code

* When you tell java to use UTC but it is still in local time

* getting closer

* It works

* Cleanup

* Remove sout

* Undo one change

* Cleanup

* Cleanup

Author: duncte123

.idea/sqldialects.xml

@@ -76,8 +76,8 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.time.Instant;
-import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.*;
@@ -283,6 +283,7 @@ public CommandManager(Variables variables) {
         this.addCommand(new TagCommand(variables));
         this.addCommand(new TempBanCommand());
         this.addCommand(new TempMuteCommand());
+//        this.addCommand(new TestFilterCommand());
         this.addCommand(new TestTagCommand());
         this.addCommand(new TheSearchCommand());
         this.addCommand(new ToggleAnnounceTracksCommand());
@@ -413,7 +414,7 @@ public void runCommand(MessageReceivedEvent event, String customPrefix) {
     }
 
     public void setCooldown(String key, int seconds) {
-        COOLDOWNS.put(key, OffsetDateTime.now(ZoneOffset.UTC).plusSeconds(seconds).toEpochSecond());
+        COOLDOWNS.put(key, ZonedDateTime.now(ZoneOffset.UTC).plusSeconds(seconds).toEpochSecond());
     }
 
     public long getRemainingCooldown(String key) {
@@ -703,9 +704,9 @@ private void addCommand(ICommand<CommandContext> command) {
     }
 
     private static long calcTimeRemaining(long startTime) {
-        // Get the start time as an OffsetDateTime
-        final OffsetDateTime startTimeOffset = Instant.ofEpochSecond(startTime).atOffset(ZoneOffset.UTC);
+        // Get the start time as an ZonedDateTime
+        final ZonedDateTime startTimeOffset = Instant.ofEpochSecond(startTime).atZone(ZoneOffset.UTC);
         // get the time that is left for the cooldown
-        return OffsetDateTime.now(ZoneOffset.UTC).until(startTimeOffset, ChronoUnit.SECONDS);
+        return ZonedDateTime.now(ZoneOffset.UTC).until(startTimeOffset, ChronoUnit.SECONDS);
     }
 }

bot/src/main/java/ml/duncte123/skybot/CommandManager.java

@@ -78,8 +78,8 @@ private SkyBot() throws LoginException {
 
         if ("psql".equals(useDatabase)) {
             logger.info("Using PostgreSQL as database impl");
-        } else if ("web".equals(useDatabase)) {
-            logger.warn("Using web api for all connections, please migrate to PostgreSQL");
+        } else if ("mysql".equals(useDatabase)) {
+            logger.warn("Using native MariaDB connection, please migrate to PostgreSQL");
         } else {
             shardManager = null; // for compiling n' stuff
             logger.error("Unknown database driver \"{}\", exiting!", useDatabase);

bot/src/main/java/ml/duncte123/skybot/SkyBot.java

@@ -32,8 +32,8 @@
 import me.duncte123.weebJava.models.WeebApi;
 import me.duncte123.weebJava.types.TokenType;
 import ml.duncte123.skybot.database.AbstractDatabase;
+import ml.duncte123.skybot.database.MariaDBDatabase;
 import ml.duncte123.skybot.database.PostgreDatabase;
-import ml.duncte123.skybot.database.WebDatabase;
 import ml.duncte123.skybot.objects.DBMap;
 import ml.duncte123.skybot.objects.api.DuncteApis;
 import ml.duncte123.skybot.objects.apis.BlargBot;
@@ -172,13 +172,11 @@ public AbstractDatabase getDatabase() {
                 return null;
             };
 
-            if ("psql".equals(this.config.useDatabase)) {
-                this.database = new PostgreDatabase(this.config.jdbcURI, ohShitFn);
-            } else if ("web".equals(this.config.useDatabase)) {
-                this.database = new WebDatabase(this.getApis(), this.getJackson(), ohShitFn);
-            } else {
-                throw new IllegalArgumentException("Unknown database engine: " + this.config.useDatabase);
-            }
+            this.database = switch (this.config.useDatabase) {
+                case "psql" -> new PostgreDatabase(this.config.jdbcURI, ohShitFn);
+                case "mysql" -> new MariaDBDatabase(this.config.jdbcURI, ohShitFn);
+                default -> throw new IllegalArgumentException("Unknown database engine: " + this.config.useDatabase);
+            };
         }
 
         return this.database;

bot/src/main/java/ml/duncte123/skybot/Variables.java

@@ -26,7 +26,7 @@
 import ml.duncte123.skybot.objects.command.Flag;
 
 import javax.annotation.Nonnull;
-import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -111,7 +111,7 @@ public void execute(@Nonnull CommandContext ctx) {
             return;
         }
 
-        final OffsetDateTime expireDate = getDatabaseDate(duration);
+        final ZonedDateTime expireDate = getDatabaseDate(duration);
 
         createReminder(ctx, expireDate, reminder, flags, duration);
     }
@@ -125,7 +125,7 @@ private Optional<ParsedDuration> getDuration(Map<String, List<String>> flags) {
         }
     }
 
-    private void createReminder(CommandContext ctx, OffsetDateTime expireDate, String reminder, Map<String, List<String>> flags, ParsedDuration duration) {
+    private void createReminder(CommandContext ctx, ZonedDateTime expireDate, String reminder, Map<String, List<String>> flags, ParsedDuration duration) {
         final boolean inChannel = flags.containsKey("c");
         final String where = inChannel ? " here" : "";
 

bot/src/main/java/ml/duncte123/skybot/commands/essentials/RemindmeCommand.java

@@ -95,17 +95,19 @@ private void deleteOrShowCustomCommand(List<String> args, CommandContext ctx, Co
 
         //Check for deleting
         if ("raw".equalsIgnoreCase(args.get(0))) {
-            if (!commandExists(commandName, guildId, manager)) {
+            final var cmd = manager.getCustomCommand(name, guildId);
+
+            if (cmd == null) {
                 sendMsg(ctx, "No command was found for this name");
                 return;
             }
 
-            final CustomCommand cmd = manager.getCustomCommand(commandName, guildId);
             final String escaped = cmd.getMessage().replaceAll("`", "");
             sendMsg(ctx, "Raw data for `" + commandName + "`:```pascal\n" + escaped + "\n```");
         } else if ("delete".equalsIgnoreCase(args.get(0)) || "remove".equalsIgnoreCase(args.get(0))) {
+            final var cmd = manager.getCustomCommand(name, guildId);
 
-            if (!commandExists(commandName, guildId, manager)) {
+            if (cmd == null) {
                 sendMsg(ctx, "No command was found for this name");
                 return;
             }
@@ -138,9 +140,10 @@ private void addOrEditCustomCommand(List<String> args, CommandContext ctx, Comma
 
         final String commandAction = String.join(" ", args.subList(2, args.size()));
         final long guildId = ctx.getGuild().getIdLong();
+        final var cmd = manager.getCustomCommand(name, guildId);
 
-        if (commandExists(commandName, guildId, manager)) {
-            editCustomCommand(args, ctx, manager, commandName, commandAction, guildId);
+        if (cmd != null) {
+            editCustomCommand(args, ctx, manager, cmd, commandAction);
 
             return;
         }
@@ -150,7 +153,7 @@ private void addOrEditCustomCommand(List<String> args, CommandContext ctx, Comma
 
     private void createCustomCommand(CommandContext ctx, CommandManager manager, String commandName, String commandAction, long guildId) {
         try {
-            final CommandResult result = registerCustomCommand(commandName, commandAction, guildId, manager);
+            final CommandResult result = manager.registerCustomCommand(new CustomCommand(commandName, commandAction, guildId, false));
 
             if (result == CommandResult.SUCCESS) {
                 sendMsg(ctx, "Command added.");
@@ -176,22 +179,18 @@ private void createCustomCommand(CommandContext ctx, CommandManager manager, Str
         }
     }
 
-    private void editCustomCommand(List<String> args, CommandContext ctx, CommandManager manager, String commandName, String commandAction, long guildId) {
+    private void editCustomCommand(List<String> args, CommandContext ctx, CommandManager manager, CustomCommand cmd, String newAction) {
         if (!"edit".equalsIgnoreCase(args.get(0)) && !"change".equalsIgnoreCase(args.get(0))) {
-            sendMsg(ctx, "A command already exists for this server.");
+            sendMsg(ctx, "A command with this name already exists for this server.");
 
             return;
         }
 
-        if (editCustomCommand(manager.getCustomCommand(commandName, guildId), commandAction, manager)) {
+        if (editCustomCommand(cmd, newAction, manager)) {
             sendMsg(ctx, "The command has been updated.");
         }
     }
 
-    private CommandResult registerCustomCommand(String name, String action, long guildId, CommandManager manager) {
-        return manager.registerCustomCommand(new CustomCommand(name, action, guildId, false));
-    }
-
     private boolean editCustomCommand(@Nullable CustomCommand customCommand, String newMessage, CommandManager manager) {
         if (customCommand == null) {
             return false;
@@ -206,8 +205,4 @@ private boolean editCustomCommand(@Nullable CustomCommand customCommand, String
 
         return manager.editCustomCommand(cmd);
     }
-
-    private boolean commandExists(String name, long guild, CommandManager manager) {
-        return manager.getCustomCommand(name, guild) != null;
-    }
 }

bot/src/main/java/ml/duncte123/skybot/commands/guild/owner/CustomCommandCommand.java

@@ -91,8 +91,12 @@ private void onReady(ReadyEvent event) {
                 TimeUnit.DAYS
             );
 
-            if ("psql".equals(this.variables.getConfig().useDatabase)) {
+            if (
+                "psql".equals(this.variables.getConfig().useDatabase) ||
+                    "mysql".equals(this.variables.getConfig().useDatabase)
+            ) {
                 DataTimers.startReminderTimer(this.variables, LOGGER);
+                DataTimers.startWarningTimer(this.variables, LOGGER);
                 DataTimers.startUnbanTimer(this.variables, LOGGER);
             }
 
@@ -138,6 +142,13 @@ private void onShutdown() {
         // shut down weeb.java
         this.variables.getWeebApi().shutdown();
         LOGGER.info("Weeb.java shutdown");
+
+        try {
+            this.variables.getDatabase().close();
+        } catch (Exception e) {
+            LOGGER.error("Failed to close database", e);
+        }
+
         LOGGER.info("Bot and JDA shutdown cleanly");
     }
 }

bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java

@@ -54,8 +54,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -286,6 +286,8 @@ public static void handleExpiredReminders(List<Reminder> reminders, AbstractData
                         errorResponse == ErrorResponse.CANNOT_SEND_TO_USER
                 ) {
                     toPurge.add(reminder.getId());
+                } else {
+                    errorResponseEx.printStackTrace();
                 }
             }
             catch (Exception e) {
@@ -294,7 +296,7 @@ public static void handleExpiredReminders(List<Reminder> reminders, AbstractData
         }
 
         // get a date that is 2 days in the future
-        final OffsetDateTime plusTwoDays = OffsetDateTime.now(ZoneOffset.UTC).plus(2L, ChronoUnit.DAYS);
+        final ZonedDateTime plusTwoDays = ZonedDateTime.now(ZoneOffset.UTC).plus(2L, ChronoUnit.DAYS);
 
         // Remove any reminders that have not been removed after 2 days
         final List<Integer> extraRemoval = reminders.stream()

bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java

@@ -100,10 +100,4 @@ private static GuildSetting registerNewGuild(long guildId, Variables variables,
 
         return newGuildSettings;
     }
-
-    public static void updateEmbedColor(long guildId, int color, Variables variables) {
-        getGuild(guildId, variables).setEmbedColor(color);
-        // TODO: save guild setting instead, we've deprecated this
-        variables.getDatabase().updateOrCreateEmbedColor(guildId, color);
-    }
 }

bot/src/main/java/ml/duncte123/skybot/utils/GuildSettingsUtils.java

@@ -197,7 +197,7 @@ public static void handleUnmute(List<Mute> mutes, AbstractDatabase database, Var
 
             final User targetUser = target.getUser();
 
-            LOG.debug("Unmuting " + mute.getUserTag());
+            LOG.debug("Unmuting " + mute.getId());
 
             final DunctebotGuild dbGuild = new DunctebotGuild(guild, variables);
             final long muteRoleId = dbGuild.getSettings().getMuteRoleId();