Fix reviews

Author: SquidXTV

application/src/main/java/org/togetherjava/tjbot/features/tags/TagCommand.java

@@ -19,6 +19,7 @@
 import org.togetherjava.tjbot.features.CommandVisibility;
 import org.togetherjava.tjbot.features.SlashCommandAdapter;
 import org.togetherjava.tjbot.features.utils.LinkDetections;
+import org.togetherjava.tjbot.features.utils.LinkFilter;
 import org.togetherjava.tjbot.features.utils.LinkPreview;
 import org.togetherjava.tjbot.features.utils.LinkPreviews;
 import org.togetherjava.tjbot.features.utils.StringDistances;
@@ -94,7 +95,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event) {
             .map(OptionMapping::getAsUser)
             .map(User::getAsMention);
 
-        List<String> links = LinkDetections.extractLinks(tagContent, true, true)
+        List<String> links = LinkDetections
+            .extractLinks(tagContent, Set.of(LinkFilter.SUPPRESSED, LinkFilter.NON_HTTP_SCHEME))
             .stream()
             .limit(Message.MAX_EMBED_COUNT - 1L)
             .toList();

application/src/main/java/org/togetherjava/tjbot/features/utils/LinkDetections.java

@@ -6,12 +6,14 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Utility class to detect links.
  */
 public class LinkDetections {
 
+
     private LinkDetections() {
         throw new UnsupportedOperationException("Utility class");
     }
@@ -20,15 +22,13 @@ private LinkDetections() {
      * Extracts all links from the given content.
      *
      * @param content the content to search through
-     * @param filterSuppressed filters links suppressed with {@literal <url>}
-     * @param filterNonHttpSchemes filters links that are not using http scheme
+     * @param filter the filters applied to the urls
      * @return a list of all found links, can be empty
      */
-    public static List<String> extractLinks(String content, boolean filterSuppressed,
-            boolean filterNonHttpSchemes) {
+    public static List<String> extractLinks(String content, Set<LinkFilter> filter) {
         return new UrlDetector(content, UrlDetectorOptions.BRACKET_MATCH).detect()
             .stream()
-            .map(url -> toLink(url, filterSuppressed, filterNonHttpSchemes))
+            .map(url -> toLink(url, filter))
             .flatMap(Optional::stream)
             .toList();
     }
@@ -43,16 +43,15 @@ public static boolean containsLink(String content) {
         return !(new UrlDetector(content, UrlDetectorOptions.BRACKET_MATCH).detect().isEmpty());
     }
 
-    private static Optional<String> toLink(Url url, boolean filterSuppressed,
-            boolean filterNonHttpSchemes) {
+    private static Optional<String> toLink(Url url, Set<LinkFilter> filter) {
         String raw = url.getOriginalUrl();
-        if (filterSuppressed && raw.contains(">")) {
+        if (filter.contains(LinkFilter.SUPPRESSED) && raw.contains(">")) {
             // URL escapes, such as "<http://example.com>" should be skipped
             return Optional.empty();
         }
         // Not interested in other schemes, also to filter out matches without scheme.
         // It detects a lot of such false-positives in Java snippets
-        if (filterNonHttpSchemes && !raw.startsWith("http")) {
+        if (filter.contains(LinkFilter.NON_HTTP_SCHEME) && !raw.startsWith("http")) {
             return Optional.empty();
         }
 

application/src/main/java/org/togetherjava/tjbot/features/utils/LinkFilter.java

@@ -0,0 +1,17 @@
+package org.togetherjava.tjbot.features.utils;
+
+/**
+ * Possible ways to filter a link.
+ * 
+ * @see LinkDetections
+ */
+public enum LinkFilter {
+    /**
+     * Filters links suppressed with {@literal <url>}.
+     */
+    SUPPRESSED,
+    /**
+     * Filters links that are not using http scheme.
+     */
+    NON_HTTP_SCHEME;
+}