Release v3.6

application/build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
     id 'application'
-    id 'com.google.cloud.tools.jib' version '3.2.1'
+    id 'com.google.cloud.tools.jib' version '3.3.0'
     id 'com.github.johnrengelman.shadow' version '7.1.0'
     id 'database-settings'
 }
@@ -43,6 +43,7 @@ dependencies {
     implementation 'org.jetbrains:annotations:23.0.0'
 
     implementation project(':database')
+    implementation project(':utils')
 
     implementation 'net.dv8tion:JDA:5.0.0-alpha.9'
 
@@ -62,7 +63,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.0'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
 
-	implementation 'com.github.freva:ascii-table:1.4.0'
+	implementation 'com.github.freva:ascii-table:1.6.0'
 
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
 

application/config.json.template

@@ -45,5 +45,43 @@
        ],
        "categoryRoleSuffix": " - Helper"
    },
-    "mediaOnlyChannelPattern": "memes"
+    "mediaOnlyChannelPattern": "memes",
+    "blacklistedFileExtension": [
+        "application",
+        "bat",
+        "cmd",
+        "com",
+        "cpl",
+        "exe",
+        "gadget",
+        "hta",
+        "inf",
+        "jse",
+        "lnk",
+        "msc",
+        "msh",
+        "msh1",
+        "msh1xml",
+        "msh2",
+        "msh2xml",
+        "mshxml",
+        "msi",
+        "msp",
+        "pif",
+        "ps1",
+        "ps1xml",
+        "ps2",
+        "ps2xml",
+        "psc1",
+        "psc2",
+        "scf",
+        "scr",
+        "vb",
+        "vbe",
+        "vbs",
+        "ws",
+        "wsc",
+        "wsf",
+        "wsh"
+  ]
 }

application/src/main/java/org/togetherjava/tjbot/BootstrapLauncher.java

@@ -20,7 +20,6 @@ public static void main(String[] args) {
         Application.main(args);
     }
 
-
     /**
      * Sets any system-properties before anything else is touched.
      */

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

@@ -11,6 +11,7 @@
 import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.WolframAlphaCommand;
 import org.togetherjava.tjbot.commands.mediaonly.MediaOnlyChannelListener;
 import org.togetherjava.tjbot.commands.moderation.*;
+import org.togetherjava.tjbot.commands.moderation.attachment.BlacklistedAttachmentListener;
 import org.togetherjava.tjbot.commands.moderation.scam.ScamBlocker;
 import org.togetherjava.tjbot.commands.moderation.scam.ScamHistoryPurgeRoutine;
 import org.togetherjava.tjbot.commands.moderation.scam.ScamHistoryStore;
@@ -31,7 +32,6 @@
 import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
 import org.togetherjava.tjbot.routines.ModAuditLogRoutine;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -59,13 +59,12 @@ private Features() {
      * @param config the configuration features should use
      * @return a collection of all features
      */
-    @Nonnull
     public static Collection<Feature> createFeatures(JDA jda, Database database, Config config) {
         TagSystem tagSystem = new TagSystem(database);
         ModerationActionsStore actionsStore = new ModerationActionsStore(database);
         ModAuditLogWriter modAuditLogWriter = new ModAuditLogWriter(config);
         ScamHistoryStore scamHistoryStore = new ScamHistoryStore(database);
-        HelpSystemHelper helpSystemHelper = new HelpSystemHelper(config, database);
+        HelpSystemHelper helpSystemHelper = new HelpSystemHelper(jda, config, database);
 
         // NOTE The system can add special system relevant commands also by itself,
         // hence this list may not necessarily represent the full list of all commands actually
@@ -92,6 +91,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         features.add(new ImplicitAskListener(config, helpSystemHelper));
         features.add(new MediaOnlyChannelListener(config));
         features.add(new FileSharingMessageListener(config));
+        features.add(new BlacklistedAttachmentListener(config, modAuditLogWriter));
 
         // Event receivers
         features.add(new RejoinModerationRoleListener(actionsStore, config));

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

@@ -3,7 +3,6 @@
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
 
-import javax.annotation.Nonnull;
 import java.util.regex.Pattern;
 
 /**
@@ -28,7 +27,6 @@ public interface MessageReceiver extends Feature {
      *
      * @return the pattern matching the names of relevant channels
      */
-    @Nonnull
     Pattern getChannelNamePattern();
 
     /**

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

@@ -3,7 +3,6 @@
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
 
-import javax.annotation.Nonnull;
 import java.util.regex.Pattern;
 
 /**
@@ -29,7 +28,6 @@ protected MessageReceiverAdapter(Pattern channelNamePattern) {
     }
 
     @Override
-    @Nonnull
     public final Pattern getChannelNamePattern() {
         return channelNamePattern;
     }

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

@@ -2,7 +2,6 @@
 
 import net.dv8tion.jda.api.JDA;
 
-import javax.annotation.Nonnull;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -24,7 +23,6 @@ public interface Routine extends Feature {
      *
      * @return the schedule of this routine
      */
-    @Nonnull
     Schedule createSchedule();
 
     /**
@@ -49,7 +47,6 @@ public interface Routine extends Feature {
     record Schedule(ScheduleMode mode, long initialDuration, long duration, TimeUnit unit) {
     }
 
-
     /**
      * Whether subsequent executions of a routine are executed at a fixed rate or are delayed.
      */

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

@@ -13,7 +13,6 @@
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 /**
@@ -49,7 +48,6 @@ public interface SlashCommand extends UserInteractor {
      *
      * @return the description of the command
      */
-    @Nonnull
     String getDescription();
 
     /**
@@ -59,7 +57,6 @@ public interface SlashCommand extends UserInteractor {
      *
      * @return the visibility of the command
      */
-    @Nonnull
     SlashCommandVisibility getVisibility();
 
     /**
@@ -77,7 +74,6 @@ public interface SlashCommand extends UserInteractor {
      *
      * @return the command data of this command
      */
-    @Nonnull
     SlashCommandData getData();
 
     /**

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

@@ -15,7 +15,6 @@
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
 
-import javax.annotation.Nonnull;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -90,25 +89,21 @@ protected SlashCommandAdapter(String name, String description,
     }
 
     @Override
-    @Nonnull
     public final String getName() {
         return name;
     }
 
     @Override
-    @Nonnull
     public final String getDescription() {
         return description;
     }
 
     @Override
-    @Nonnull
     public final SlashCommandVisibility getVisibility() {
         return visibility;
     }
 
     @Override
-    @Nonnull
     public final SlashCommandData getData() {
         return data;
     }
@@ -145,7 +140,6 @@ public void onSelectionMenu(SelectMenuInteractionEvent event, List<String> args)
      * @return the generated component ID
      */
     @SuppressWarnings("OverloadedVarargsMethod")
-    @Nonnull
     protected final String generateComponentId(String... args) {
         return generateComponentId(Lifespan.REGULAR, args);
     }
@@ -163,7 +157,6 @@ protected final String generateComponentId(String... args) {
      * @return the generated component ID
      */
     @SuppressWarnings({"OverloadedVarargsMethod", "WeakerAccess"})
-    @Nonnull
     protected final String generateComponentId(Lifespan lifespan, String... args) {
         return Objects.requireNonNull(componentIdGenerator)
             .generate(new ComponentId(getName(), Arrays.asList(args)), lifespan);
@@ -194,7 +187,6 @@ protected final String generateComponentId(Lifespan lifespan, String... args) {
      * @return the generated list of options
      */
     @Unmodifiable
-    @Nonnull
     protected static List<OptionData> generateMultipleOptions(OptionData optionData,
             @Range(from = 1, to = 25) int amount) {
         String baseName = optionData.getName();
@@ -216,7 +208,6 @@ protected static List<OptionData> generateMultipleOptions(OptionData optionData,
      * @return all options with the given prefix
      */
     @Unmodifiable
-    @Nonnull
     protected static List<OptionMapping> getMultipleOptionsByNamePrefix(
             CommandInteractionPayload event, String namePrefix) {
         return event.getOptions()

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

@@ -5,7 +5,6 @@
 import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 /**
@@ -27,7 +26,6 @@ public interface UserInteractor extends Feature {
      *
      * @return the name of the interactor
      */
-    @Nonnull
     String getName();
 
     /**

application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java

@@ -19,13 +19,11 @@
 import org.togetherjava.tjbot.commands.SlashCommandVisibility;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
 
-import javax.annotation.Nonnull;
 import java.awt.Color;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-
 /**
  * Implements the {@code /role-select} command.
  * <p>
@@ -57,7 +55,6 @@ public final class RoleSelectCommand extends SlashCommandAdapter {
 
     private static final int OPTIONAL_ROLES_AMOUNT = 22;
 
-
     /**
      * Construct an instance.
      */
@@ -193,7 +190,6 @@ private void sendRoleSelectionMenu(final CommandInteraction event,
         event.replyEmbeds(embed).addActionRow(menu.build()).queue();
     }
 
-    @Nonnull
     private static SelectOption mapToSelectOption(Role role) {
         RoleIcon roleIcon = role.getIcon();
 
@@ -243,7 +239,6 @@ private static void handleRoleSelection(SelectMenuInteractionEvent event, Guild
         modifyRoles(event, event.getMember(), guild, rolesToAdd, rolesToRemove);
     }
 
-    @Nonnull
     private static Function<SelectOption, Optional<Role>> optionToRole(Guild guild) {
         return option -> {
             Role role = guild.getRoleById(option.getValue());
@@ -265,7 +260,6 @@ private static void modifyRoles(IReplyCallback event, Member target, Guild guild
             .queue();
     }
 
-    @Nonnull
     private static MessageEmbed createEmbed(String title, CharSequence description) {
         return new EmbedBuilder().setTitle(title)
             .setDescription(description)

application/src/main/java/org/togetherjava/tjbot/commands/basic/SuggestionsUpDownVoter.java

@@ -12,7 +12,6 @@
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.SuggestionsConfig;
 
-import javax.annotation.Nonnull;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
@@ -89,7 +88,6 @@ private static void reactWith(String emoteName, String fallbackUnicodeEmote, Gui
         });
     }
 
-    @Nonnull
     private static Optional<Emote> getEmoteByName(String name, Guild guild) {
         return guild.getEmotesByName(name, false).stream().findAny();
     }