Switch to DB-backed channel configuration

Closes #3

Author: Chew

build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     id("java")
     application
+    kotlin("jvm") version "1.6.10"
 }
 
 group = "pw.chew"
@@ -22,7 +23,9 @@ dependencies {
     implementation("pw.chew", "jda-chewtils", "2.0-SNAPSHOT")
     implementation("org.json", "json", "20230227")
     implementation("ch.qos.logback", "logback-classic", "1.4.5")
+    implementation("mysql", "mysql-connector-java", "8.0.28")
     implementation("org.mapdb", "mapdb", "3.0.9")
+    implementation("org.hibernate", "hibernate-core", "5.6.5.Final")
     implementation("com.github.ben-manes.caffeine", "caffeine", "3.1.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
@@ -33,6 +36,11 @@ tasks.getByName<Test>("test") {
     useJUnitPlatform()
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.apiVersion = "1.6"
+}
+
 application {
     mainClass.set("pw.chew.mlb.MLBBot")
 }

src/main/java/pw/chew/chewbotcca/util/DatabaseHelper.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 Chewbotcca
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package pw.chew.chewbotcca.util;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import pw.chew.mlb.models.Channel;
+
+import java.io.File;
+
+public class DatabaseHelper {
+    private static SessionFactory sessionFactory;
+
+    public static void openConnection() {
+        // A SessionFactory is set up once for an application!
+        final StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
+            .loadProperties(new File("bot.properties"))
+            .build();
+        try {
+            sessionFactory = new MetadataSources(registry)
+                // MLB Bot - Change to channel
+                .addAnnotatedClass(Channel.class)
+                .buildMetadata()
+                .buildSessionFactory();
+        } catch (Exception e) {
+            // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
+            // so destroy it manually.
+            e.printStackTrace();
+            StandardServiceRegistryBuilder.destroy(registry);
+        }
+    }
+
+    public static SessionFactory getSessionFactory() {
+        return sessionFactory;
+    }
+}

src/main/java/pw/chew/mlb/MLBBot.java

@@ -10,6 +10,7 @@
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pw.chew.chewbotcca.util.DatabaseHelper;
 import pw.chew.chewbotcca.util.RestClient;
 import pw.chew.mlb.commands.AdminCommand;
 import pw.chew.mlb.commands.ConfigCommand;
@@ -40,11 +41,16 @@ public static void main(String[] args) throws IOException {
         Properties prop = new Properties();
         prop.load(new FileInputStream("bot.properties"));
 
+        // Initialize Database for storage
+        logger.info("Connecting to database...");
+        DatabaseHelper.openConnection();
+        logger.info("Connected!");
+
         // Initialize the waiter and client
         CommandClientBuilder client = new CommandClientBuilder();
 
         // Set the client settings
-        client.setActivity(Activity.customStatus("off day! see you tomorrow for WC :)"));
+        client.setActivity(Activity.customStatus("Thank you everyone for an amazing season. Lot of new features planned for 2024. Stay tuned :)"));
         client.setOwnerId("476488167042580481");
         client.setPrefix("woody!");
 

src/main/java/pw/chew/mlb/commands/AdminCommand.java

@@ -2,7 +2,6 @@
 
 import com.jagrosh.jdautilities.command.Command;
 import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.menu.EmbedPaginator;
 import com.jagrosh.jdautilities.menu.Paginator;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Activity;
@@ -13,7 +12,6 @@
 import pw.chew.mlb.MLBBot;
 import pw.chew.mlb.listeners.GameFeedHandler;
 import pw.chew.mlb.objects.ActiveGame;
-import pw.chew.mlb.objects.ChannelConfig;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -39,8 +37,6 @@ protected void execute(CommandEvent event) {
 
         if (args.startsWith("games")) {
             activeGames(event);
-        } else if (args.startsWith("config")) {
-            config(event);
         } else if (args.startsWith("stats")) {
             botStats(event);
         } else if (args.startsWith("export")) {
@@ -81,27 +77,6 @@ private void export(CommandEvent event) {
         }
     }
 
-    private void config(CommandEvent event) {
-        var config = new EmbedPaginator.Builder()
-            .waitOnSinglePage(false)
-            .setFinalAction(m -> {
-                try {
-                    m.clearReactions().queue();
-                } catch(PermissionException ignored) { }
-            })
-            .setEventWaiter(MLBBot.waiter)
-            .setTimeout(1, TimeUnit.MINUTES)
-            .clearItems();
-
-        for (String key : ConfigCommand.channelsMap.keySet()) {
-            ChannelConfig channelConfig = ConfigCommand.channelsMap.get(key);
-            if (channelConfig == null) continue;
-            config.addItems(ConfigCommand.ConfigGetSubCommand.buildConfigEmbed(channelConfig, key));
-        }
-
-        config.setText("There are %s total configs".formatted(ConfigCommand.channelsMap.size())).build().display(event.getChannel());
-    }
-
     public void activeGames(CommandEvent event) {
         var activeGames = new Paginator.Builder().setColumns(1)
             .setItemsPerPage(10)

src/main/java/pw/chew/mlb/commands/ConfigCommand.java

@@ -8,20 +8,11 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import org.mapdb.DB;
-import org.mapdb.DBMaker;
-import org.mapdb.HTreeMap;
-import org.mapdb.Serializer;
 import pw.chew.mlb.objects.ChannelConfig;
 
 import java.util.Arrays;
 
 public class ConfigCommand extends SlashCommand {
-    private static final DB db = DBMaker.fileDB("channels.db").fileMmapEnable().closeOnJvmShutdown().checksumHeaderBypass().make();
-    public static final HTreeMap<String, ChannelConfig> channelsMap = db
-        .hashMap("channels", Serializer.STRING, new ChannelConfig.EntrySerializer())
-        .createOrOpen();
-
     public ConfigCommand() {
         this.name = "config";
         this.help = "Configure MLB Bot for this channel";
@@ -42,9 +33,9 @@ public ConfigGetSubCommand() {
 
         @Override
         protected void execute(SlashCommandEvent event) {
-            ChannelConfig config = channelsMap.get(event.getChannel().getId());
+            ChannelConfig config = ChannelConfig.getConfig(event.getChannel().getId(), false);
             if (config == null) {
-                event.reply("This channel is has not been configured, and is using default settings. Run `/config set` to get started.").setEphemeral(true).queue();
+                event.reply("This channel has not been configured, and is using default settings. Run `/config set` to get started.").setEphemeral(true).queue();
                 return;
             }
 
@@ -70,29 +61,24 @@ public ConfigSetSubCommand() {
             this.userPermissions = new Permission[]{Permission.MANAGE_CHANNEL};
             this.options = Arrays.asList(
                 new OptionData(OptionType.BOOLEAN, "only_scoring_plays", "Only show scoring plays"),
-                new OptionData(OptionType.BOOLEAN, "game_advisories", "Show game advisories"),
-                new OptionData(OptionType.INTEGER, "reach_delay", "Delay for reach (non strikeout/walk)"),
-                new OptionData(OptionType.INTEGER, "k_or_bb_delay", "Delay for strikeout/walk")
+                new OptionData(OptionType.BOOLEAN, "game_advisories", "Show game advisories, e.g. pitching changes"),
+                new OptionData(OptionType.INTEGER, "in_play_delay", "Delay for \"In Play\" (non strikeout/walk)"),
+                new OptionData(OptionType.INTEGER, "no_play_delay", "Delay for strikeout/walk, usually appears quicker")
                 /*, new OptionData(OptionType.BOOLEAN, "show_score_on_out_3", "Show score on out 3") */
             );
         }
 
         @Override
         protected void execute(SlashCommandEvent event) {
-            ChannelConfig current = channelsMap.get(event.getChannel().getId());
-            if (current == null) {
-                current = new ChannelConfig();
-            }
+            ChannelConfig current = ChannelConfig.getConfig(event.getChannel().getId(), true);
 
-            ChannelConfig config = new ChannelConfig(
-                event.optBoolean("only_scoring_plays", current.onlyScoringPlays()),
-                event.optBoolean("game_advisories", current.gameAdvisories()),
-                event.getOption("reach_delay", current.inPlayDelay(), OptionMapping::getAsInt),
-                event.getOption("k_or_bb_delay", current.noPlayDelay(), OptionMapping::getAsInt),
-                event.optBoolean("show_score_on_out_3", current.showScoreOnOut3())
-            );
+            current.update("OnlyScoringPlays", event.optBoolean("only_scoring_plays", current.onlyScoringPlays()));
+            current.update("GameAdvisories", event.optBoolean("game_advisories", current.gameAdvisories()));
+            current.update("InPlayDelay", event.getOption("in_play_delay", current.inPlayDelay(), OptionMapping::getAsInt));
+            current.update("NoPlayDelay", event.getOption("no_play_delay", current.noPlayDelay(), OptionMapping::getAsInt));
+            //current.update("showScoreOnOut3", event.optBoolean("show_score_on_out_3", current.showScoreOnOut3()));
 
-            channelsMap.put(event.getChannel().getId(), config);
+            current.saveData();
 
             event.reply("Configuration updated!").setEphemeral(true).queue();
         }

src/main/java/pw/chew/mlb/listeners/GameFeedHandler.java

@@ -43,6 +43,8 @@ public class GameFeedHandler {
      */
     public static void addGame(ActiveGame game) {
         ACTIVE_GAMES.add(game);
+        // make sure config is cached
+        ChannelConfig.getConfig(game.channelId());
 
         if (!GAME_THREADS.containsKey(game.gamePk())) {
             Thread thread = new Thread(() -> runGame(game.gamePk()), "Game-" + game.gamePk());

src/main/java/pw/chew/mlb/models/Channel.kt

@@ -0,0 +1,59 @@
+package pw.chew.mlb.models
+
+import javax.persistence.Column
+import javax.persistence.Entity
+import javax.persistence.Id
+import javax.persistence.Table
+
+@Entity
+@Table(name = "channels")
+open class Channel {
+    @Id
+    @Column(name = "id", nullable = false)
+    open var id: Long? = null
+
+    /**
+     * Whether to only show scoring plays
+     */
+    @Column(name = "onlyScoringPlays")
+    open var onlyScoringPlays: Boolean = false
+
+    /**
+     * Whether to show game advisories
+     */
+    @Column(name = "gameAdvisories")
+    open var gameAdvisories: Boolean = true
+
+    /**
+     * The amount of time in seconds to delay an in-play ball (non strikeout/walk) before showing it. Default 13.
+     */
+    @Column(name = "inPlayDelay")
+    open var inPlayDelay: Int = 13
+
+    /**
+     * The amount of time in seconds to delay a strikeout/walk before showing it. Default 18.
+     */
+    @Column(name = "noPlayDelay")
+    open var noPlayDelay: Int = 18
+
+    /**
+     * Whether to show the score when the third out is recorded. Default true.
+     */
+    @Column(name = "showScoreOnOut3")
+    open var showScoreOnOut3: Boolean = true
+
+    fun setBoolean(info: String, newValue: Boolean) {
+        // Dynamically call the method based on the info
+        this.javaClass.getMethod("set${info}", Boolean::class.java).invoke(this, newValue)
+    }
+
+    fun setInt(info: String, newValue: Int) {
+        // Dynamically call the method based on the info
+        this.javaClass.getMethod("set${info}", Int::class.java).invoke(this, newValue)
+    }
+
+    fun get(info: String) {
+        // Dynamically call the method based on the info
+        this.javaClass.getMethod("get${info}").invoke(this)
+    }
+}