Merge branch 'develop' into feat/meta-data-v2

Author: ankitsmt211

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.github/CODEOWNERS

@@ -1 +1 @@
-* @Together-Java/moderators @Together-Java/maintainers
+* @Together-Java/maintainers

application/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath 'org.xerial:sqlite-jdbc:3.44.0.0'
+        classpath 'org.xerial:sqlite-jdbc:3.45.0.0'
     }
 }
 
@@ -46,9 +46,9 @@ dependencies {
     implementation project(':utils')
     implementation project(':formatter')
 
-    implementation 'net.dv8tion:JDA:5.0.0-alpha.20'
+    implementation 'net.dv8tion:JDA:5.0.0-beta.21'
 
-    implementation 'org.apache.logging.log4j:log4j-core:2.22.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.23.0'
     runtimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0'
 
     implementation 'club.minnced:discord-webhooks:0.8.2'
@@ -67,16 +67,20 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+    implementation "com.sigpwned:jackson-modules-java17-sealed-classes:0.0.0"
 
 	implementation 'com.github.freva:ascii-table:1.8.0'
 
     implementation 'io.github.url-detector:url-detector:0.1.23'
 
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
 
-    implementation 'org.kohsuke:github-api:1.318'
+    implementation 'org.kohsuke:github-api:1.321'
 
-    testImplementation 'org.mockito:mockito-core:5.3.1'
+    implementation 'org.apache.commons:commons-text:1.11.0'
+    implementation 'com.apptasticsoftware:rssreader:3.6.0'
+
+    testImplementation 'org.mockito:mockito-core:5.11.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

application/config.json.template

@@ -1,6 +1,6 @@
 {
     "token": "<put_your_token_here>",
-    "gistApiKey": "<your_gist_personal_access_token>",
+    "githubApiKey": "<your_github_personal_access_token>",
     "databasePath": "local-database.db",
     "projectWebsite": "https://github.com/Together-Java/TJ-Bot",
     "discordGuildInvite": "https://discord.com/invite/XXFUXzK",
@@ -86,6 +86,8 @@
         "wsf",
         "wsh"
     ],
+    "githubReferencingEnabledChannelPattern": "server-suggestions|tjbot-discussion|modernjava-discussion",
+    "githubRepositories": [403389278,587644974,601602394],
     "logInfoChannelWebhook": "<put_your_webhook_here>",
     "logErrorChannelWebhook": "<put_your_webhook_here>",
     "openaiApiKey": "<check pins in #tjbot_discussion for the key>",
@@ -95,18 +97,23 @@
         "rateLimitWindowSeconds": 10,
         "rateLimitRequestsInWindow": 3
     },
-    "helperPruneConfig": {
-        "roleFullLimit": 100,
-        "roleFullThreshold": 95,
-        "pruneMemberAmount": 7,
-        "inactivateAfterDays": 90,
-        "recentlyJoinedDays": 4
-    },
     "featureBlacklist": {
         "normal": [
         ],
         "special": [
         ]
     },
-    "selectRolesChannelPattern": "select-your-roles"
+    "selectRolesChannelPattern": "select-your-roles",
+    "rssConfig": {
+        "feeds": [
+            {
+                "url": "https://wiki.openjdk.org/spaces/createrssfeed.action?types=page&types=comment&types=blogpost&types=mail&types=attachment&spaces=JDKUpdates&maxResults=15&title=%5BJDK+Updates%5D+All+Content+Feed&amp;publicFeed=true",
+                "targetChannelPattern": "java-news-and-changes",
+                "dateFormatterPattern": "yyyy-MM-dd'T'HH:mm:ssX"
+            }
+        ],
+        "fallbackChannelPattern": "java-news-and-changes",
+        "pollIntervalInMinutes": 10
+    },
+    "memberCountCategoryPattern": "Info"
 }

application/src/main/java/org/togetherjava/tjbot/config/Config.java

@@ -11,12 +11,13 @@
 import java.util.List;
 import java.util.Objects;
 
+
 /**
  * Configuration of the application. Create instances using {@link #load(Path)}.
  */
 public final class Config {
     private final String token;
-    private final String gistApiKey;
+    private final String githubApiKey;
     private final String databasePath;
     private final String projectWebsite;
     private final String discordGuildInvite;
@@ -36,17 +37,20 @@ public final class Config {
     private final String mediaOnlyChannelPattern;
     private final String logInfoChannelWebhook;
     private final String logErrorChannelWebhook;
+    private final String githubReferencingEnabledChannelPattern;
+    private final List<Long> githubRepositories;
     private final String openaiApiKey;
     private final String sourceCodeBaseUrl;
     private final JShellConfig jshell;
-    private final HelperPruneConfig helperPruneConfig;
     private final FeatureBlacklistConfig featureBlacklistConfig;
+    private final RSSFeedsConfig rssFeedsConfig;
     private final String selectRolesChannelPattern;
+    private final String memberCountCategoryPattern;
 
     @SuppressWarnings("ConstructorWithTooManyParameters")
     @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
     private Config(@JsonProperty(value = "token", required = true) String token,
-            @JsonProperty(value = "gistApiKey", required = true) String gistApiKey,
+            @JsonProperty(value = "githubApiKey", required = true) String githubApiKey,
             @JsonProperty(value = "databasePath", required = true) String databasePath,
             @JsonProperty(value = "projectWebsite", required = true) String projectWebsite,
             @JsonProperty(value = "discordGuildInvite", required = true) String discordGuildInvite,
@@ -77,19 +81,25 @@ private Config(@JsonProperty(value = "token", required = true) String token,
                     required = true) String logInfoChannelWebhook,
             @JsonProperty(value = "logErrorChannelWebhook",
                     required = true) String logErrorChannelWebhook,
+            @JsonProperty(value = "githubReferencingEnabledChannelPattern",
+                    required = true) String githubReferencingEnabledChannelPattern,
+            @JsonProperty(value = "githubRepositories",
+                    required = true) List<Long> githubRepositories,
             @JsonProperty(value = "openaiApiKey", required = true) String openaiApiKey,
             @JsonProperty(value = "sourceCodeBaseUrl", required = true) String sourceCodeBaseUrl,
             @JsonProperty(value = "jshell", required = true) JShellConfig jshell,
-            @JsonProperty(value = "helperPruneConfig",
-                    required = true) HelperPruneConfig helperPruneConfig,
+            @JsonProperty(value = "memberCountCategoryPattern",
+                    required = true) String memberCountCategoryPattern,
             @JsonProperty(value = "featureBlacklist",
                     required = true) FeatureBlacklistConfig featureBlacklistConfig,
+            @JsonProperty(value = "rssConfig", required = true) RSSFeedsConfig rssFeedsConfig,
             @JsonProperty(value = "selectRolesChannelPattern",
                     required = true) String selectRolesChannelPattern) {
         this.token = Objects.requireNonNull(token);
-        this.gistApiKey = Objects.requireNonNull(gistApiKey);
+        this.githubApiKey = Objects.requireNonNull(githubApiKey);
         this.databasePath = Objects.requireNonNull(databasePath);
         this.projectWebsite = Objects.requireNonNull(projectWebsite);
+        this.memberCountCategoryPattern = Objects.requireNonNull(memberCountCategoryPattern);
         this.discordGuildInvite = Objects.requireNonNull(discordGuildInvite);
         this.modAuditLogChannelPattern = Objects.requireNonNull(modAuditLogChannelPattern);
         this.modMailChannelPattern = Objects.requireNonNull(modMailChannelPattern);
@@ -108,11 +118,14 @@ private Config(@JsonProperty(value = "token", required = true) String token,
         this.blacklistedFileExtension = Objects.requireNonNull(blacklistedFileExtension);
         this.logInfoChannelWebhook = Objects.requireNonNull(logInfoChannelWebhook);
         this.logErrorChannelWebhook = Objects.requireNonNull(logErrorChannelWebhook);
+        this.githubReferencingEnabledChannelPattern =
+                Objects.requireNonNull(githubReferencingEnabledChannelPattern);
+        this.githubRepositories = Objects.requireNonNull(githubRepositories);
         this.openaiApiKey = Objects.requireNonNull(openaiApiKey);
         this.sourceCodeBaseUrl = Objects.requireNonNull(sourceCodeBaseUrl);
         this.jshell = Objects.requireNonNull(jshell);
-        this.helperPruneConfig = Objects.requireNonNull(helperPruneConfig);
         this.featureBlacklistConfig = Objects.requireNonNull(featureBlacklistConfig);
+        this.rssFeedsConfig = Objects.requireNonNull(rssFeedsConfig);
         this.selectRolesChannelPattern = Objects.requireNonNull(selectRolesChannelPattern);
     }
 
@@ -167,15 +180,15 @@ public String getToken() {
     }
 
     /**
-     * Gets the API Key of GitHub to upload pastes via the API.
+     * Gets the API Key of GitHub.
      *
-     * @return the upload services API Key
+     * @return the API Key
      * @see <a href=
      *      "https://docs.github.com/en/enterprise-server@3.4/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token">Create
      *      a GitHub key</a>
      */
-    public String getGistApiKey() {
-        return gistApiKey;
+    public String getGitHubApiKey() {
+        return githubApiKey;
     }
 
     /**
@@ -308,6 +321,20 @@ public List<String> getBlacklistedFileExtensions() {
         return Collections.unmodifiableList(blacklistedFileExtension);
     }
 
+    /**
+     * The REGEX pattern used to identify the channels that support GitHub issue referencing.
+     */
+    public String getGitHubReferencingEnabledChannelPattern() {
+        return githubReferencingEnabledChannelPattern;
+    }
+
+    /**
+     * The list of repositories that are searched when referencing a GitHub issue.
+     */
+    public List<Long> getGitHubRepositories() {
+        return githubRepositories;
+    }
+
     /**
      * The Discord channel webhook for posting log messages with levels INFO, DEBUG and TRACE.
      *
@@ -355,15 +382,6 @@ public JShellConfig getJshell() {
         return jshell;
     }
 
-    /**
-     * Gets the config for automatic pruning of helper roles.
-     *
-     * @return the configuration
-     */
-    public HelperPruneConfig getHelperPruneConfig() {
-        return helperPruneConfig;
-    }
-
     /**
      * The configuration of blacklisted features.
      * 
@@ -382,4 +400,22 @@ public FeatureBlacklistConfig getFeatureBlacklistConfig() {
     public String getSelectRolesChannelPattern() {
         return selectRolesChannelPattern;
     }
+
+    /**
+     * Gets the pattern matching the category that is used to display the total member count.
+     *
+     * @return the categories name types
+     */
+    public String getMemberCountCategoryPattern() {
+        return memberCountCategoryPattern;
+    }
+
+    /**
+     * Gets the RSS feeds configuration.
+     *
+     * @return the RSS feeds configuration
+     */
+    public RSSFeedsConfig getRSSFeedsConfig() {
+        return rssFeedsConfig;
+    }
 }

application/src/main/java/org/togetherjava/tjbot/config/FeatureBlacklist.java

@@ -1,8 +1,12 @@
 package org.togetherjava.tjbot.config;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
 /**
  * Blacklist of features, use {@link FeatureBlacklist#isEnabled(T)} to test if a feature is enabled.
@@ -13,6 +17,8 @@
 public class FeatureBlacklist<T> {
     private final Set<T> featureIdentifierBlacklist;
 
+    private static final Logger logger = LoggerFactory.getLogger(FeatureBlacklist.class);
+
     /**
      * Creates a feature blacklist
      * 
@@ -32,4 +38,25 @@ public FeatureBlacklist(Set<T> featureIdentifierBlacklist) {
     public boolean isEnabled(T featureId) {
         return !featureIdentifierBlacklist.contains(featureId);
     }
+
+    /**
+     * Filters features stream to only having enabled features and logs any disabled features.
+     *
+     * @param features the feature stream to be filtered
+     * @param idExtractor function to get the class name of an object
+     * @return stream of features that are enabled
+     */
+    public <F> Stream<F> filterStream(Stream<F> features,
+            Function<? super F, ? extends T> idExtractor) {
+        return features.filter(f -> {
+            T id = idExtractor.apply(f);
+            if (!this.isEnabled(id)) {
+                logger.info("Feature {} is disabled", id);
+                return false;
+            }
+            return true;
+        });
+    }
+
+
 }

application/src/main/java/org/togetherjava/tjbot/config/HelperPruneConfig.java

@@ -0,0 +1,30 @@
+package org.togetherjava.tjbot.config;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.Nullable;
+
+import java.util.Objects;
+
+/**
+ * Represents an RSS feed configuration.
+ */
+public record RSSFeed(@JsonProperty(value = "url", required = true) String url,
+        @JsonProperty(value = "targetChannelPattern") @Nullable String targetChannelPattern,
+        @JsonProperty(value = "dateFormatterPattern",
+                required = true) String dateFormatterPattern) {
+
+    /**
+     * Constructs an RSSFeed object.
+     *
+     * @param url the URL of the RSS feed
+     * @param targetChannelPattern the target channel pattern
+     * @param dateFormatterPattern the date formatter pattern
+     * @throws NullPointerException if any of the parameters are null
+     */
+    public RSSFeed {
+        Objects.requireNonNull(url);
+        Objects.requireNonNull(targetChannelPattern);
+        Objects.requireNonNull(dateFormatterPattern);
+    }
+}

application/src/main/java/org/togetherjava/tjbot/config/RSSFeed.java

@@ -0,0 +1,34 @@
+package org.togetherjava.tjbot.config;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Represents the configuration for an RSS feed, which includes the list of feeds to subscribe to, a
+ * pattern for identifying Java news channels, and the interval (in minutes) for polling the feeds.
+ *
+ * @param feeds The list of RSS feeds to subscribe to.
+ * @param fallbackChannelPattern The pattern used to identify the fallback text channel to use.
+ * @param pollIntervalInMinutes The interval (in minutes) for polling the RSS feeds for updates.
+ */
+public record RSSFeedsConfig(@JsonProperty(value = "feeds", required = true) List<RSSFeed> feeds,
+        @JsonProperty(value = "fallbackChannelPattern",
+                required = true) String fallbackChannelPattern,
+        @JsonProperty(value = "pollIntervalInMinutes", required = true) int pollIntervalInMinutes) {
+
+    /**
+     * Constructs a new {@link RSSFeedsConfig}.
+     *
+     * @param feeds The list of RSS feeds to subscribe to.
+     * @param fallbackChannelPattern The pattern used to identify the fallback text channel to use.
+     * @param pollIntervalInMinutes The interval (in minutes) for polling the RSS feeds for updates.
+     * @throws NullPointerException if any of the parameters (feeds or fallbackChannelPattern) are
+     *         null
+     */
+    public RSSFeedsConfig {
+        Objects.requireNonNull(feeds);
+        Objects.requireNonNull(fallbackChannelPattern);
+    }
+}