Merge pull request #121 from Matyrobbrt/role-panels

Update to JDA v5 and reaction roles.

Author: KiriCattus

build.gradle

@@ -52,7 +52,7 @@ repositories {
   }
   maven {
     name 'jda-chewtils'
-    url 'https://m2.chew.pro/releases'
+    url 'https://m2.chew.pro/snapshots'
   }
   maven {
     name 'linkie'

dependencies.gradle

@@ -8,8 +8,8 @@ ext {
     licenser = "0.6.1"
 
     //-- DEPENDENCY VERSIONS
-    jdaVersion = "4.4.0_351"
-    jdaChewtilsVersion = "1.24.1"
+    jdaVersion = "5.0.0-alpha.5"
+    jdaChewtilsVersion = "2.0-interactions-SNAPSHOT"
     guavaVersion = "31.0.1-jre"
     gsonVersion = "2.8.9"
     logbackClassicVersion = "1.2.10"

src/main/java/com/mcmoddev/mmdbot/MMDBot.java

@@ -126,6 +126,7 @@ public static Jdbi database() {
      * @param args Arguments provided to the program.
      */
     public static void main(final String[] args) {
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> LOGGER.warn("The bot is shutting down!")));
         final var configPath = Paths.get("mmdbot_config.toml");
         MMDBot.config = new BotConfig(configPath);
         if (MMDBot.config.isNewlyGenerated()) {

src/main/java/com/mcmoddev/mmdbot/core/BotConfig.java

@@ -30,6 +30,7 @@
 import com.jagrosh.jdautilities.commons.utils.SafeIdUtil;
 import com.mcmoddev.mmdbot.MMDBot;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Message;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Path;
@@ -117,6 +118,13 @@ public String getToken() {
             .orElse("");
     }
 
+    @NotNull
+    public String getGithubToken() {
+        return config.<String>getOptional("bot.githubToken")
+            .filter(string -> string.indexOf('!') == -1 || string.isEmpty())
+            .orElse("");
+    }
+
     /**
      * Returns the snowflake ID of the bot's owner.
      * <p>
@@ -471,4 +479,24 @@ public boolean isCommandModuleEnabled() {
     public boolean isEventLoggingModuleEnabled() {
         return config.<Boolean>getOrElse("modules.event_logging_module_enabled", true);
     }
+
+    /**
+     * Gets the role associated with the {@code emote} from the specified role panel
+     * @param channelId the channel ID of the role panel
+     * @param messageId the message ID of the role panel
+     * @param emote the emote
+     * @return
+     */
+    public long getRoleForRolePanel(final long channelId, final long messageId, final String emote) {
+        return config.<Long>getOrElse("role_panels.%s-%s.%s".formatted(channelId, messageId, emote), 0l);
+    }
+
+    public long getRoleForRolePanel(final Message message, final String emote) {
+        return getRoleForRolePanel(message.getChannel().getIdLong(), message.getIdLong(), emote);
+    }
+
+    public void addRolePanel(final long channelId, final long messageId, final String emote, final long roleId) {
+        config.set("role_panels.%s-%s.%s".formatted(channelId, messageId, emote), roleId);
+        config.save();
+    }
 }

src/main/java/com/mcmoddev/mmdbot/core/References.java

@@ -20,12 +20,15 @@
  */
 package com.mcmoddev.mmdbot.core;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.mcmoddev.mmdbot.MMDBot;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.Random;
 
 /**
  * Store settings that don't really change in here.
@@ -77,4 +80,10 @@ public class References {
      * The constant STARTUP_TIME.
      */
     public static Instant STARTUP_TIME;
+
+    public static final Gson GSON = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
+
+    public static final Random RANDOM = new Random();
+
+    public static boolean BOT_READY = false;
 }

src/main/java/com/mcmoddev/mmdbot/gist/ExistingGist.java

@@ -0,0 +1,88 @@
+/*
+ * 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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.gist;
+
+import com.google.gson.JsonObject;
+import com.mcmoddev.mmdbot.core.References;
+import com.mcmoddev.mmdbot.utilities.Utils;
+import kotlinx.serialization.json.Json;
+
+import javax.annotation.Nullable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Represents a gist which was got from an HTTP request
+ *
+ * @author matyrobbrt
+ */
+public record ExistingGist(JsonObject json, String url, String forksUrl, String commitsUrl,
+                           String id, boolean isPublic, String commentsUrl, int comments,
+                           String htmlUrl, String gitPullUrl, String gitPushUrl, String createdAt,
+                           String updatedAt, Map<String, File> files, @Nullable String description) {
+
+    public static ExistingGist fromJson(final JsonObject json) {
+        var url = getFromJson(json, "url");
+        var id = getFromJson(json, "id");
+        var isPublic = json.get("public").getAsBoolean();
+        var commentsUrl = getFromJson(json, "comments_url");
+        var comments = json.get("comments").getAsInt();
+        var htmlUrl = getFromJson(json, "html_url");
+        var gitPullUrl = getFromJson(json, "git_pull_url");
+        var gitPushUrl = getFromJson(json, "git_push_url");
+        var createdAt = getFromJson(json, "created_at");
+        var updatedAt = getFromJson(json, "updated_at");
+        var forksUrl = getFromJson(json, "forks_url");
+        var commitsUrl = getFromJson(json, "commits_url");
+        var description = getFromJson(json, "description");
+
+        var files = new LinkedHashMap<String, File>();
+
+        final var filesJson = json.get("files").getAsJsonObject();
+        for (final String key : filesJson.keySet()) {
+            files.put(key, File.fromJson(filesJson.get(key).getAsJsonObject()));
+        }
+        return new ExistingGist(json, url, forksUrl, commitsUrl, id, isPublic, commentsUrl, comments, htmlUrl, gitPullUrl,
+            gitPushUrl, createdAt, updatedAt, files, description);
+    }
+
+    private static String getFromJson(final JsonObject json, final String key) {
+        return json.get(key).isJsonPrimitive() && json.get(key).getAsJsonPrimitive().isString() ? json.get(key).getAsString() : null;
+    }
+
+    @Override
+    public String toString() {
+        return json.toString();
+    }
+
+    public record File(int size, String url, String type, boolean isTruncated) {
+
+        public static File fromJson(final JsonObject json) {
+            final var size = json.get("size").getAsInt();
+            final var url = json.get("raw_url").getAsString();
+            final var type = json.get("type").getAsString();
+            final var truncated = json.has("truncated") && json.get("truncated").getAsBoolean();
+            return new File(size, url, type, truncated);
+        }
+
+    }
+
+}

src/main/java/com/mcmoddev/mmdbot/gist/Gist.java

@@ -0,0 +1,99 @@
+/*
+ * 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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.gist;
+
+import com.google.gson.JsonObject;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Represents a gist which is ready to be made using an HTTP request.
+ *
+ * @author matyrobbrt
+ */
+public class Gist {
+
+    private final String description;
+    private final boolean isPublic;
+    private final Map<String, JsonObject> files = new LinkedHashMap<>();
+
+    public Gist(final String description, final boolean isPublic) {
+        this.description = description;
+        this.isPublic = isPublic;
+    }
+
+    public Gist(final String description, final boolean isPublic, final String filename, final String content) {
+        this.description = description;
+        this.isPublic = isPublic;
+
+        final JsonObject fileobj = new JsonObject();
+        fileobj.addProperty("content", content);
+
+        files.put(filename, fileobj);
+    }
+
+    public Gist(final String description, final boolean isPublic, final File file) throws IOException {
+        this.description = description;
+        this.isPublic = isPublic;
+
+        final JsonObject fileobj = new JsonObject();
+        fileobj.addProperty("content", GistUtils.readFile(file));
+
+        files.put(file.getName(), fileobj);
+    }
+
+    public Gist addFile(final String filename, final String content) {
+        final JsonObject fileobj = new JsonObject();
+        fileobj.addProperty("content", content);
+
+        files.put(filename, fileobj);
+        return this;
+    }
+
+    public Gist addFile(final File file) throws IOException {
+        final JsonObject fileobj = new JsonObject();
+        fileobj.addProperty("content", GistUtils.readFile(file));
+
+        files.put(file.getName(), fileobj);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        JsonObject gistobj = new JsonObject();
+        JsonObject fileobj = new JsonObject();
+
+        gistobj.addProperty("public", isPublic);
+        gistobj.addProperty("description", description);
+
+        for (final var entry : files.entrySet()) {
+            fileobj.add(entry.getKey(), entry.getValue());
+        }
+
+        gistobj.add("files", fileobj);
+
+        return gistobj.toString();
+    }
+
+}