Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-01 21:11:44 +01:00
Code Issues Projects Releases Wiki Activity

Add config option to allow webhooks/bots to send commands (#4442)

Browse Source 
```yml
# Console relay settings
# The console relay sends every message shown in the console to a Discord channel.
console:
  ...
  # Set to true if bots/webhooks should be able to send commands through the command relay.
  bot-command-relay: false
```
This commit is contained in:
Josh Roy 2021-08-09 11:48:01 -07:00 committed by GitHub
parent b6a08ec712
commit 26c016fea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java
View File

@ -141,6 +141,10 @@ public class DiscordSettings implements IConf {
return config.getBoolean("console.command-relay", false);
}
public boolean isConsoleBotCommandRelay() {
return config.getBoolean("console.bot-command-relay", false);
}
public Level getConsoleLogLevel() {
return consoleLogLevel;
}

8
EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java
View File

@ -4,6 +4,7 @@ import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.essentialsx.discord.JDADiscordService;
import net.essentialsx.discord.util.DiscordCommandSender;
import net.essentialsx.discord.util.DiscordUtil;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
@ -17,8 +18,11 @@ public class DiscordCommandDispatcher extends ListenerAdapter {
@Override
public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event) {
if (jda.getConsoleWebhook() != null && event.getChannel().getId().equals(channelId)
&& !event.isWebhookMessage() && !event.getAuthor().isBot()) {
if (jda.getConsoleWebhook() != null && event.getChannel().getId().equals(channelId)) {
if ((event.isWebhookMessage() || event.getAuthor().isBot()) && (!jda.getSettings().isConsoleBotCommandRelay() || DiscordUtil.ACTIVE_WEBHOOKS.contains(event.getAuthor().getId()))) {
return;
}
Bukkit.getScheduler().runTask(jda.getPlugin(), () ->
Bukkit.dispatchCommand(new DiscordCommandSender(jda, Bukkit.getConsoleSender(), message ->
event.getMessage().reply(message).queue()).getSender(), event.getMessage().getContentRaw()));

2
EssentialsDiscord/src/main/resources/config.yml
View File

@ -86,6 +86,8 @@ console:
# console. It's recommended you stick to the /execute command which has role permission checks (see command configuration below).
# Note 2: This option requires a channel ID and is not supported if you specify a webhook URL above. You'll need to use /execute in Discord if you use a webhook URL.
command-relay: false
# Set to true if bots/webhooks should be able to send commands through the command relay.
bot-command-relay: false
# The maximum log level of messages to send to the console relay.
# The following is a list of available log levels in order of lowest to highest.
# Changing the log level will send all log levels above it to the console relay.