Logging the /tag-manage command

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

@@ -19,6 +19,7 @@
 import org.togetherjava.tjbot.commands.tophelper.TopHelpersPurgeMessagesRoutine;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.db.Database;
+import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
 import org.togetherjava.tjbot.routines.ModAuditLogRoutine;
 
 import java.util.ArrayList;
@@ -50,14 +51,15 @@ public enum Features {
             @NotNull Database database, @NotNull Config config) {
         TagSystem tagSystem = new TagSystem(database);
         ModerationActionsStore actionsStore = new ModerationActionsStore(database);
+        ModAuditLogWriter modAuditLogWriter = new ModAuditLogWriter(config);
 
         // 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
         // available.
         Collection<Feature> features = new ArrayList<>();
 
         // Routines
-        features.add(new ModAuditLogRoutine(database, config));
+        features.add(new ModAuditLogRoutine(database, config, modAuditLogWriter));
         features.add(new TemporaryModerationRoutine(jda, actionsStore, config));
         features.add(new TopHelpersPurgeMessagesRoutine(database));
         features.add(new RemindRoutine(database));
@@ -73,7 +75,7 @@ public enum Features {
         features.add(new PingCommand());
         features.add(new TeXCommand());
         features.add(new TagCommand(tagSystem));
-        features.add(new TagManageCommand(tagSystem, config));
+        features.add(new TagManageCommand(tagSystem, config, modAuditLogWriter));
         features.add(new TagsCommand(tagSystem));
         features.add(new VcActivityCommand());
         features.add(new WarnCommand(actionsStore, config));

application/src/main/java/org/togetherjava/tjbot/commands/tags/TagManageCommand.java

@@ -67,18 +67,24 @@ public final class TagManageCommand extends SlashCommandAdapter {
     private final TagSystem tagSystem;
     private final Predicate<String> hasRequiredRole;
 
+    private final ModAuditLogWriter modAuditLogWriter;
+
     /**
      * Creates a new instance, using the given tag system as base.
      *
      * @param tagSystem the system providing the actual tag data
      * @param config the config to use for this
+     * @param modAuditLogWriter the mod audit log writer to use for this
      */
-    public TagManageCommand(TagSystem tagSystem, @NotNull Config config) {
+    public TagManageCommand(TagSystem tagSystem, @NotNull Config config,
+            @NotNull ModAuditLogWriter modAuditLogWriter) {
         super("tag-manage", "Provides commands to manage all tags", SlashCommandVisibility.GUILD);
 
         this.tagSystem = tagSystem;
         hasRequiredRole = Pattern.compile(config.getTagManageRolePattern()).asMatchPredicate();
 
+        this.modAuditLogWriter = modAuditLogWriter;
+
         // TODO Think about adding a "Are you sure"-dialog to 'edit', 'edit-with-message' and
         // 'delete'
         getData().addSubcommands(new SubcommandData(Subcommand.RAW.name,
@@ -359,33 +365,33 @@ private void logAction(@NotNull Subcommand subcommand, @NotNull Guild guild,
         }
 
         switch (subcommand) {
-            case CREATE -> ModAuditLogWriter.write("Tag-Manage Create",
+            case CREATE -> modAuditLogWriter.write("Tag-Manage Create",
                     String.format(LOG_EMBED_DESCRIPTION, subcommand.getActionVerb(), id), author,
                     triggeredAt, guild, new ModAuditLogWriter.Attachment(CONTENT_FILE_NAME,
                             Objects.requireNonNull(newContent)));
 
-            case CREATE_WITH_MESSAGE -> ModAuditLogWriter.write("Tag-Manage Create with message",
+            case CREATE_WITH_MESSAGE -> modAuditLogWriter.write("Tag-Manage Create with message",
                     String.format(LOG_EMBED_DESCRIPTION, subcommand.getActionVerb(), id), author,
                     triggeredAt, guild, new ModAuditLogWriter.Attachment(CONTENT_FILE_NAME,
                             Objects.requireNonNull(newContent)));
 
-            case EDIT -> ModAuditLogWriter.write("Tag-Manage Edit",
+            case EDIT -> modAuditLogWriter.write("Tag-Manage Edit",
                     String.format(LOG_EMBED_DESCRIPTION, subcommand.getActionVerb(), id), author,
                     triggeredAt, guild,
                     new ModAuditLogWriter.Attachment(NEW_CONTENT_FILE_NAME,
                             Objects.requireNonNull(newContent)),
                     new ModAuditLogWriter.Attachment(PREVIOUS_CONTENT_FILE_NAME,
                             Objects.requireNonNull(previousContent)));
 
-            case EDIT_WITH_MESSAGE -> ModAuditLogWriter.write("Tag-Manage Edit with message",
+            case EDIT_WITH_MESSAGE -> modAuditLogWriter.write("Tag-Manage Edit with message",
                     String.format(LOG_EMBED_DESCRIPTION, subcommand.getActionVerb(), id), author,
                     triggeredAt, guild,
                     new ModAuditLogWriter.Attachment(NEW_CONTENT_FILE_NAME,
                             Objects.requireNonNull(newContent)),
                     new ModAuditLogWriter.Attachment(PREVIOUS_CONTENT_FILE_NAME,
                             Objects.requireNonNull(previousContent)));
 
-            case DELETE -> ModAuditLogWriter.write("Tag-Manage Delete",
+            case DELETE -> modAuditLogWriter.write("Tag-Manage Delete",
                     String.format(LOG_EMBED_DESCRIPTION, subcommand.getActionVerb(), id), author,
                     triggeredAt, guild, new ModAuditLogWriter.Attachment(PREVIOUS_CONTENT_FILE_NAME,
                             Objects.requireNonNull(previousContent)));

application/src/main/java/org/togetherjava/tjbot/moderation/ModAuditLogWriter.java

@@ -25,13 +25,23 @@
  * Use {@link ModAuditLogWriter#write(String, String, User, TemporalAccessor, Guild, Attachment...)}
  * to log an entry.
  */
-public enum ModAuditLogWriter {
-    ;
+public final class ModAuditLogWriter {
     private static final Color EMBED_COLOR = Color.decode("#3788AC");
 
-    private static final Logger logger = LoggerFactory.getLogger(ModAuditLogWriter.class);
+    private final Config config;
 
-    private static Pattern auditLogChannelNamePattern = null;
+    private final Logger logger = LoggerFactory.getLogger(ModAuditLogWriter.class);
+
+    private Pattern auditLogChannelNamePattern = null;
+
+    /**
+     * Creates a new instance.
+     *
+     * @param config the config to use for this
+     */
+    public ModAuditLogWriter(@NotNull Config config) {
+        this.config = config;
+    }
 
     /**
      * Sends a log on the mod audit log channel.
@@ -43,8 +53,8 @@ public enum ModAuditLogWriter {
      * @param guild the guild to write this log to
      * @param attachments attachments that will be added to the message. none or many.
      */
-    public static void write(@NotNull String title, @NotNull String description,
-            @NotNull User author, @NotNull TemporalAccessor timestamp, @NotNull Guild guild,
+    public void write(@NotNull String title, @NotNull String description, @NotNull User author,
+            @NotNull TemporalAccessor timestamp, @NotNull Guild guild,
             @NotNull Attachment... attachments) {
         Optional<TextChannel> auditLogChannel = getAndHandleModAuditLogChannel(guild);
         if (auditLogChannel.isEmpty()) {
@@ -71,10 +81,9 @@ public static void write(@NotNull String title, @NotNull String description,
      *
      * @param guild the guild to look for the channel in
      */
-    public static Optional<TextChannel> getAndHandleModAuditLogChannel(@NotNull Guild guild) {
+    public Optional<TextChannel> getAndHandleModAuditLogChannel(@NotNull Guild guild) {
         if (auditLogChannelNamePattern == null) {
-            auditLogChannelNamePattern =
-                    Pattern.compile(Config.getInstance().getModAuditLogChannelPattern());
+            auditLogChannelNamePattern = Pattern.compile(config.getModAuditLogChannelPattern());
         }
 
         Optional<TextChannel> auditLogChannel = guild.getTextChannelCache()
@@ -86,7 +95,7 @@ public static Optional<TextChannel> getAndHandleModAuditLogChannel(@NotNull Guil
         if (auditLogChannel.isEmpty()) {
             logger.warn(
                     "Unable to log moderation events, did not find a mod audit log channel matching the configured pattern '{}' for guild '{}'",
-                    Config.getInstance().getModAuditLogChannelPattern(), guild.getName());
+                    config.getModAuditLogChannelPattern(), guild.getName());
         }
         return auditLogChannel;
     }

application/src/main/java/org/togetherjava/tjbot/routines/ModAuditLogRoutine.java

@@ -51,16 +51,20 @@ public final class ModAuditLogRoutine implements Routine {
 
     private final Database database;
     private final Config config;
+    private final ModAuditLogWriter modAuditLogWriter;
 
     /**
      * Creates a new instance.
      *
      * @param database the database for memorizing audit log dates
      * @param config the config to use for this
+     * @param modAuditLogWriter the mod audit log writer to use for this
      */
-    public ModAuditLogRoutine(@NotNull Database database, @NotNull Config config) {
+    public ModAuditLogRoutine(@NotNull Database database, @NotNull Config config,
+            @NotNull ModAuditLogWriter modAuditLogWriter) {
         this.config = config;
         this.database = database;
+        this.modAuditLogWriter = modAuditLogWriter;
     }
 
     private static @NotNull RestAction<AuditLogMessage> handleAction(@NotNull Action action,
@@ -215,7 +219,7 @@ private void checkAuditLogsRoutine(@NotNull JDA jda) {
             }
 
             Optional<TextChannel> auditLogChannel =
-                    ModAuditLogWriter.getAndHandleModAuditLogChannel(guild);
+                    modAuditLogWriter.getAndHandleModAuditLogChannel(guild);
             if (auditLogChannel.isEmpty()) {
                 return;
             }