forked from Minecraft/QoL
Merge branch 'master' of ZeroHD/QoL into master
commit
9ec2f05087
|
@ -18,6 +18,7 @@ import org.dynmap.DynmapAPI;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.Collection;
|
||||
|
||||
public class CommandPreprocessListener implements Listener {
|
||||
|
||||
|
@ -34,7 +35,6 @@ public class CommandPreprocessListener implements Listener {
|
|||
|
||||
String command = event.getMessage();
|
||||
String base = command.split(" ")[0].substring(1).toLowerCase(); // Strip the slash
|
||||
String auditBypassPerm = "qol.audit.bypass." + base;
|
||||
|
||||
Player sender = event.getPlayer();
|
||||
DynmapAPI dynmap = plugin.getDynmap();
|
||||
|
@ -79,26 +79,30 @@ public class CommandPreprocessListener implements Listener {
|
|||
}
|
||||
|
||||
// Command Auditing
|
||||
if (sender.hasPermission("qol.audit") && !sender.hasPermission(auditBypassPerm) && plugin.getConfig().getBoolean("audit.enabled")) {
|
||||
boolean auditable = false;
|
||||
if (sender.hasPermission("qol.auditable") && plugin.getConfig().getBoolean("audit.enabled")) {
|
||||
if (sender.hasPermission("qol.auditor") && targetIsAuditable(command)) {
|
||||
return;
|
||||
} else {
|
||||
boolean auditable = false;
|
||||
|
||||
for (String audit : QoL.getAudits()) {
|
||||
if (noSlash(command).startsWith(noSlash(audit))) {
|
||||
auditable = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (auditable) {
|
||||
Map<String, String> post = new HashMap<>();
|
||||
|
||||
post.put("username", "QoL Auditor");
|
||||
post.put("content", "[" + StringUtils.capitalize(sender.getGameMode().name().toLowerCase()) + "] " + sender.getName() + " executed command: " + command);
|
||||
String webhook = plugin.getConfig().getString("audit.webhook");
|
||||
if (StringUtils.isNotEmpty(webhook)) {
|
||||
CoreWeb.asyncPost(plugin, webhook, post);
|
||||
for (String audit : QoL.getAudits()) {
|
||||
if (noSlash(command).startsWith(noSlash(audit))) {
|
||||
auditable = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (auditable) {
|
||||
Map<String, String> post = new HashMap<>();
|
||||
|
||||
post.put("username", "QoL Auditor");
|
||||
post.put("content", "[" + StringUtils.capitalize(sender.getGameMode().name().toLowerCase()) + "] " + sender.getName() + " executed command: " + command);
|
||||
String webhook = plugin.getConfig().getString("audit.webhook");
|
||||
if (StringUtils.isNotEmpty(webhook)) {
|
||||
CoreWeb.asyncPost(plugin, webhook, post);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -115,6 +119,23 @@ public class CommandPreprocessListener implements Listener {
|
|||
|
||||
}
|
||||
|
||||
public boolean targetIsAuditable(String command) {
|
||||
String[] commandSplit = command.split(" ");
|
||||
Collection<? extends Player> players = plugin.getServer().getOnlinePlayers();
|
||||
|
||||
for (String param : commandSplit) {
|
||||
String lowerCaseParam = param.toLowerCase();
|
||||
for (Player p : players) {
|
||||
|
||||
if (p.getName().toLowerCase().equals(lowerCaseParam)) {
|
||||
return p.hasPermission("qol.auditable");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public String noSlash(String command) {
|
||||
return command.startsWith("/") ? command.substring(1) : command;
|
||||
}
|
||||
|
|
|
@ -38,53 +38,56 @@ commands:
|
|||
timeout:
|
||||
description: Timeout command
|
||||
permissions:
|
||||
qol.admin:
|
||||
description: Ability to reload the plugin
|
||||
default: op
|
||||
qol.priority:
|
||||
description: Allows a player on past the player cap
|
||||
default: op
|
||||
qol.uuid:
|
||||
description: Ability to use the UUID command
|
||||
default: op
|
||||
qol.history:
|
||||
description: Ability to use the Name History command
|
||||
default: op
|
||||
qol.portal:
|
||||
description: Ability to use the Portal command
|
||||
default: op
|
||||
qol.worldinfo:
|
||||
description: Ability to use the World Info command
|
||||
deafult: op
|
||||
qol.sudo:
|
||||
description: Ability to use the Sudo command
|
||||
default: op
|
||||
qol.makeme:
|
||||
description: Ability to use the MakeMe command
|
||||
default: true
|
||||
qol.shadowmute:
|
||||
description: Ability to use the Shadow Mute command
|
||||
default: op
|
||||
qol.audit:
|
||||
description: Audits command usage
|
||||
default: op
|
||||
qol.tpconfirm:
|
||||
description: Makes the user confirm they want to TP out of spec
|
||||
default: op
|
||||
qol.whitelist.bypass:
|
||||
description: Allows someone into the server when Whitelist is enabled
|
||||
default: op
|
||||
qol.whitelist.command:
|
||||
description: Ability to use the Whitelist command
|
||||
default: op
|
||||
children:
|
||||
qol.whitelist.bypass: true
|
||||
qol.timeout.bypass:
|
||||
description: Allows someone to chat while a Timeout is active
|
||||
default: op
|
||||
qol.timeout.command:
|
||||
description: Ability to use the Timeout command
|
||||
default: op
|
||||
children:
|
||||
qol.timeout.bypass: true
|
||||
qol.admin:
|
||||
description: Ability to reload the plugin
|
||||
default: op
|
||||
qol.priority:
|
||||
description: Allows a player on past the player cap
|
||||
default: op
|
||||
qol.uuid:
|
||||
description: Ability to use the UUID command
|
||||
default: op
|
||||
qol.history:
|
||||
description: Ability to use the Name History command
|
||||
default: op
|
||||
qol.portal:
|
||||
description: Ability to use the Portal command
|
||||
default: op
|
||||
qol.worldinfo:
|
||||
description: Ability to use the World Info command
|
||||
deafult: op
|
||||
qol.sudo:
|
||||
description: Ability to use the Sudo command
|
||||
default: op
|
||||
qol.makeme:
|
||||
description: Ability to use the MakeMe command
|
||||
default: true
|
||||
qol.shadowmute:
|
||||
description: Ability to use the Shadow Mute command
|
||||
default: op
|
||||
qol.auditable:
|
||||
description: Audits command usage
|
||||
default: op
|
||||
qol.auditor:
|
||||
description: Audits command usage
|
||||
default: op
|
||||
qol.tpconfirm:
|
||||
description: Makes the user confirm they want to TP out of spec
|
||||
default: op
|
||||
qol.whitelist.bypass:
|
||||
description: Allows someone into the server when Whitelist is enabled
|
||||
default: op
|
||||
qol.whitelist.command:
|
||||
description: Ability to use the Whitelist command
|
||||
default: op
|
||||
children:
|
||||
qol.whitelist.bypass: true
|
||||
qol.timeout.bypass:
|
||||
description: Allows someone to chat while a Timeout is active
|
||||
default: op
|
||||
qol.timeout.command:
|
||||
description: Ability to use the Timeout command
|
||||
default: op
|
||||
children:
|
||||
qol.timeout.bypass: true
|
||||
|
||||
|
|
Loading…
Reference in New Issue