From 9cc9bb13ad44418b0f146eea8d07cd02c1125caa Mon Sep 17 00:00:00 2001
From: Salmonllama <a.gryczewski999@gmail.com>
Date: Tue, 24 Nov 2020 14:30:30 -0500
Subject: [PATCH] Finalized UserBlacklist command, model, and controller

---
 .../BlacklistUserCommand.java                   | 13 +++++++++----
 .../controllers/UserBlacklistController.java    |  3 +--
 .../fsbot/database/models/UserBlacklist.java    | 17 ++++++++---------
 3 files changed, 18 insertions(+), 15 deletions(-)
 rename src/main/java/dev/salmonllama/fsbot/commands/{developer => staff}/BlacklistUserCommand.java (90%)

diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/BlacklistUserCommand.java
similarity index 90%
rename from src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java
rename to src/main/java/dev/salmonllama/fsbot/commands/staff/BlacklistUserCommand.java
index 8a7ff04..7af91c0 100644
--- a/src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java
+++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/BlacklistUserCommand.java
@@ -1,4 +1,9 @@
-package dev.salmonllama.fsbot.commands.developer;
+/*
+ * Copyright (c) 2020. Aleksei Gryczewski
+ * All rights reserved.
+ */
+
+package dev.salmonllama.fsbot.commands.staff;
 
 import dev.salmonllama.fsbot.database.controllers.UserBlacklistController;
 import dev.salmonllama.fsbot.database.models.UserBlacklist;
@@ -12,8 +17,8 @@ public class BlacklistUserCommand extends Command {
     @Override public String name() { return "Blacklist User"; }
     @Override public String description() { return "Adds the user to the bot's blacklist, preventing them from using any commands or features"; }
     @Override public String usage() { return "blacklistuser <userId> <reason>"; }
-    @Override public CommandCategory category() { return CommandCategory.DEVELOPER; }
-    @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "owner"); }
+    @Override public CommandCategory category() { return CommandCategory.STAFF; }
+    @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "admin"); }
     @Override public List<String> aliases() { return Arrays.asList("blacklistuser", "bluser", "sabusr"); }
 
     @Override
@@ -40,7 +45,7 @@ public class BlacklistUserCommand extends Command {
                 });
             }, () -> {
                 // Add user to the blacklist, check args
-                UserBlacklist.UserBlacklistBuilder blBuilder = new UserBlacklist.UserBlacklistBuilder(args[0]);
+                UserBlacklist.Builder blBuilder = new UserBlacklist.Builder(args[0]);
                 EmbedBuilder response = new EmbedBuilder().setTitle("Added User to Blacklist").addField("User ID:", args[0]);
 
                 if (args.length > 1) {
diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/UserBlacklistController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/UserBlacklistController.java
index fbbb0e2..cfc67d2 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/controllers/UserBlacklistController.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/UserBlacklistController.java
@@ -13,7 +13,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.Optional;
-import java.util.OptionalDouble;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 
@@ -119,7 +118,7 @@ public class UserBlacklistController {
     }
 
     private static UserBlacklist mapObject(ResultSet rs) throws SQLException {
-        return new UserBlacklist.UserBlacklistBuilder(rs.getString("id"))
+        return new UserBlacklist.Builder(rs.getString("id"))
                 .setReason(rs.getString("reason"))
                 .setAdded(new Timestamp(rs.getLong("added")))
                 .build();
diff --git a/src/main/java/dev/salmonllama/fsbot/database/models/UserBlacklist.java b/src/main/java/dev/salmonllama/fsbot/database/models/UserBlacklist.java
index 1b138d9..0233fd6 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/models/UserBlacklist.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/models/UserBlacklist.java
@@ -10,14 +10,13 @@ import dev.salmonllama.fsbot.database.DatabaseModel;
 import java.sql.Timestamp;
 
 public class UserBlacklist extends DatabaseModel {
-    private String id;
-    private String reason;
+    private final String id;
+    private final String reason;
     private Timestamp added;
 
-    private UserBlacklist(UserBlacklistBuilder builder) {
+    private UserBlacklist(Builder builder) {
         this.id = builder.id;
         this.reason = builder.reason;
-        this.added = builder.added;
     }
 
     public String getId() {
@@ -52,26 +51,26 @@ public class UserBlacklist extends DatabaseModel {
         );
     }
 
-    public static class UserBlacklistBuilder {
+    public static class Builder {
         private String id;
         private String reason;
         private Timestamp added;
 
-        public UserBlacklistBuilder(String id) {
+        public Builder(String id) {
             this.id = id;
         }
 
-        public UserBlacklistBuilder setId(String id) {
+        public Builder setId(String id) {
             this.id = id;
             return this;
         }
 
-        public UserBlacklistBuilder setReason(String reason) {
+        public Builder setReason(String reason) {
             this.reason = reason;
             return this;
         }
 
-        public UserBlacklistBuilder setAdded(Timestamp added) {
+        public Builder setAdded(Timestamp added) {
             this.added = added;
             return this;
         }