Skip to content

Commit fab6e1f

Browse files
committed
Do not restrict the status command
1 parent 1ffc720 commit fab6e1f

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/launcher/java/com/mcmoddev/relauncher/discord/commands/RLCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public abstract class RLCommand extends SlashCommand {
3232

3333
protected final Supplier<BaseProcessManager> processManager;
3434
protected final List<String> roles;
35+
protected boolean isRestricted = true;
3536

3637
protected RLCommand(final Supplier<BaseProcessManager> processManager, final Config.Discord config) {
3738
this.processManager = processManager;
@@ -41,7 +42,7 @@ protected RLCommand(final Supplier<BaseProcessManager> processManager, final Con
4142

4243
@Override
4344
protected final void execute(final SlashCommandEvent event) {
44-
if (event.getMember() != null || event.getMember().getRoles().stream().noneMatch(role -> roles.contains(role.getId()))) {
45+
if (isRestricted && (event.getMember() == null || event.getMember().getRoles().stream().noneMatch(role -> roles.contains(role.getId())))) {
4546
event.deferReply(true).setContent("You do not have the required permissions to run this command.").queue();
4647
return;
4748
}

src/launcher/java/com/mcmoddev/relauncher/discord/commands/StatusCommand.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public StatusCommand(final Supplier<BaseProcessManager> jarUpdater, final Config
5353
super(jarUpdater, config);
5454
name = "status";
5555
help = "Gets information about the process status.";
56+
isRestricted = false;
5657
}
5758

5859
@Override
@@ -74,7 +75,7 @@ protected void exec(final SlashCommandEvent event) {
7475
final var embed = new EmbedBuilder()
7576
.setColor(Color.GREEN)
7677
.setTitle("Process is running.")
77-
.addField("Jar Version", version.orElse("Unknown"), true)
78+
.addField("Process Version", version.orElse("Unknown"), true)
7879
.addField("Launcher Version", Main.VERSION, true)
7980
.addField("Running Since", process.process().info().startInstant().map(TimeFormat.RELATIVE::format).orElse("Unknown startup time"), true)
8081
.setTimestamp(Instant.now());
@@ -178,8 +179,9 @@ public String buildThreadInfo(final ThreadInfo thread) {
178179
}
179180

180181
public boolean isEnabled(final String roleId) {
181-
for (var r : enabledRoles) {
182-
if (r.equals(roleId)) return true;
182+
for (var r : roles) {
183+
if (r.equals(roleId))
184+
return true;
183185
}
184186
return false;
185187
}

0 commit comments

Comments
 (0)