Move TheListener to JDA (#185)

* Move half of the events to JDA

* Move RoleEvents

* Finish move to JDA

* Few tweaks

* Add timeout events

* Re-add List argument check in the JDBI arg factory

Author: Matyrobbrt

build.gradle

@@ -43,9 +43,6 @@ configurations {
   shade
   implementation.extendsFrom(shade)
 
-  d4j
-  listenerImplementation.extendsFrom(d4j)
-
   global
   coreImplementation.extendsFrom(global)
   implementation.extendsFrom(global)
@@ -58,6 +55,7 @@ configurations {
   implementation.extendsFrom(jda)
   commanderImplementation.extendsFrom(jda)
   watcherImplementation.extendsFrom(jda)
+  listenerImplementation.extendsFrom(jda)
 
   globalCompile
   coreCompileOnly.extendsFrom(globalCompile)
@@ -107,8 +105,6 @@ dependencies {
   }
   jda libs.chewtils
 
-  d4j libs.discord4j
-
   global libs.guava
   global libs.gson
   global libs.logback
@@ -133,9 +129,6 @@ dependencies {
   globalCompile libs.annotations
   globalCompile libs.lombok
 
-  listenerCompileOnly libs.immutables.value
-  listenerCompileOnly libs.immutables.builder
-
   global libs.jdbi.core
   global libs.jdbi.sqlobject
 
@@ -156,7 +149,7 @@ tasks.named('shadowJar', ShadowJar).configure {
   sourceSets.forEach({
     from it.output
   })
-  configurations = [project.configurations.jda, project.configurations.global, project.configurations.d4j]
+  configurations = [project.configurations.jda, project.configurations.global]
   manifest.attributes(makeManifestAttributes())
   classifier("all")
   group("build")
@@ -172,7 +165,7 @@ tasks.named(JavaPlugin.JAR_TASK_NAME, Jar).configure {
   dependsOn(tasks.getByName("updateLicenses"))
 }
 
-configureBotJar("theListener", sourceSets.listener, Arrays.asList("d4j"))
+configureBotJar("theListener", sourceSets.listener, Arrays.asList("jda"))
 configureBotJar("theWatcher", sourceSets.watcher, Arrays.asList("jda"))
 configureBotJar("theCommander", sourceSets.commander, Arrays.asList("jda"))
 

relauncher

@@ -33,6 +33,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
+import javax.security.auth.login.LoginException;
 import java.io.BufferedWriter;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -110,7 +111,11 @@ public static void main(String[] a) {
                                 }, 5, TimeUnit.SECONDS); // Give the bot 5 seconds to startup.. it
                                 // should add its listeners till then
                             }
-                            bot.start();
+                            try {
+                                bot.start();
+                            } catch (LoginException e) {
+                                bot.getLogger().error("Exception logging in: ", e);
+                            }
                             botsAmount.incrementAndGet();
                             bot.getLogger().warn("Bot {} has been found, and it has been launched!", botEntry.name());
                         }).exceptionally(t -> {

src/core/java/com/mcmoddev/mmdbot/core/RunBots.java

@@ -22,11 +22,12 @@
 
 import org.slf4j.Logger;
 
+import javax.security.auth.login.LoginException;
 import java.io.IOException;
 
 public interface Bot {
 
-    void start();
+    void start() throws LoginException;
 
     BotType<?> getType();
 

src/core/java/com/mcmoddev/mmdbot/core/bot/Bot.java

@@ -53,7 +53,7 @@ public class SQLComponentStorage implements ComponentStorage {
 
         // Install the SQL Objects and Guava plugins
         jdbi.installPlugin(new SqlObjectPlugin());
-        jdbi.registerArgument(new JdbiFactories.JdbiArgumentFactory());
+        jdbi.registerArgument(JdbiFactories.JdbiArgumentFactory.FACTORY);
         jdbi.registerRowMapper(Component.class, (rs, ctx) ->
             new Component(rs.getString(FEATURE_ROW_NAME),
                 UUID.fromString(rs.getString(ID_ROW_NAME)),
@@ -70,7 +70,7 @@ public void insertComponent(Component component) {
             ))
             .bind(FEATURE_ROW_NAME, component.featureId())
             .bind(ID_ROW_NAME, component.uuid())
-            .bind(ARGUMENTS_ROW_NAME, listToString(component.arguments()))
+            .bind(ARGUMENTS_ROW_NAME, component.arguments())
             .bind(LIFESPAN_ROW_NAME, component.lifespan().toString())
             .bind(LAST_USED_ROW_NAME, Instant.now())
             .execute());
@@ -93,7 +93,7 @@ public void updateArguments(UUID id, List<String> newArguments) {
         jdbi.useHandle(handle -> handle.createUpdate("update %s set %s = :args, %s = :last_used where %s = :id".formatted(
                 tableName, ARGUMENTS_ROW_NAME, LAST_USED_ROW_NAME, ID_ROW_NAME
             ))
-            .bind("args", listToString(newArguments))
+            .bind("args", newArguments)
             .bind("id", id.toString())
             .bind("last_used", Instant.now())
             .execute());
@@ -131,10 +131,6 @@ public void removeComponentsLastUsedBefore(Instant before) {
     private static final Type STRING_LIST_TYPE = new TypeToken<List<String>>() {
     }.getType();
 
-    private static String listToString(final List<String> list) {
-        return Constants.Gsons.NO_PRETTY_PRINTING.toJson(list, STRING_LIST_TYPE);
-    }
-
     private static List<String> listFromString(final String string) {
         return Constants.Gsons.NO_PRETTY_PRINTING.fromJson(string, STRING_LIST_TYPE);
     }

src/core/java/com/mcmoddev/mmdbot/core/commands/component/storage/SQLComponentStorage.java

@@ -20,32 +20,34 @@
  */
 package com.mcmoddev.mmdbot.core.database.jdbi;
 
-import org.jdbi.v3.core.argument.AbstractArgumentFactory;
+import com.mcmoddev.mmdbot.core.util.Constants;
 import org.jdbi.v3.core.argument.Argument;
-import org.jdbi.v3.core.argument.ArgumentFactory;
+import org.jdbi.v3.core.argument.NullArgument;
 import org.jdbi.v3.core.config.ConfigRegistry;
+import org.jdbi.v3.core.generic.GenericTypes;
 import org.jdbi.v3.core.statement.StatementContext;
+import org.jdbi.v3.core.statement.UnableToCreateStatementException;
 
 import java.lang.reflect.Type;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.function.Function;
 
-public abstract class JdbiFactories<T> extends AbstractArgumentFactory<T> {
-    private static final Map<Type, AbstractArgumentFactory<?>> BY_TYPE_FACTORIES = new HashMap<>();
+@SuppressWarnings("rawtypes")
+public final class JdbiFactories {
+    private static final Map<Type, ArgumentFactory<?>> BY_TYPE_FACTORIES = new HashMap<>();
 
-    public static final AbstractArgumentFactory<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 = create(Types.JAVA_OBJECT, java.util.UUID.class, ((position, statement, ctx, value) -> statement.setString(position, value.toString())));
+    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))));
 
-    JdbiFactories(final int sqlType) {
-        super(sqlType);
-    }
-
-    public static <T> JdbiFactories<T> create(int sqlType, Type type, Factory<T> factory) {
-        final var fct = new JdbiFactories<T>(sqlType) {
+    public static <T> ArgumentFactory<T> create(int sqlType, Type type, Factory<T> factory) {
+        final var fct = 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);
@@ -56,18 +58,85 @@ protected Argument build(final T value, final ConfigRegistry config) {
     }
 
     @FunctionalInterface
-    interface Factory<T> {
+    private interface Factory<T> {
         void accept(int position, PreparedStatement statement, StatementContext ctx, T value) throws SQLException;
     }
 
-    public static final class JdbiArgumentFactory implements ArgumentFactory {
+    /**
+     * A factory for argument factories defined in {@link JdbiFactories}.
+     */
+    public static final class JdbiArgumentFactory implements org.jdbi.v3.core.argument.ArgumentFactory {
+
+        public static final JdbiArgumentFactory FACTORY = new JdbiArgumentFactory();
+
+        private JdbiArgumentFactory() {}
 
         @Override
         public Optional<Argument> build(final Type type, final Object value, final ConfigRegistry config) {
+            if (List.class.isAssignableFrom(GenericTypes.getErasedType(type))) {
+                return LIST.build(type, value, config);
+            }
             if (BY_TYPE_FACTORIES.containsKey(type)) {
                 return BY_TYPE_FACTORIES.get(type).build(type, value, config);
             }
             return Optional.empty();
         }
     }
+
+    public static abstract class ArgumentFactory<T> implements org.jdbi.v3.core.argument.ArgumentFactory.Preparable {
+        private final int sqlType;
+        private final ArgumentPredicate isInstance;
+
+        /**
+         * Constructs an {@link ArgumentFactory} for type {@code T}.
+         *
+         * @param sqlType the {@link java.sql.Types} constant to use when the argument value is {@code null}.
+         */
+        protected ArgumentFactory(int sqlType, final Type argumentType) {
+            this.sqlType = sqlType;
+
+            if (argumentType instanceof Class<?> argumentClass) {
+                this.isInstance = (type, value) ->
+                    argumentClass.isAssignableFrom(GenericTypes.getErasedType(type)) || argumentClass.isInstance(value);
+            } else {
+                this.isInstance = (type, value) -> argumentType.equals(type);
+            }
+        }
+
+        @Override
+        public Optional<Function<Object, Argument>> prepare(Type type, ConfigRegistry config) {
+            return isInstance.test(type, null)
+                ? Optional.of(value -> innerBuild(value, config)
+                .orElseThrow(() -> new UnableToCreateStatementException("Prepared argument " + value + " of type " + type + " failed to bind")))
+                : Optional.empty();
+        }
+
+        @Override
+        public final Optional<Argument> build(Type type, Object value, ConfigRegistry config) {
+            if (!isInstance.test(type, value)) {
+                return Optional.empty();
+            }
+            return innerBuild(value, config);
+        }
+
+        @SuppressWarnings("unchecked")
+        private Optional<Argument> innerBuild(Object value, ConfigRegistry config) {
+            return Optional.of(value == null
+                ? new NullArgument(sqlType)
+                : build((T) value, config));
+        }
+
+        /**
+         * Produce an argument object for the given value.
+         *
+         * @param value  the value to convert to an argument
+         * @param config the config registry
+         * @return an {@link Argument} for the given {@code value}.
+         */
+        protected abstract Argument build(T value, ConfigRegistry config);
+
+        private interface ArgumentPredicate {
+            boolean test(Type type, Object value);
+        }
+    }
 }

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

@@ -33,6 +33,7 @@
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;

src/core/java/com/mcmoddev/mmdbot/core/util/event/ThreadedEventListener.java

@@ -18,13 +18,10 @@
  * USA
  * https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
  */
-package com.mcmoddev.mmdbot.thelistener.util;
+package com.mcmoddev.mmdbot.core.util.jda.caching;
 
-import discord4j.core.event.domain.Event;
+public interface InteractionData {
 
-@FunctionalInterface
-public interface EventListener {
-
-    void onEvent(Event event);
+    long getAuthorId();
 
 }

src/listener/java/com/mcmoddev/mmdbot/thelistener/util/EventListener.java renamed to src/core/java/com/mcmoddev/mmdbot/core/util/jda/caching/InteractionData.java

@@ -1,3 +1,23 @@
+/*
+ * MMDBot - https://github.com/MinecraftModDevelopment/MMDBot
+ * Copyright (C) 2016-2022 <MMD - MinecraftModDevelopment>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * Specifically version 2.1 of the License.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ * https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+ */
 package com.mcmoddev.mmdbot.core.util.jda.caching;
 
 import org.jetbrains.annotations.Nullable;

src/core/java/com/mcmoddev/mmdbot/core/util/jda/caching/JdaMessageCache.java

@@ -1,3 +1,23 @@
+/*
+ * MMDBot - https://github.com/MinecraftModDevelopment/MMDBot
+ * Copyright (C) 2016-2022 <MMD - MinecraftModDevelopment>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * Specifically version 2.1 of the License.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ * https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+ */
 package com.mcmoddev.mmdbot.core.util.jda.caching;
 
 import com.github.benmanes.caffeine.cache.Cache;