Release v4.0

.devcontainer/devcontainer.json

@@ -19,18 +19,20 @@
       "extensions": [
         "vscjava.vscode-java-pack",
         "vscjava.vscode-gradle",
-        "alexcvzz.vscode-sqlite",
-        "richardwillis.vscode-spotless-gradle"
+        "alexcvzz.vscode-sqlite"
       ],
       "settings": {
         "[java]": {
-          "spotlessGradle.format.enable": true,
-          "editor.defaultFormatter": "richardwillis.vscode-spotless-gradle"
+          "java.compile.nullAnalysis.mode": "disabled",
+          "java.format.settings.url": "meta/formatting/google-style-eclipse.xml",
+          "editor.formatOnSave": true,
+          "editor.formatOnPaste": true,
+          "java.format.enabled": true
         }
       }
     }
   },
   "postCreateCommand": {
     "config": "cp application/config.json.template application/config.json"
   }
-}
+}

.gitignore

@@ -160,3 +160,15 @@ logviewer/pnpm-lock.yaml
 logviewer/webpack.config.js
 logviewer/webpack.generated.js
 .DS_Store
+
+# VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "vscjava.vscode-gradle",
+        "github.vscode-pull-request-github",
+        "vscjava.vscode-java-pack",
+        "alexcvzz.vscode-sqlite"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    //Configure the JDK to Java 18 in settings 
+    "java.compile.nullAnalysis.mode": "disabled",
+    "java.format.settings.url": "meta/formatting/google-style-eclipse.xml",
+    "editor.formatOnSave": true,
+    "editor.formatOnPaste": true,
+    "java.format.enabled": true,
+}

application/build.gradle

@@ -40,7 +40,7 @@ shadowJar {
 
 dependencies {
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation 'org.jetbrains:annotations:23.0.0'
+    implementation 'org.jetbrains:annotations:23.1.0'
 
     implementation project(':database')
     implementation project(':utils')

application/config.json.template

@@ -27,8 +27,7 @@
    },
    "wolframAlphaAppId": "79J52T-6239TVXHR7",
    "helpSystem": {
-       "stagingChannelPattern": "ask_here",
-       "overviewChannelPattern": "active_questions",
+       "helpForumPattern": "questions",
        "categories": [
            "Java",
            "Frameworks",

application/src/main/java/org/togetherjava/tjbot/commands/Features.java

@@ -86,7 +86,6 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         features.add(new TopHelpersPurgeMessagesRoutine(database));
         features.add(new RemindRoutine(database));
         features.add(new ScamHistoryPurgeRoutine(scamHistoryStore));
-        features.add(new BotMessageCleanup(config));
         features.add(new HelpThreadMetadataPurger(database));
         features.add(new HelpThreadActivityUpdater(helpSystemHelper));
         features
@@ -98,7 +97,6 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         features.add(new TopHelpersMessageListener(database, config));
         features.add(new SuggestionsUpDownVoter(config));
         features.add(new ScamBlocker(actionsStore, scamHistoryStore, config));
-        features.add(new ImplicitAskListener(config, helpSystemHelper));
         features.add(new MediaOnlyChannelListener(config));
         features.add(new FileSharingMessageListener(config));
         features.add(new BlacklistedAttachmentListener(config, modAuditLogWriter));
@@ -111,6 +109,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         features.add(new OnGuildLeaveCloseThreadListener(database));
         features.add(new UserBannedDeleteRecentThreadsListener(database));
         features.add(new LeftoverBookmarksListener(bookmarksSystem));
+        features.add(new HelpThreadCreatedListener(helpSystemHelper));
 
         // Message context commands
 
@@ -139,14 +138,12 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         features.add(new UnquarantineCommand(actionsStore, config));
         features.add(new WhoIsCommand());
         features.add(new WolframAlphaCommand(config));
-        features.add(new AskCommand(config, helpSystemHelper, database));
         features.add(new ModMailCommand(jda, config));
         features.add(new HelpThreadCommand(config, helpSystemHelper));
         features.add(new ReportCommand(config));
         features.add(new BookmarksCommand(bookmarksSystem));
 
         // Mixtures
-        features.add(new HelpThreadOverviewUpdater(config, helpSystemHelper));
 
         return features;
     }

application/src/main/java/org/togetherjava/tjbot/commands/bookmarks/BookmarksSystem.java

@@ -39,7 +39,7 @@ public final class BookmarksSystem {
     static final Color COLOR_FAILURE = new Color(238, 153, 160);
 
     private final Database database;
-    private final Predicate<String> isOverviewChannelName;
+    private final Predicate<String> isHelpForumName;
 
     /**
      * Creates a new instance of the bookmarks system.
@@ -50,8 +50,8 @@ public final class BookmarksSystem {
     public BookmarksSystem(Config config, Database database) {
         this.database = database;
 
-        isOverviewChannelName = Pattern.compile(config.getHelpSystem().getOverviewChannelPattern())
-            .asMatchPredicate();
+        isHelpForumName =
+                Pattern.compile(config.getHelpSystem().getHelpForumPattern()).asMatchPredicate();
     }
 
     boolean isHelpThread(MessageChannelUnion channel) {
@@ -60,9 +60,9 @@ boolean isHelpThread(MessageChannelUnion channel) {
         }
 
         ThreadChannel threadChannel = channel.asThreadChannel();
-        String parentChannelName = threadChannel.getParentMessageChannel().getName();
+        String parentChannelName = threadChannel.getParentChannel().getName();
 
-        return isOverviewChannelName.test(parentChannelName);
+        return isHelpForumName.test(parentChannelName);
     }
 
     boolean didUserBookmarkChannel(long userID, long channelID) {

application/src/main/java/org/togetherjava/tjbot/commands/code/CodeMessageAutoDetection.java

@@ -23,8 +23,7 @@ public final class CodeMessageAutoDetection extends MessageReceiverAdapter {
 
     private final CodeMessageHandler codeMessageHandler;
 
-    private final Predicate<String> isStagingChannelName;
-    private final Predicate<String> isOverviewChannelName;
+    private final Predicate<String> isHelpForumName;
 
     /**
      * Creates a new instance.
@@ -37,10 +36,8 @@ public CodeMessageAutoDetection(Config config, CodeMessageHandler codeMessageHan
 
         this.codeMessageHandler = codeMessageHandler;
 
-        isStagingChannelName = Pattern.compile(config.getHelpSystem().getStagingChannelPattern())
-            .asMatchPredicate();
-        isOverviewChannelName = Pattern.compile(config.getHelpSystem().getOverviewChannelPattern())
-            .asMatchPredicate();
+        isHelpForumName =
+                Pattern.compile(config.getHelpSystem().getHelpForumPattern()).asMatchPredicate();
     }
 
     @Override
@@ -73,7 +70,6 @@ private boolean isHelpThread(MessageReceivedEvent event) {
 
         ThreadChannel thread = event.getChannel().asThreadChannel();
         String rootChannelName = thread.getParentChannel().getName();
-        return isStagingChannelName.test(rootChannelName)
-                || isOverviewChannelName.test(rootChannelName);
+        return isHelpForumName.test(rootChannelName);
     }
 }

application/src/main/java/org/togetherjava/tjbot/commands/filesharing/FileSharingMessageListener.java

@@ -63,8 +63,7 @@ public class FileSharingMessageListener extends MessageReceiverAdapter implement
     private final Set<String> extensionFilter = Set.of("txt", "java", "gradle", "xml", "kt", "json",
             "fxml", "css", "c", "h", "cpp", "py", "yml");
 
-    private final Predicate<String> isStagingChannelName;
-    private final Predicate<String> isOverviewChannelName;
+    private final Predicate<String> isHelpForumName;
     private final Predicate<String> isSoftModRole;
 
     /**
@@ -77,10 +76,8 @@ public FileSharingMessageListener(Config config) {
         super(Pattern.compile(".*"));
 
         gistApiKey = config.getGistApiKey();
-        isStagingChannelName = Pattern.compile(config.getHelpSystem().getStagingChannelPattern())
-            .asMatchPredicate();
-        isOverviewChannelName = Pattern.compile(config.getHelpSystem().getOverviewChannelPattern())
-            .asMatchPredicate();
+        isHelpForumName =
+                Pattern.compile(config.getHelpSystem().getHelpForumPattern()).asMatchPredicate();
         isSoftModRole = Pattern.compile(config.getSoftModerationRolePattern()).asMatchPredicate();
     }
 
@@ -245,8 +242,7 @@ private boolean isHelpThread(MessageReceivedEvent event) {
 
         ThreadChannel thread = event.getChannel().asThreadChannel();
         String rootChannelName = thread.getParentChannel().getName();
-        return isStagingChannelName.test(rootChannelName)
-                || isOverviewChannelName.test(rootChannelName);
+        return isHelpForumName.test(rootChannelName);
     }
 
     private void deleteGist(String gistId) {