Release v4.18

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
   },
   "features": {
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "18.0.2.1-tem",
+      "version": "24-tem",
       "jdkDistro": "tem",
       "installGradle": true
     },
@@ -35,4 +35,4 @@
   "postCreateCommand": {
     "config": "cp application/config.json.template application/config.json"
   }
-}
+}

.github/workflows/basic-checks.yml

@@ -3,7 +3,7 @@ name: Basic checks
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 24
 
 jobs:
   spotless:

.github/workflows/code-analysis.yml

@@ -8,7 +8,7 @@ on:
     - cron: '0 20 * * 4'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 24
 
 jobs:
   sonar:

.github/workflows/docker-publish.yaml

@@ -7,7 +7,7 @@ on:
       - 'master'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 24
 
 jobs:
   docker:

.github/workflows/docker-verify.yaml

@@ -3,7 +3,7 @@ name: Docker Verify
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 24
 
 jobs:
   docker:

.github/workflows/releases.yaml

@@ -10,7 +10,7 @@ defaults:
     shell: bash
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 24
 
 jobs:
 

README.md

@@ -1,7 +1,7 @@
 # TJ-Bot
 
 [![codefactor](https://img.shields.io/codefactor/grade/github/together-java/tj-bot)](https://www.codefactor.io/repository/github/together-java/tj-bot)
-![Java](https://img.shields.io/badge/Java-21-ff696c)
+![Java](https://img.shields.io/badge/Java-24-ff696c)
 [![license](https://img.shields.io/github/license/Together-Java/TJ-Bot)](https://github.com/Together-Java/TJ-Bot/blob/master/LICENSE)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Together-Java/TJ-Bot?label=release)
 

application/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
     dependencies {
-        classpath 'org.xerial:sqlite-jdbc:3.47.1.0'
+        classpath 'org.xerial:sqlite-jdbc:3.50.1.0'
     }
 }
 
 plugins {
     id 'application'
-    id 'com.google.cloud.tools.jib' version '3.4.0'
+    id 'com.google.cloud.tools.jib' version '3.4.5'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'database-settings'
 }
@@ -18,7 +18,7 @@ repositories {
 var outputImage = 'togetherjava.org:5001/togetherjava/tjbot:' + System.getenv('BRANCH_NAME') ?: 'latest'
 
 jib {
-    from.image = 'eclipse-temurin:21'
+    from.image = 'eclipse-temurin:24'
     to {
         image = outputImage
         auth {
@@ -46,18 +46,18 @@ dependencies {
     implementation project(':utils')
     implementation project(':formatter')
 
-    implementation 'net.dv8tion:JDA:5.2.1'
+    implementation 'net.dv8tion:JDA:5.6.1'
 
-    implementation 'org.apache.logging.log4j:log4j-core:2.24.3'
-    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.25.0'
+    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.25.0'
 
-    implementation 'club.minnced:discord-webhooks:0.8.2'
+    implementation 'club.minnced:discord-webhooks:0.8.4'
 
     implementation "org.jooq:jooq:$jooqVersion"
 
     implementation 'io.mikael:urlbuilder:2.0.9'
 
-    implementation 'org.jsoup:jsoup:1.18.1'
+    implementation 'org.jsoup:jsoup:1.21.1'
 
     implementation 'org.scilab.forge:jlatexmath:1.0.7'
     implementation 'org.scilab.forge:jlatexmath-font-greek:1.0.7'
@@ -67,29 +67,30 @@ 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.sigpwned:jackson-modules-java17-sealed-classes:2.19.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 'com.github.ben-manes.caffeine:caffeine:3.2.0'
 
-    implementation 'org.kohsuke:github-api:1.326'
+    implementation 'org.kohsuke:github-api:1.327'
 
-    implementation 'org.apache.commons:commons-text:1.12.0'
-    implementation 'com.apptasticsoftware:rssreader:3.8.1'
+    implementation 'org.apache.commons:commons-text:1.13.1'
+    implementation 'com.apptasticsoftware:rssreader:3.9.3'
 
-    testImplementation 'org.mockito:mockito-core:5.17.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0'
+    testImplementation 'org.mockito:mockito-core:5.18.0'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.1'
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 
     implementation "com.theokanning.openai-gpt3-java:api:$chatGPTVersion"
     implementation "com.theokanning.openai-gpt3-java:service:$chatGPTVersion"
 }
 
 application {
     mainClass = 'org.togetherjava.tjbot.Application'
+    applicationDefaultJvmArgs = ["--enable-native-access=ALL-UNNAMED"]
 }

application/config.json.template

@@ -167,9 +167,9 @@
     "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&publicFeed=true",
+                "url": "https://blogs.oracle.com/java/rss",
                 "targetChannelPattern": "java-news-and-changes",
-                "dateFormatterPattern": "yyyy-MM-dd'T'HH:mm:ssX"
+                "dateFormatterPattern": "EEE, d MMM yyyy HH:mm:ss z"
             }
         ],
         "fallbackChannelPattern": "java-news-and-changes",

application/src/main/java/org/togetherjava/tjbot/features/BotCommandAdapter.java

@@ -5,6 +5,7 @@
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
+import net.dv8tion.jda.api.interactions.InteractionContextType;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import org.jetbrains.annotations.Contract;
@@ -15,6 +16,7 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * Adapter implementation of a {@link BotCommand}. The minimal setup only requires implementation of
@@ -51,7 +53,14 @@ public abstract class BotCommandAdapter implements BotCommand {
      * @param visibility the visibility of the command
      */
     protected BotCommandAdapter(CommandData data, CommandVisibility visibility) {
-        this.data = data.setGuildOnly(visibility == CommandVisibility.GUILD);
+        this.data = data;
+
+        Set<InteractionContextType> contexts = switch (visibility) {
+            case GUILD -> Set.of(InteractionContextType.GUILD);
+            case GLOBAL -> InteractionContextType.ALL;
+        };
+
+        data.setContexts(contexts);
         this.visibility = Objects.requireNonNull(visibility, "The visibility shouldn't be null");
 
         name = data.getName();

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

@@ -34,7 +34,6 @@
 import org.togetherjava.tjbot.features.help.HelpThreadMetadataPurger;
 import org.togetherjava.tjbot.features.help.MarkHelpThreadCloseInDBRoutine;
 import org.togetherjava.tjbot.features.help.PinnedNotificationRemover;
-import org.togetherjava.tjbot.features.javamail.RSSHandlerRoutine;
 import org.togetherjava.tjbot.features.jshell.JShellCommand;
 import org.togetherjava.tjbot.features.jshell.JShellEval;
 import org.togetherjava.tjbot.features.mathcommands.TeXCommand;
@@ -66,6 +65,7 @@
 import org.togetherjava.tjbot.features.projects.ProjectsThreadCreatedListener;
 import org.togetherjava.tjbot.features.reminder.RemindRoutine;
 import org.togetherjava.tjbot.features.reminder.ReminderCommand;
+import org.togetherjava.tjbot.features.rss.RSSHandlerRoutine;
 import org.togetherjava.tjbot.features.system.BotCore;
 import org.togetherjava.tjbot.features.system.LogLevelCommand;
 import org.togetherjava.tjbot.features.tags.TagCommand;

application/src/main/java/org/togetherjava/tjbot/features/chatgpt/ChatGptCommand.java

@@ -80,11 +80,11 @@ public void onSlashCommand(SlashCommandInteractionEvent event) {
     public void onModalSubmitted(ModalInteractionEvent event, List<String> args) {
         event.deferReply().queue();
 
-        String context = "";
         String question = event.getValue(QUESTION_INPUT).getAsString();
 
-        Optional<String> optional = chatGptService.ask(question, context);
-        if (optional.isPresent()) {
+        Optional<String> chatgptResponse =
+                chatGptService.ask(question, "You may use markdown syntax for the response");
+        if (chatgptResponse.isPresent()) {
             userIdToAskedAtCache.put(event.getMember().getId(), Instant.now());
         }
 
@@ -93,7 +93,7 @@ public void onModalSubmitted(ModalInteractionEvent event, List<String> args) {
                     Please try again later.
                 """;
 
-        String response = optional.orElse(errorResponse);
+        String response = chatgptResponse.orElse(errorResponse);
         SelfUser selfUser = event.getJDA().getSelfUser();
 
         MessageEmbed responseEmbed = helper.generateGptResponseEmbed(response, selfUser, question);

application/src/main/java/org/togetherjava/tjbot/features/chatgpt/ChatGptService.java

@@ -10,9 +10,10 @@
 
 import org.togetherjava.tjbot.config.Config;
 
+import javax.annotation.Nullable;
+
 import java.time.Duration;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -91,37 +92,33 @@ public ChatGptService(Config config) {
      * @see <a href="https://platform.openai.com/docs/guides/chat/managing-tokens">ChatGPT
      *      Tokens</a>.
      */
-    public Optional<String> ask(String question, String context) {
+    public Optional<String> ask(String question, @Nullable String context) {
         if (isDisabled) {
             return Optional.empty();
         }
 
+        String contextText = context == null ? "" : ", Context: %s.".formatted(context);
+        String fullQuestion = "(KEEP IT CONCISE, NOT MORE THAN 280 WORDS%s) - %s"
+            .formatted(contextText, question);
+
+        ChatMessage chatMessage = new ChatMessage(ChatMessageRole.USER.value(), fullQuestion);
+        ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
+            .model(AI_MODEL)
+            .messages(List.of(chatMessage))
+            .frequencyPenalty(FREQUENCY_PENALTY)
+            .temperature(TEMPERATURE)
+            .maxTokens(MAX_TOKENS)
+            .n(MAX_NUMBER_OF_RESPONSES)
+            .build();
+        logger.debug("ChatGpt Request: {}", fullQuestion);
+
+        String response = null;
         try {
-            String instructions = "KEEP IT CONCISE, NOT MORE THAN 280 WORDS";
-            String questionWithContext = "context: Category %s on a Java Q&A discord server. %s %s"
-                .formatted(context, instructions, question);
-            ChatMessage chatMessage = new ChatMessage(ChatMessageRole.USER.value(),
-                    Objects.requireNonNull(questionWithContext));
-            ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
-                .model(AI_MODEL)
-                .messages(List.of(chatMessage))
-                .frequencyPenalty(FREQUENCY_PENALTY)
-                .temperature(TEMPERATURE)
-                .maxTokens(MAX_TOKENS)
-                .n(MAX_NUMBER_OF_RESPONSES)
-                .build();
-
-            String response = openAiService.createChatCompletion(chatCompletionRequest)
+            response = openAiService.createChatCompletion(chatCompletionRequest)
                 .getChoices()
                 .getFirst()
                 .getMessage()
                 .getContent();
-
-            if (response == null) {
-                return Optional.empty();
-            }
-
-            return Optional.of(response);
         } catch (OpenAiHttpException openAiHttpException) {
             logger.warn(
                     "There was an error using the OpenAI API: {} Code: {} Type: {} Status Code: {}",
@@ -131,6 +128,12 @@ public Optional<String> ask(String question, String context) {
             logger.warn("There was an error using the OpenAI API: {}",
                     runtimeException.getMessage());
         }
-        return Optional.empty();
+
+        logger.debug("ChatGpt Response: {}", response);
+        if (response == null) {
+            return Optional.empty();
+        }
+
+        return Optional.of(response);
     }
 }

application/src/main/java/org/togetherjava/tjbot/features/code/CodeMessageHandler.java

@@ -224,7 +224,7 @@ public void onMessageUpdated(MessageUpdateEvent event) {
 
             // Re-apply the current action
             return codeReplyMessage.editMessageEmbeds(maybeCodeAction.orElseThrow().apply(code));
-        }).queue(any -> {
+        }).queue(_ -> {
         }, failure -> logger.warn(
                 "Attempted to update a code-reply-message ({}), but failed. The original code-message was {}",
                 codeReplyMessageId, originalMessageId, failure));
@@ -253,7 +253,7 @@ public void onMessageDeleted(MessageDeleteEvent event) {
         // Delete the code reply as well
         originalMessageToCodeReply.invalidate(originalMessageId);
 
-        event.getChannel().deleteMessageById(codeReplyMessageId).queue(any -> {
+        event.getChannel().deleteMessageById(codeReplyMessageId).queue(_ -> {
         }, failure -> logger.warn(
                 "Attempted to delete a code-reply-message ({}), but failed. The original code-message was {}",
                 codeReplyMessageId, originalMessageId, failure));

application/src/main/java/org/togetherjava/tjbot/features/componentids/ComponentIdStore.java

@@ -165,7 +165,7 @@ public void addComponentIdRemovedListener(Consumer<ComponentId> listener) {
      * @throws InvalidComponentIdFormatException if the given component ID was in an unexpected
      *         format and could not be serialized
      */
-    @SuppressWarnings("WeakerAccess")
+    @SuppressWarnings({"WeakerAccess", "squid:S2259"})
     public Optional<ComponentId> get(UUID uuid) {
         synchronized (storeLock) {
             // Get it from the cache or, if not found, the database

application/src/main/java/org/togetherjava/tjbot/features/github/GitHubReference.java

@@ -236,7 +236,7 @@ Optional<GHIssue> findIssue(int id, String targetIssueTitle) {
                 if (issue.getTitle().equals(targetIssueTitle)) {
                     return Optional.of(issue);
                 }
-            } catch (FileNotFoundException ignored) {
+            } catch (FileNotFoundException _) {
                 return Optional.<GHIssue>empty();
             } catch (IOException ex) {
                 throw new UncheckedIOException(ex);
@@ -255,7 +255,7 @@ Optional<GHIssue> findIssue(int id, long defaultRepoId) {
                         issue = repository.getPullRequest(id);
                     }
                     return Optional.of(issue);
-                } catch (FileNotFoundException ignored) {
+                } catch (FileNotFoundException _) {
                     return Optional.<GHIssue>empty();
                 } catch (IOException ex) {
                     throw new UncheckedIOException(ex);