Fashionscape/discord-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finalized UserBlacklist command, model, and controller

Browse Source
This commit is contained in:
Salmonllama 2020-11-24 14:30:30 -05:00
parent 758e3962c8
commit 9cc9bb13ad
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java → src/main/java/dev/salmonllama/fsbot/commands/staff/BlacklistUserCommand.java
View File

@ -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) {

3
src/main/java/dev/salmonllama/fsbot/database/controllers/UserBlacklistController.java
View File

@ -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();

17
src/main/java/dev/salmonllama/fsbot/database/models/UserBlacklist.java
View File

@ -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;
}