Skip to content

Commit 836c1dd

Browse files
Added status check for /serverlock-admin set-status
1 parent 104f88c commit 836c1dd

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

src/main/java/net/javadiscord/javabot/systems/moderation/server_lock/SetLockStatusSubcommand.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,20 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
4242
Responses.replyStaffOnly(event, event.getGuild()).queue();
4343
return;
4444
}
45-
try {
46-
GuildConfig config = Bot.config.get(event.getGuild());
47-
boolean locked = lockedMapping.getAsBoolean();
48-
config.set("serverLockConfig.locked", String.valueOf(locked));
49-
if (locked) {
50-
Bot.serverLockManager.lockServer(event.getGuild(), Collections.emptyList(), event.getUser());
51-
} else {
52-
Bot.serverLockManager.unlockServer(event.getGuild(), event.getUser());
53-
}
54-
Responses.info(event, "Server Lock Status", "Successfully %slocked the current server!", locked ? "" : "un").queue();
55-
} catch (UnknownPropertyException e) {
56-
ExceptionLogger.capture(e, getClass().getSimpleName());
57-
Responses.warning(event, "Unknown Property", "Could not lock/unlock the server.").queue();
45+
GuildConfig config = Bot.config.get(event.getGuild());
46+
boolean locked = lockedMapping.getAsBoolean();
47+
if (locked == config.getServerLockConfig().isLocked()) {
48+
Responses.info(event, String.format("Server already %slocked", locked ? "" : "un"),
49+
"The server is already %slocked!", locked ? "" : "un").queue();
50+
return;
51+
}
52+
config.getServerLockConfig().setLocked(String.valueOf(locked));
53+
Bot.config.flush();
54+
if (locked) {
55+
Bot.serverLockManager.lockServer(event.getGuild(), Collections.emptyList(), event.getUser());
56+
} else {
57+
Bot.serverLockManager.unlockServer(event.getGuild(), event.getUser());
5858
}
59+
Responses.info(event, "Server Lock Status", "Successfully %slocked the current server!", locked ? "" : "un").queue();
5960
}
6061
}

0 commit comments

Comments
 (0)