Moved moderation and audit commands into proper packages

Author: Zabuzard

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

@@ -20,6 +20,9 @@
 import org.togetherjava.tjbot.features.moderation.*;
 import org.togetherjava.tjbot.features.moderation.ReportCommand;
 import org.togetherjava.tjbot.features.moderation.attachment.BlacklistedAttachmentListener;
+import org.togetherjava.tjbot.features.moderation.audit.AuditCommand;
+import org.togetherjava.tjbot.features.moderation.audit.ModAuditLogRoutine;
+import org.togetherjava.tjbot.features.moderation.audit.ModAuditLogWriter;
 import org.togetherjava.tjbot.features.moderation.modmail.ModMailCommand;
 import org.togetherjava.tjbot.features.moderation.scam.ScamBlocker;
 import org.togetherjava.tjbot.features.moderation.scam.ScamHistoryPurgeRoutine;
@@ -36,8 +39,6 @@
 import org.togetherjava.tjbot.features.tophelper.TopHelpersCommand;
 import org.togetherjava.tjbot.features.tophelper.TopHelpersMessageListener;
 import org.togetherjava.tjbot.features.tophelper.TopHelpersPurgeMessagesRoutine;
-import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
-import org.togetherjava.tjbot.routines.ModAuditLogRoutine;
 
 import java.util.ArrayList;
 import java.util.Collection;

application/src/main/java/org/togetherjava/tjbot/features/help/AutoPruneHelperRoutine.java

@@ -11,7 +11,7 @@
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.features.Routine;
-import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
+import org.togetherjava.tjbot.features.moderation.audit.ModAuditLogWriter;
 
 import java.time.Duration;
 import java.time.Instant;

application/src/main/java/org/togetherjava/tjbot/features/moderation/ModerationUtils.java

@@ -50,7 +50,7 @@ private ModerationUtils() {
      * The ambient color used by moderation actions, often used to streamline the color theme of
      * embeds.
      */
-    static final Color AMBIENT_COLOR = Color.decode("#895FE8");
+    public static final Color AMBIENT_COLOR = Color.decode("#895FE8");
 
     /**
      * Actions with timely constraint, like being muted for 1 hour.
@@ -105,7 +105,7 @@ static boolean handleReason(CharSequence reason, IReplyCallback event) {
      * @param event the event used to respond to the user
      * @return Whether the author and bot can interact with the target user
      */
-    static boolean handleCanInteractWithTarget(String actionVerb, Member bot, Member author,
+    public static boolean handleCanInteractWithTarget(String actionVerb, Member bot, Member author,
             Member target, IReplyCallback event) {
         String targetTag = target.getUser().getAsTag();
         if (!author.canInteract(target)) {

application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java

@@ -10,6 +10,7 @@
 
 import org.togetherjava.tjbot.features.CommandVisibility;
 import org.togetherjava.tjbot.features.SlashCommandAdapter;
+import org.togetherjava.tjbot.features.moderation.audit.AuditCommand;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;

application/src/main/java/org/togetherjava/tjbot/features/moderation/attachment/BlacklistedAttachmentListener.java

@@ -11,9 +11,9 @@
 
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.features.MessageReceiverAdapter;
+import org.togetherjava.tjbot.features.moderation.audit.ModAuditLogWriter;
 import org.togetherjava.tjbot.features.moderation.modmail.ModMailCommand;
 import org.togetherjava.tjbot.features.utils.MessageUtils;
-import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
 
 import java.awt.*;
 import java.util.List;

application/src/main/java/org/togetherjava/tjbot/features/moderation/AuditCommand.java renamed to application/src/main/java/org/togetherjava/tjbot/features/moderation/audit/AuditCommand.java

@@ -1,4 +1,4 @@
-package org.togetherjava.tjbot.features.moderation;
+package org.togetherjava.tjbot.features.moderation.audit;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
@@ -21,6 +21,10 @@
 
 import org.togetherjava.tjbot.features.CommandVisibility;
 import org.togetherjava.tjbot.features.SlashCommandAdapter;
+import org.togetherjava.tjbot.features.moderation.ActionRecord;
+import org.togetherjava.tjbot.features.moderation.ModerationAction;
+import org.togetherjava.tjbot.features.moderation.ModerationActionsStore;
+import org.togetherjava.tjbot.features.moderation.ModerationUtils;
 import org.togetherjava.tjbot.features.utils.Pagination;
 
 import javax.annotation.Nullable;

application/src/main/java/org/togetherjava/tjbot/routines/ModAuditLogRoutine.java renamed to application/src/main/java/org/togetherjava/tjbot/features/moderation/audit/ModAuditLogRoutine.java

@@ -1,4 +1,4 @@
-package org.togetherjava.tjbot.routines;
+package org.togetherjava.tjbot.features.moderation.audit;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
@@ -24,7 +24,6 @@
 import org.togetherjava.tjbot.db.generated.tables.ModAuditLogGuildProcess;
 import org.togetherjava.tjbot.features.Routine;
 import org.togetherjava.tjbot.features.moderation.ModerationUtils;
-import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
 
 import javax.annotation.Nullable;
 

application/src/main/java/org/togetherjava/tjbot/moderation/ModAuditLogWriter.java renamed to application/src/main/java/org/togetherjava/tjbot/features/moderation/audit/ModAuditLogWriter.java

@@ -1,4 +1,4 @@
-package org.togetherjava.tjbot.moderation;
+package org.togetherjava.tjbot.features.moderation.audit;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Guild;

application/src/main/java/org/togetherjava/tjbot/features/moderation/audit/package-info.java

@@ -0,0 +1,11 @@
+/**
+ * This packages offers all the functionality for auditing moderation actions, see
+ * {@link org.togetherjava.tjbot.features.moderation.audit.AuditCommand} as main entry point.
+ */
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+package org.togetherjava.tjbot.features.moderation.audit;
+
+import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

application/src/main/java/org/togetherjava/tjbot/features/moderation/temp/TemporaryModerationRoutine.java

@@ -12,6 +12,7 @@
 import org.togetherjava.tjbot.features.moderation.ActionRecord;
 import org.togetherjava.tjbot.features.moderation.ModerationAction;
 import org.togetherjava.tjbot.features.moderation.ModerationActionsStore;
+import org.togetherjava.tjbot.features.moderation.audit.AuditCommand;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import java.util.Map;
@@ -27,8 +28,7 @@
  * {@link ModerationActionsStore}.
  * <p>
  * Revoked actions are compatible with {@link ModerationActionsStore} and commands such as
- * {@link org.togetherjava.tjbot.features.moderation.UnbanCommand} and
- * {@link org.togetherjava.tjbot.features.moderation.AuditCommand}.
+ * {@link org.togetherjava.tjbot.features.moderation.UnbanCommand} and {@link AuditCommand}.
  */
 public final class TemporaryModerationRoutine implements Routine {
     private static final Logger logger = LoggerFactory.getLogger(TemporaryModerationRoutine.class);