Revert "Adding /quarantine and /unquarantine (#398)"

This reverts commit dff6068.

Author: nltbee

application/config.json.template

@@ -21,6 +21,5 @@
        "channelPattern": "tj_suggestions",
        "upVoteEmoteName": "peepo_yes",
        "downVoteEmoteName": "peepo_no"
-   },
-   "quarantinedRolePattern": "Quarantined"
+   }
 }

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

@@ -69,7 +69,7 @@ public enum Features {
         features.add(new SuggestionsUpDownVoter(config));
 
         // Event receivers
-        features.add(new RejoinModerationRoleListener(actionsStore, config));
+        features.add(new RejoinMuteListener(actionsStore, config));
 
         // Slash commands
         features.add(new PingCommand());
@@ -89,8 +89,6 @@ public enum Features {
         features.add(new RoleSelectCommand());
         features.add(new NoteCommand(actionsStore, config));
         features.add(new RemindCommand(database));
-        features.add(new QuarantineCommand(actionsStore, config));
-        features.add(new UnquarantineCommand(actionsStore, config));
 
         // Mixtures
         features.add(new FreeCommand(config));

application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationAction.java

@@ -30,14 +30,6 @@ public enum ModerationAction {
      * When a user unmutes another user.
      */
     UNMUTE("unmuted"),
-    /**
-     * When a user quarantines another user.
-     */
-    QUARANTINE("quarantined"),
-    /**
-     * When a user unquarantines another user.
-     */
-    UNQUARANTINE("unquarantined"),
     /**
      * When a user writes a note about another user.
      */

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

@@ -348,32 +348,6 @@ public static Predicate<String> getIsMutedRolePredicate(@NotNull Config config)
         return guild.getRoles().stream().filter(role -> isMutedRole.test(role.getName())).findAny();
     }
 
-    /**
-     * Gets a predicate that identifies the role used to quarantine a member in a guild.
-     *
-     * @param config the config used to identify the quarantined role
-     * @return predicate that matches the name of the quarantined role
-     */
-    public static Predicate<String> getIsQuarantinedRolePredicate(@NotNull Config config) {
-        return Pattern.compile(config.getQuarantinedRolePattern()).asMatchPredicate();
-    }
-
-    /**
-     * Gets the role used to quarantine a member in a guild.
-     *
-     * @param guild the guild to get the quarantined role from
-     * @param config the config used to identify the quarantined role
-     * @return the quarantined role, if found
-     */
-    public static @NotNull Optional<Role> getQuarantinedRole(@NotNull Guild guild,
-            @NotNull Config config) {
-        Predicate<String> isQuarantinedRole = getIsQuarantinedRolePredicate(config);
-        return guild.getRoles()
-            .stream()
-            .filter(role -> isQuarantinedRole.test(role.getName()))
-            .findAny();
-    }
-
     /**
      * Computes a temporary data wrapper representing the action with the given duration.
      *

application/src/main/java/org/togetherjava/tjbot/commands/moderation/MuteCommand.java

@@ -129,7 +129,7 @@ private void muteUserFlow(@NotNull Member target, @NotNull Member author,
             @NotNull Guild guild, @NotNull SlashCommandEvent event) {
         sendDm(target, temporaryData, reason, guild, event)
             .flatMap(hasSentDm -> muteUser(target, author, temporaryData, reason, guild)
-                .map(result -> hasSentDm))
+                .map(banResult -> hasSentDm))
             .map(hasSentDm -> sendFeedback(hasSentDm, target, author, temporaryData, reason))
             .flatMap(event::replyEmbeds)
             .queue();