Move auto icons to a database

Author: Matyrobbrt

src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java

@@ -100,7 +100,6 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import net.dv8tion.jda.api.utils.messages.MessageRequest;
-import okhttp3.OkHttpClient;
 import org.flywaydb.core.Flyway;
 import org.jdbi.v3.core.Jdbi;
 import org.slf4j.Logger;

src/core/java/com/mcmoddev/mmdbot/core/database/jdbi/JdbiFactories.java

@@ -21,6 +21,7 @@
 package com.mcmoddev.mmdbot.core.database.jdbi;
 
 import com.mcmoddev.mmdbot.core.util.Constants;
+import net.dv8tion.jda.api.entities.ISnowflake;
 import org.jdbi.v3.core.argument.Argument;
 import org.jdbi.v3.core.argument.NullArgument;
 import org.jdbi.v3.core.config.ConfigRegistry;
@@ -43,16 +44,21 @@
 public final class JdbiFactories {
     private static final Map<Type, ArgumentFactory<?>> BY_TYPE_FACTORIES = new HashMap<>();
 
-    public static final ArgumentFactory<UUID> UUID = create(Types.JAVA_OBJECT, java.util.UUID.class, ((position, statement, ctx, value) -> statement.setString(position, value.toString())));
+    public static final ArgumentFactory<UUID> UUID = createAndRegister(Types.JAVA_OBJECT, java.util.UUID.class, ((position, statement, ctx, value) -> statement.setString(position, value.toString())));
+    public static final ArgumentFactory<ISnowflake> SNOWFLAKE = create(Types.BIGINT, ISnowflake.class, ((position, statement, ctx, value) -> statement.setLong(position, value.getIdLong())));
     public static final ArgumentFactory<List> LIST = create(Types.JAVA_OBJECT, List.class, ((position, statement, ctx, value) -> statement.setString(position, Constants.Gsons.NO_PRETTY_PRINTING.toJson(value))));
 
     public static <T> ArgumentFactory<T> create(int sqlType, Type type, Factory<T> factory) {
-        final var fct = new ArgumentFactory<T>(sqlType, type) {
+        return new ArgumentFactory<T>(sqlType, type) {
             @Override
             protected Argument build(final T value, final ConfigRegistry config) {
                 return (position, statement, ctx) -> factory.accept(position, statement, ctx, value);
             }
         };
+    }
+
+    public static <T> ArgumentFactory<T> createAndRegister(int sqlType, Type type, Factory<T> factory) {
+        final var fct = create(sqlType, type, factory);
         BY_TYPE_FACTORIES.put(type, fct);
         return fct;
     }
@@ -74,10 +80,12 @@ public JdbiArgumentFactory() {
 
         @Override
         public Optional<Argument> build(final Type type, final Object value, final ConfigRegistry config) {
-            if (List.class.isAssignableFrom(GenericTypes.getErasedType(type))) {
+            final Class<?> erased = GenericTypes.getErasedType(type);
+            if (List.class.isAssignableFrom(erased)) {
                 return LIST.build(type, value, config);
-            }
-            if (BY_TYPE_FACTORIES.containsKey(type)) {
+            } else if (ISnowflake.class.isAssignableFrom(erased)) {
+                return SNOWFLAKE.build(type, value, config);
+            } else if (BY_TYPE_FACTORIES.containsKey(erased)) {
                 return BY_TYPE_FACTORIES.get(type).build(type, value, config);
             }
             return Optional.empty();

src/painter/java/com/mcmoddev/mmdbot/painter/ThePainter.java

@@ -25,6 +25,7 @@
 import com.mcmoddev.mmdbot.core.bot.BotRegistry;
 import com.mcmoddev.mmdbot.core.bot.BotType;
 import com.mcmoddev.mmdbot.core.bot.RegisterBotType;
+import com.mcmoddev.mmdbot.core.database.jdbi.JdbiFactories;
 import com.mcmoddev.mmdbot.core.event.Events;
 import com.mcmoddev.mmdbot.core.util.DotenvLoader;
 import com.mcmoddev.mmdbot.core.util.TaskScheduler;
@@ -34,19 +35,25 @@
 import com.mcmoddev.mmdbot.painter.servericon.ServerIconCommand;
 import com.mcmoddev.mmdbot.painter.servericon.auto.AutomaticIconChanger;
 import com.mcmoddev.mmdbot.painter.servericon.auto.command.AutoIconSetCommand;
+import com.mcmoddev.mmdbot.painter.util.dao.AutoIconDAO;
+import com.mcmoddev.mmdbot.painter.util.dao.DayCounterDAO;
+import com.mcmoddev.mmdbot.painter.util.migration.AutoIconsMigration;
+import com.mcmoddev.mmdbot.painter.util.migration.DayCounterMigration;
 import io.github.cdimascio.dotenv.Dotenv;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
+import org.flywaydb.core.Flyway;
+import org.jdbi.v3.core.Jdbi;
+import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sqlite.SQLiteDataSource;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.Duration;
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Set;
@@ -93,6 +100,10 @@ public static ThePainter getInstance() {
 
     private JDA jda;
 
+    private Jdbi jdbi;
+    private DayCounterDAO dayCounter;
+    private AutoIconDAO autoIcons;
+
     public ThePainter(final Path runPath, final Dotenv dotenv) {
         this.dotenv = dotenv;
         this.runPath = runPath;
@@ -102,6 +113,10 @@ public ThePainter(final Path runPath, final Dotenv dotenv) {
     public void start() {
         instance = this;
 
+        this.jdbi = createDatabaseConnection(runPath);
+        this.dayCounter = jdbi.onDemand(DayCounterDAO.class);
+        this.autoIcons = jdbi.onDemand(AutoIconDAO.class);
+
         final var commandClient = new CommandClientBuilder()
             .setOwnerId("000000000000")
             .useHelpBuilder(false)
@@ -122,6 +137,12 @@ public void start() {
         }
     }
 
+    @Override
+    public void migrateData() throws IOException {
+        AutoIconsMigration.migrate(runPath);
+        DayCounterMigration.migrate(runPath);
+    }
+
     @Override
     public BotType<?> getType() {
         return BOT_TYPE;
@@ -140,10 +161,23 @@ public Path getRunPath() {
         return runPath;
     }
 
+    public Jdbi database() {
+        return jdbi;
+    }
+    public DayCounterDAO dayCounter() {
+        return dayCounter;
+    }
+    public AutoIconDAO autoIcon() {
+        return autoIcons;
+    }
+
     @Override
     public void shutdown() {
         instance = null;
         jda.shutdownNow();
+        jda = null;
+        jdbi = null;
+        dayCounter = null;
     }
 
     @SuppressWarnings({"MagicConstant"})
@@ -153,4 +187,29 @@ private static Date measureNext12PMUTC() {
         calendar.set(day.getYear(), day.getMonthValue() - 1, day.getDayOfMonth(), 0, 0, 0);
         return calendar.getTime();
     }
+
+    public static Jdbi createDatabaseConnection(final Path runPath) {
+        final var dbPath = runPath.resolve("data.db");
+        if (!Files.exists(dbPath)) {
+            try {
+                Files.createFile(dbPath);
+            } catch (IOException e) {
+                throw new RuntimeException("Exception creating database!", e);
+            }
+        }
+        final var url = "jdbc:sqlite:" + dbPath;
+        SQLiteDataSource dataSource = new SQLiteDataSource();
+        dataSource.setUrl(url);
+        dataSource.setDatabaseName(BotRegistry.THE_PAINTER_NAME);
+
+        final var flyway = Flyway.configure()
+            .dataSource(dataSource)
+            .locations("classpath:painter/db")
+            .load();
+        flyway.migrate();
+
+        return Jdbi.create(dataSource)
+            .installPlugin(new SqlObjectPlugin())
+            .registerArgument(JdbiFactories.JdbiArgumentFactory.FACTORY);
+    }
 }

src/painter/java/com/mcmoddev/mmdbot/painter/servericon/auto/AutomaticIconChanger.java

@@ -23,6 +23,8 @@
 import com.mcmoddev.mmdbot.core.util.Utils;
 import com.mcmoddev.mmdbot.painter.ThePainter;
 import com.mcmoddev.mmdbot.painter.util.ImageUtils;
+import com.mcmoddev.mmdbot.painter.util.dao.AutoIconDAO;
+import com.mcmoddev.mmdbot.painter.util.dao.DayCounterDAO;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Guild;
@@ -36,43 +38,44 @@ public class AutomaticIconChanger implements Runnable {
     @Override
     public void run() {
         if (ThePainter.getInstance() != null) {
-            final var dayCounter = DayCounter.read();
-            for (final var guild : ThePainter.getInstance().getJDA().getGuilds()) {
+            for (final AutoIconDAO.WithGuildConfiguration withGuild : ThePainter.getInstance().autoIcon().allEnabled()) {
+                final Guild guild = ThePainter.getInstance().getJDA().getGuildById(withGuild.guildId());
+                if (guild == null) {
+                    ThePainter.getInstance().autoIcon().delete(withGuild.guildId());
+                    return;
+                }
+
                 try {
-                    final var conf = AutomaticIconConfiguration.get(guild.getId());
-                    if (conf != null && conf.enabled()) {
-                        doRun(guild, conf, dayCounter);
-                        dayCounter.write();
-                    }
+                    doRun(guild, withGuild.configuration(), ThePainter.getInstance().dayCounter());
                 } catch (Exception exception) {
                     ThePainter.LOGGER.error("Encountered exception cycling icon for guild {}: ", guild, exception);
                 }
             }
         }
     }
 
-    private void doRun(Guild guild, AutomaticIconConfiguration configuration, DayCounter dayCounter) throws Exception {
-        final var current = dayCounter.getCurrentDay(guild);
+    private void doRun(Guild guild, AutomaticIconConfiguration configuration, DayCounterDAO dayCounter) throws Exception {
+        final var currentDay = dayCounter.getCurrentDay(guild);
         final int nextDay;
         final boolean backwards;
-        if (current.backwards()) {
-            if (current.day() <= 1) {
+        if (dayCounter.isBackwards(guild)) {
+            if (currentDay <= 1) {
                 // If the current day is 1, or lower, go to the start
                 nextDay = 2;
                 backwards = false;
             } else {
                 // Else, go to the previous day
-                nextDay = current.day() - 1;
+                nextDay = currentDay - 1;
                 backwards = true;
             }
         } else {
-            if (current.day() >= configuration.colours().size()) {
+            if (currentDay >= configuration.colours().size()) {
                 // If the current day is greater, or equal to the amount of colours, start going back
                 nextDay = configuration.colours().size() - 1;
                 backwards = true;
             } else {
                 // Else, go to the next day
-                nextDay = current.day() + 1;
+                nextDay = currentDay + 1;
                 backwards = false;
             }
         }
@@ -96,7 +99,7 @@ private void doRun(Guild guild, AutomaticIconConfiguration configuration, DayCou
             ))
             .queue();
 
-        dayCounter.setDay(guild, nextDay, backwards);
+        dayCounter.update(guild, nextDay, backwards);
     }
 
     private RestAction<?> logChange(MessageChannel channel, Guild guild, int newColour, int currentDay, boolean backwards) {

src/painter/java/com/mcmoddev/mmdbot/painter/servericon/auto/AutomaticIconConfiguration.java

@@ -20,45 +20,51 @@
  */
 package com.mcmoddev.mmdbot.painter.servericon.auto;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.mcmoddev.mmdbot.painter.ThePainter;
 import com.mcmoddev.mmdbot.painter.servericon.IconConfiguration;
 import com.mcmoddev.mmdbot.painter.servericon.ServerIconMaker;
+import org.jdbi.v3.core.statement.StatementContext;
 
-import javax.annotation.Nullable;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.lang.reflect.Type;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.List;
 
-public record AutomaticIconConfiguration(List<Integer> colours, long logChannelId, boolean isRing, boolean enabled) {
-    static final Gson GSON = new GsonBuilder()
+public record AutomaticIconConfiguration(
+    List<Integer> colours, long logChannelId, boolean isRing, boolean enabled
+) {
+    public static final Gson GSON = new GsonBuilder()
         .disableHtmlEscaping().create();
 
+    public String serializeColors() {
+        return GSON.toJson(colours());
+    }
+
     public BufferedImage createImage(int day) throws IOException {
         return ServerIconMaker.createIcon(IconConfiguration.builder()
             .setCircular(isRing).setHasRing(isRing)
             .setColour(colours.get(day - 1))
             .build());
     }
 
-    @Nullable
-    public static AutomaticIconConfiguration get(String guildId) throws IOException {
-        final var path = ThePainter.getInstance().getRunPath().resolve("autoicons").resolve(guildId + ".json");
-        if (Files.exists(path)) {
-            try (final var reader = Files.newBufferedReader(path)) {
-                return GSON.fromJson(reader, AutomaticIconConfiguration.class);
-            }
+    public static final class RowMapper implements org.jdbi.v3.core.mapper.RowMapper<AutomaticIconConfiguration> {
+        private static final Type COLOUR_LIST_TYPE = new TypeToken<List<Integer>>() {}.getType();
+
+        @Override
+        public AutomaticIconConfiguration map(final ResultSet rs, final StatementContext ctx) throws SQLException {
+            return from(rs);
         }
-        return null;
-    }
 
-    public void save(String guildId) throws IOException {
-        final var path = ThePainter.getInstance().getRunPath().resolve("autoicons").resolve(guildId + ".json");
-        if (!Files.exists(path)) Files.createDirectories(path.getParent());
-        try (final var writer = Files.newBufferedWriter(path)) {
-            GSON.toJson(this, writer);
+        public static AutomaticIconConfiguration from(final ResultSet rs) throws SQLException {
+            return new AutomaticIconConfiguration(
+                GSON.fromJson(rs.getString("colours"), COLOUR_LIST_TYPE),
+                rs.getLong("log_channel"),
+                rs.getBoolean("ring"), rs.getBoolean("enabled")
+            );
         }
     }
 }

src/painter/java/com/mcmoddev/mmdbot/painter/servericon/auto/command/AutoIconEnableCommands.java

@@ -22,9 +22,8 @@
 
 import com.jagrosh.jdautilities.command.SlashCommand;
 import com.jagrosh.jdautilities.command.SlashCommandEvent;
+import com.mcmoddev.mmdbot.painter.ThePainter;
 import com.mcmoddev.mmdbot.painter.servericon.ServerIconCommand;
-import com.mcmoddev.mmdbot.painter.servericon.auto.AutomaticIconConfiguration;
-import lombok.SneakyThrows;
 
 public class AutoIconEnableCommands {
     public static final class DisableCommand extends SlashCommand {
@@ -35,14 +34,8 @@ public DisableCommand() {
         }
 
         @Override
-        @SneakyThrows
         protected void execute(final SlashCommandEvent event) {
-            final var cfg = AutomaticIconConfiguration.get(event.getGuild().getId());
-            if (cfg == null) {
-                event.getHook().editOriginal("Server has no icon configuration!").queue();
-                return;
-            }
-            new AutomaticIconConfiguration(cfg.colours(), cfg.logChannelId(), cfg.isRing(), false).save(event.getGuild().getId());
+            ThePainter.getInstance().autoIcon().setEnabled(event.getGuild(), false);
             event.reply("Successfully disabled auto icon.").queue();
         }
     }
@@ -55,14 +48,8 @@ public EnableCommand() {
         }
 
         @Override
-        @SneakyThrows
         protected void execute(final SlashCommandEvent event) {
-            final var cfg = AutomaticIconConfiguration.get(event.getGuild().getId());
-            if (cfg == null) {
-                event.getHook().editOriginal("Server has no icon configuration!").queue();
-                return;
-            }
-            new AutomaticIconConfiguration(cfg.colours(), cfg.logChannelId(), cfg.isRing(), true).save(event.getGuild().getId());
+            ThePainter.getInstance().autoIcon().setEnabled(event.getGuild(), true);
             event.reply("Successfully enabled auto icon.").queue();
         }
     }