Bugfix/GitHub reference (#1061)

* skip for non-text channels * handling longer issue body for embed & invalid issue number --------- Co-authored-by: Tanish Azad <[email protected]>
Together-Java · Mar 20, 2024 · b0d77ae · b0d77ae
1 parent 6c3cc81
commit b0d77ae
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/github/GitHubReference.java b/application/src/main/java/org/togetherjava/tjbot/commands/github/GitHubReference.java
@@ -42,7 +42,7 @@ public final class GitHubReference extends MessageReceiverAdapter {
      * The pattern(#123) used to determine whether a message is referencing an issue.
      */
     static final Pattern ISSUE_REFERENCE_PATTERN =
-            Pattern.compile("#(?<%s>\\d+)".formatted(ID_GROUP));
+            Pattern.compile("#(?<%s>\\d{1,5})".formatted(ID_GROUP));
     private static final int ISSUE_OPEN = Color.green.getRGB();
     private static final int ISSUE_CLOSE = Color.red.getRGB();
 
@@ -108,8 +108,9 @@ public void onMessageReceived(MessageReceivedEvent event) {
 
         while (matcher.find()) {
             long defaultRepoId = config.getGitHubRepositories().get(0);
-            findIssue(Integer.parseInt(matcher.group(ID_GROUP)), defaultRepoId)
-                .ifPresent(issue -> embeds.add(generateReply(issue)));
+
+            int issueId = Integer.parseInt(matcher.group(ID_GROUP));
+            findIssue(issueId, defaultRepoId).ifPresent(issue -> embeds.add(generateReply(issue)));
         }
 
         replyBatchEmbeds(embeds, message, false);
@@ -148,6 +149,10 @@ MessageEmbed generateReply(GHIssue issue) throws UncheckedIOException {
             String titleUrl = issue.getHtmlUrl().toString();
             String description = issue.getBody();
 
+            if (description != null && description.length() > MessageEmbed.DESCRIPTION_MAX_LENGTH) {
+                description = "too long for preview, visit Github";
+            }
+
             String labels = issue.getLabels()
                 .stream()
                 .map(GHLabel::getName)
@@ -231,6 +236,10 @@ List<GHRepository> getRepositories() {
     }
 
     private boolean isAllowedChannelOrChildThread(MessageReceivedEvent event) {
+        if (event.getChannelType() != ChannelType.TEXT) {
+            return false;
+        }
+
         if (event.getChannelType().isThread()) {
             ThreadChannel threadChannel = event.getChannel().asThreadChannel();
             String rootChannel = threadChannel.getParentChannel().getName();