firstdarkdev/sdlink-core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BUG] Fix linked commands trying to run when message just contains the prefix, and not showing denied message when user doesn't have permission

Browse Source
This commit is contained in:
HypherionSA
2023-10-29 01:58:59 +02:00
parent bbf3adf885
commit 343f24d26e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/hypherionmc/sdlink/core/discord/hooks/MinecraftCommandHook.java
View File

@@ -28,6 +28,9 @@ public class MinecraftCommandHook {
if (!event.getMessage().getContentRaw().startsWith(SDLinkConfig.INSTANCE.linkedCommands.prefix)) if (!event.getMessage().getContentRaw().startsWith(SDLinkConfig.INSTANCE.linkedCommands.prefix))
return; return;
if (event.getMessage().getContentRaw().equalsIgnoreCase(SDLinkConfig.INSTANCE.linkedCommands.prefix))
return;
Set<Long> roles = event.getMember().getRoles().stream().map(ISnowflake::getIdLong).collect(Collectors.toSet()); Set<Long> roles = event.getMember().getRoles().stream().map(ISnowflake::getIdLong).collect(Collectors.toSet());
roles.add(event.getMember().getIdLong()); roles.add(event.getMember().getIdLong());
roles.add(0L); roles.add(0L);
@@ -41,6 +44,13 @@ public class MinecraftCommandHook {
String raw = event.getMessage().getContentRaw().substring(SDLinkConfig.INSTANCE.linkedCommands.prefix.length()); String raw = event.getMessage().getContentRaw().substring(SDLinkConfig.INSTANCE.linkedCommands.prefix.length());
if (permLevel == -1) {
event.getMessage().reply("Sorry, you don't have permission to execute that command").mentionRepliedUser(false).queue(suc -> {
suc.delete().queueAfter(5, TimeUnit.SECONDS);
});
return;
}
if (commands.stream().anyMatch(raw::startsWith)) { if (commands.stream().anyMatch(raw::startsWith)) {
Result res = SDLinkPlatform.minecraftHelper.executeMinecraftCommand(raw, Integer.MAX_VALUE, event, account.orElse(null)); Result res = SDLinkPlatform.minecraftHelper.executeMinecraftCommand(raw, Integer.MAX_VALUE, event, account.orElse(null));
event.getMessage().reply(res.getMessage()).mentionRepliedUser(false).queue(s -> s.delete().queueAfter(5, TimeUnit.SECONDS)); event.getMessage().reply(res.getMessage()).mentionRepliedUser(false).queue(s -> s.delete().queueAfter(5, TimeUnit.SECONDS));