Release 1.13.12 (#517)

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "de.chojo"
-version = "1.13.11"
+version = "1.13.12"
 
 repositories {
     maven("https://eldonexus.de/repository/maven-public")
@@ -35,7 +35,7 @@ dependencies {
     implementation("org.knowm.xchart", "xchart", "3.8.3")
 
     // unit testing
-    testImplementation(platform("org.junit:junit-bom:5.9.2"))
+    testImplementation(platform("org.junit:junit-bom:5.9.3"))
     testImplementation("org.junit.jupiter", "junit-jupiter")
     testImplementation("org.knowm.xchart", "xchart", "3.8.3")
 }

docker/Dockerfile

@@ -9,4 +9,4 @@ WORKDIR /app
 
 COPY --from=build /build/libs/rep-bot-*-all.jar bot.jar
 
-ENTRYPOINT ["java", "-Dbot.config=config/config.json", "-Dlog4j.configurationFile=config/log4j2.xml", "-jar" , "bot.jar"]
+ENTRYPOINT ["java", "-Dbot.config=config/config.json", "-Dlog4j.configurationFile=config/log4j2.xml", "-Dcjda.localisation.error.name=false", "-jar" , "bot.jar"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

settings.gradle.kts

@@ -1,5 +1,5 @@
 rootProject.name = "rep-bot"
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.5.0")
 }

src/main/java/de/chojo/repbot/analyzer/MessageAnalyzer.java

@@ -20,6 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
+import javax.validation.constraints.Null;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

src/main/java/de/chojo/repbot/commands/scan/util/ScanProcess.java

@@ -4,6 +4,7 @@
 import de.chojo.jdautil.localization.util.Replacement;
 import de.chojo.jdautil.parsing.Verifier;
 import de.chojo.repbot.analyzer.MessageAnalyzer;
+import de.chojo.repbot.dao.access.guild.settings.Settings;
 import de.chojo.repbot.dao.provider.Guilds;
 import de.chojo.repbot.util.Text;
 import net.dv8tion.jda.api.entities.Guild;
@@ -86,12 +87,11 @@ public boolean scan() {
             countScan();
 
             if (message.getAuthor().isBot()) continue;
+            var settings = guilds.guild(guild).settings();
+            var result = messageAnalyzer.processMessage(pattern, message, settings, false,
+                    settings.abuseProtection().maxMessageReputation());
 
-            var result = messageAnalyzer.processMessage(pattern, message, null, false, guilds.guild(guild).settings()
-                                                                                             .abuseProtection()
-                                                                                             .maxMessageReputation());
-
-            if(result.isEmpty()) continue;
+            if (result.isEmpty()) continue;
 
             var matchResult = result.asMatch();
 
@@ -103,15 +103,15 @@ public boolean scan() {
                 switch (matchResult.thankType()) {
                     case FUZZY, MENTION -> {
                         if (reputation.user(resultReceiver.getUser())
-                                      .addOldReputation(donator != null && guild.isMember(donator) ? donator : null,
-                                              message, null, matchResult.thankType())) {
+                                .addOldReputation(donator != null && guild.isMember(donator) ? donator : null,
+                                        message, null, matchResult.thankType())) {
                             hit();
                         }
                     }
                     case ANSWER -> {
                         if (reputation.user(resultReceiver.getUser())
-                                      .addOldReputation(donator != null && guild.isMember(donator) ? donator : null,
-                                              message, matchResult.asAnswer().referenceMessage(), matchResult.thankType())) {
+                                .addOldReputation(donator != null && guild.isMember(donator) ? donator : null,
+                                        message, matchResult.asAnswer().referenceMessage(), matchResult.thankType())) {
                             hit();
                         }
 

src/main/java/de/chojo/repbot/dao/access/Analyzer.java

@@ -23,10 +23,16 @@ public void cleanup() {
         builder().query("""
                         DELETE FROM analyzer_results WHERE analyzed < NOW() - ?::interval;
                         """)
-                 .parameter(stmt -> stmt.setString("%d HOURS".formatted(configuration.cleanup().analyzerLogHours())))
-                 .delete()
-                 .send()
-                 .whenComplete(Futures.whenComplete(res -> log.debug("Deleted {} entries from analyzer log", res.rows()),
-                         err -> log.error(LogNotify.NOTIFY_ADMIN, "Could not cleanup analyzer log.", err)));
+                .parameter(stmt -> stmt.setString("%d HOURS".formatted(configuration.cleanup().analyzerLogHours())))
+                .delete()
+                .send()
+                .whenComplete(Futures.whenComplete(res -> log.debug("Deleted {} entries from analyzer log", res.rows()),
+                        err -> log.error(LogNotify.NOTIFY_ADMIN, "Could not cleanup analyzer log.", err)));
+        builder().query("DELETE FROM reputation_results WHERE submitted < now() - ?::interval")
+                .parameter(stmt -> stmt.setString("%d HOURS".formatted(configuration.cleanup().analyzerLogHours())))
+                .delete()
+                .send()
+                .whenComplete(Futures.whenComplete(res -> log.debug("Deleted {} entries from reputation results", res.rows()),
+                        err -> log.error(LogNotify.NOTIFY_ADMIN, "Could not cleanup reputation results.", err)));
     }
 }