Add a command to link to github issues

Author: htmlcsjs

build.gradle.kts

@@ -34,9 +34,9 @@ application {
 }
 
 dependencies {
-    // implementation("com.discord4j:discord4j-core:3.2.4")
-    implementation("com.github.htmlcsjs:Discord4Floppa:c9e32fe")
-    implementation("ch.qos.logback:logback-classic:1.4.6")
+    implementation("com.discord4j:discord4j-core:3.3.0-RC1")
+    //implementation("com.github.htmlcsjs:Discord4Floppa:c9e32fe")
+    implementation("ch.qos.logback:logback-classic:1.4.12")
     implementation("com.googlecode.json-simple:json-simple:1.1.1")
     implementation("me.xdrop:fuzzywuzzy:1.4.0")
     implementation("org.luaj:luaj-jse:3.0.1")

src/main/java/xyz/htmlcsjs/coffeeFloppa/CoffeeFloppa.java

@@ -161,6 +161,7 @@ public static void refreshCommands() {
         MessageHandler.addCommand(new SearchMatCommand());
         MessageHandler.addCommand(new SearchMatByIdCommand());
         MessageHandler.addCommand(new GithubIssueCommand());
+        MessageHandler.addCommand(new GithubLinkCommand());
         MessageHandler.addCommand(new AddonCommand());
         MessageHandler.addCommand(new QuestAdminCommand());
         MessageHandler.addCommand(new RefreshCommand());

src/main/java/xyz/htmlcsjs/coffeeFloppa/commands/GithubIssueCommand.java

@@ -30,8 +30,7 @@ public class GithubIssueCommand implements ICommand {
 
     private static final String apiRoot = "https://api.github.com/";
     private static final Map<String, String> aliasMap = new HashMap<>();
-    private static final Map<String, String> categoryAliasMap = new HashMap<>();
-
+    private static final Map<String, String> channelAliasMap = new HashMap<>();
 
     public GithubIssueCommand() {
         aliasMap.clear();
@@ -46,7 +45,7 @@ public GithubIssueCommand() {
             }
             aliasMap.put(alias.toLowerCase(), repo);
         }
-        categoryAliasMap.clear();
+        channelAliasMap.clear();
         for (String str : FloppaTomlConfig.channelAliases.split(";")) {
             List<String> split = new ArrayList<>(List.of(str.split(":")));
             String alias = split.remove(0);
@@ -56,13 +55,13 @@ public GithubIssueCommand() {
             } else {
                 repo = split.get(0);
             }
-            categoryAliasMap.put(alias, repo.toLowerCase());
+            channelAliasMap.put(alias, repo.toLowerCase());
         }
     }
 
     @Override
     public @NotNull String getName() {
-        return "gh";
+        return "ghissue";
     }
 
     @Nullable
@@ -78,12 +77,12 @@ public String execute(Message message) {
                 .forEach(matchResult -> {
                     if (matchResult.group(1) == null) {
                         MessageChannel channel = message.getChannel().block();
-                        if (channel != null && categoryAliasMap.containsKey(channel.getId().asString())) {
-                            issueList.add(new IssueListItem(aliasMap.get(categoryAliasMap.get(channel.getId().asString())), matchResult.group(2)));
+                        if (channel != null && channelAliasMap.containsKey(channel.getId().asString())) {
+                            issueList.add(new IssueListItem(aliasMap.get(channelAliasMap.get(channel.getId().asString())), matchResult.group(2)));
                         } else if (channel instanceof ThreadChannel thread) {
                             Optional<Snowflake> parentId = thread.getParentId();
-                            if (parentId.isPresent() && categoryAliasMap.containsKey(parentId.get().asString())) {
-                                issueList.add(new IssueListItem(aliasMap.get(categoryAliasMap.get(parentId.get().asString())), matchResult.group(2)));
+                            if (parentId.isPresent() && channelAliasMap.containsKey(parentId.get().asString())) {
+                                issueList.add(new IssueListItem(aliasMap.get(channelAliasMap.get(parentId.get().asString())), matchResult.group(2)));
                             }
                         }
                     } else if (aliasMap.containsKey(matchResult.group(1).toLowerCase())){
@@ -173,7 +172,14 @@ public String execute(Message message) {
     public String helpInfo() {
         return "Provides links to issues for github repos";
     }
-    private record IssueListItem(String repo, String id) {
 
+    public static Map<String, String> getAliasMap() {
+        return Collections.unmodifiableMap(aliasMap);
+    }
+
+    public static Map<String, String> getChannelAliasMap() {
+        return Collections.unmodifiableMap(channelAliasMap);
     }
+
+    private record IssueListItem(String repo, String id) { }
 }

src/main/java/xyz/htmlcsjs/coffeeFloppa/commands/GithubLinkCommand.java

@@ -0,0 +1,40 @@
+package xyz.htmlcsjs.coffeeFloppa.commands;
+
+import discord4j.core.object.entity.Message;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import xyz.htmlcsjs.coffeeFloppa.toml.FloppaTomlConfig;
+
+public class GithubLinkCommand implements ICommand {
+    @Override
+    public @NotNull String getName() {
+        return "github";
+    }
+
+    @Override
+    public @Nullable String execute(Message message) {
+        String[] args = message.getContent().split("\\s");
+        String alias;
+        if (args.length > 1) {
+            alias = args[1];
+        } else {
+            alias = GithubIssueCommand.getChannelAliasMap().get(message.getChannelId().asString());
+        }
+        if (alias == null) {
+            return String.format("No repository provided\nUsage: `%s%s <repo>` where `repo` is a repository name/alias, "
+                    + "can be omitted in any channel that has a default alias (i.e ones which #{issue number] works in)", FloppaTomlConfig.prefix, getName());
+        }
+
+        String repo;
+        if (alias.contains("/")) { // attempt to use alias as the repo directly
+            repo = alias;
+        } else {
+            repo = GithubIssueCommand.getAliasMap().get(alias);
+            if (repo == null) {
+                return String.format("No defined repository for alias `%s`", alias);
+            }
+        }
+
+        return String.format("https://github.com/%s/issues", repo);
+    }
+}

src/main/java/xyz/htmlcsjs/coffeeFloppa/handlers/MessageHandler.java

@@ -116,7 +116,7 @@ private static Mono<Object> executeMessage(Message message, String msgContent) {
                 sendMessage(message, command);
             } catch (IndexOutOfBoundsException ignored) {}
         } else if ((CommandUtil.ghIssuePattern.matcher(msgContent).find() || CommandUtil.ghIssueSmallPattern.matcher(msgContent).find())&& !message.getAuthor().get().isBot()) {
-            sendMessage(message, commands.get("gh"));
+            sendMessage(message, commands.get("ghissue"));
         } else {
             for (String key : searchCommands.keySet()) {
                 String prefix = key.split(" ")[0];