Use SnowflakeValues

Author: Matyrobbrt

relauncher

@@ -26,7 +26,10 @@
 import org.graalvm.polyglot.proxy.ProxyExecutable;
 import org.graalvm.polyglot.proxy.ProxyInstantiable;
 import org.graalvm.polyglot.proxy.ProxyObject;
+import org.graalvm.polyglot.proxy.ProxyTime;
 
+import java.time.LocalTime;
+import java.time.temporal.Temporal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -82,6 +85,8 @@ public ScriptingContext set(String key, Object value) {
                 }
             }
             map.put(key, objects);
+        } else if (value instanceof LocalTime localTime) {
+            map.put(key, ProxyTime.from(localTime));
         } else {
             map.put(key, value);
         }

src/commander/java/com/mcmoddev/mmdbot/commander/util/script/ScriptingContext.java

@@ -397,6 +397,7 @@ public static ScriptingContext createEmote(Emote emote) {
             .setFunction("getGuild", args -> emote.getGuild() == null ? null : createGuild(emote.getGuild()));
     }
 
+    @SuppressWarnings("rawtypes")
     public static ProxyExecutable functionObject(Function<List<Value>, Object> function) {
         return new ScriptingContext.NameableProxyExecutable() {
 

src/commander/java/com/mcmoddev/mmdbot/commander/util/script/ScriptingUtils.java

@@ -74,6 +74,7 @@
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.hocon.HoconConfigurationLoader;
 import org.spongepowered.configurate.reference.ConfigurationReference;
+import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 import org.sqlite.SQLiteDataSource;
 
 import javax.security.auth.login.LoginException;
@@ -88,7 +89,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+@SuppressWarnings("unused")
 public final class TheWatcher implements Bot {
+    static final TypeSerializerCollection ADDED_SERIALIZERS = TypeSerializerCollection.defaults()
+        .childBuilder()
+        .register(Punishment.class, new Punishment.Serializer())
+        .register(SnowflakeValue.class, new SnowflakeValue.Serializer())
+        .build();
 
     public static final Logger LOGGER = LoggerFactory.getLogger("TheWatcher");
 
@@ -199,7 +206,7 @@ public void start() {
                 .emitComments(true)
                 .prettyPrinting(true)
                 .path(configPath)
-                .defaultOptions(opts -> opts.serializers(build -> build.register(Punishment.class, new Punishment.Serializer())))
+                .defaultOptions(ops -> ops.serializers(ADDED_SERIALIZERS))
                 .build();
             Objects.requireNonNull(loader.defaultOptions().serializers().get(Punishment.class));
             final var cPair =
@@ -250,8 +257,11 @@ public void start() {
         final var coOwners = config.bot().getOwners().subList(1, config.bot().getOwners().size());
 
         commandClient = new CommandClientBuilder()
-            .setOwnerId(config.bot().getOwners().get(0))
-            .setCoOwnerIds(coOwners.toArray(String[]::new))
+            .setOwnerId(config.bot().getOwners().get(0).asString())
+            .setCoOwnerIds(coOwners
+                .stream()
+                .map(SnowflakeValue::asString)
+                .toArray(String[]::new))
             .setPrefixes(config.bot().getPrefixes().toArray(String[]::new))
             .setManualUpsert(true)
             .useHelpBuilder(false)
@@ -262,7 +272,7 @@ public void start() {
         COMMANDS_LISTENER.addListener((EventListener) commandClient);
 
         final var upserter = new CommandUpserter(commandClient, config.bot().areCommandsForcedGuildOnly(),
-            SnowflakeValue.of(config.bot().guild()));
+            config.bot().guild());
         COMMANDS_LISTENER.addListener(upserter);
 
         // Buttons
@@ -278,9 +288,7 @@ public void start() {
                 .create(dotenv.get("BOT_TOKEN"), INTENTS)
                 .addEventListeners(listenerConsumer((ReadyEvent event) -> {
                     getLogger().warn("The Watcher is ready to work! Logged in as {}", event.getJDA().getSelfUser().getAsTag());
-                    Events.MISC_BUS.addListener(-1, (TaskScheduler.CollectTasksEvent ctEvent) -> {
-                        ctEvent.addTask(new TaskScheduler.Task(new ChannelMessageChecker(event.getJDA()), 0, 1, TimeUnit.DAYS));
-                    });
+                    Events.MISC_BUS.addListener(-1, (TaskScheduler.CollectTasksEvent ctEvent) -> ctEvent.addTask(new TaskScheduler.Task(new ChannelMessageChecker(event.getJDA()), 0, 1, TimeUnit.DAYS)));
                 }), COMMANDS_LISTENER, MISC_LISTENER, PUNISHABLE_ACTIONS_LISTENER)
                 .setActivity(Activity.of(oldConfig.getActivityType(), oldConfig.getActivityName()))
                 .disableCache(CacheFlag.CLIENT_STATUS)
@@ -343,7 +351,17 @@ private static <E extends Event> EventListener listenerConsumer(final Consumer<E
     }
 
     public static boolean isBotMaintainer(final Member member) {
-        return member.getRoles().stream().anyMatch(r -> getInstance().getConfig().roles().getBotMaintainers().contains(r.getId()));
+        final var maintainers = getInstance().getConfig().roles().getBotMaintainers();
+        return member.getRoles()
+            .stream()
+            .anyMatch(r -> {
+                for (final var m : maintainers) {
+                    if (m.test(r)) {
+                        return true;
+                    }
+                }
+                return false;
+            });
     }
 
     public static Jdbi database() {

src/watcher/java/com/mcmoddev/mmdbot/watcher/TheWatcher.java

@@ -21,6 +21,7 @@
 package com.mcmoddev.mmdbot.watcher.util;
 
 import com.jagrosh.jdautilities.commons.utils.SafeIdUtil;
+import com.mcmoddev.mmdbot.core.util.config.SnowflakeValue;
 import com.mcmoddev.mmdbot.watcher.TheWatcher;
 import com.mcmoddev.mmdbot.watcher.punishments.Punishment;
 import net.dv8tion.jda.api.Permission;
@@ -54,18 +55,18 @@ public static final class Bot {
         @Required
         @Setting("owners")
         @Comment("The Snowflake IDs of the owners of the bot.")
-        private List<String> owners = new ArrayList<>();
+        private List<SnowflakeValue> owners = new ArrayList<>();
 
-        public List<String> getOwners() {
+        public List<SnowflakeValue> getOwners() {
             return owners;
         }
 
         @Required
         @Setting("guild")
         @Comment("The main guild of the bot.")
-        private String guild = "";
+        private SnowflakeValue guild = SnowflakeValue.EMPTY;
 
-        public String guild() {
+        public SnowflakeValue guild() {
             return guild;
         }
 
@@ -100,9 +101,9 @@ public static final class Roles {
         @Required
         @Setting("bot_maintainers")
         @Comment("A list of Snowflake IDs representing the roles which are bot maintainers.")
-        private List<String> botMaintainers = new ArrayList<>();
+        private List<SnowflakeValue> botMaintainers = new ArrayList<>();
 
-        public List<String> getBotMaintainers() {
+        public List<SnowflakeValue> getBotMaintainers() {
             return botMaintainers;
         }
     }