Rebase on develop

* added /warn action that was added in the meantime

Author: Zabuzard

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

@@ -18,6 +18,10 @@ public enum ModerationAction {
      * When a user kicks another user.
      */
     KICK("kicked"),
+    /**
+     * When a user warns another user.
+     */
+    WARN("warned"),
     /**
      * When a user mutes another user.
      */

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

@@ -84,7 +84,7 @@ private void warnUser(@NotNull User target, @NotNull Member author, @NotNull Str
                 reason);
 
         actionsStore.addAction(guild.getIdLong(), author.getIdLong(), target.getIdLong(),
-                ModerationUtils.Action.WARN, null, reason);
+                ModerationAction.WARN, null, reason);
     }
 
     private static @NotNull MessageEmbed sendFeedback(boolean hasSentDm, @NotNull User target,
@@ -93,8 +93,8 @@ private void warnUser(@NotNull User target, @NotNull Member author, @NotNull Str
         if (!hasSentDm) {
             dmNoticeText = "(Unable to send them a DM.)";
         }
-        return ModerationUtils.createActionResponse(author.getUser(), ModerationUtils.Action.WARN,
-                target, dmNoticeText, reason);
+        return ModerationUtils.createActionResponse(author.getUser(), ModerationAction.WARN, target,
+                dmNoticeText, reason);
     }
 
     @Override