worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add full diff to the log when webeditor data is applied (#922)

Browse Source
This commit is contained in:
Luck 2018-04-20 14:06:35 +01:00
parent 957365ab91
commit 4704c5c975
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java
View File

@ -78,16 +78,16 @@ public class ApplyEditsCommand extends SingleCommand {
if (data.has("tabs") && data.get("tabs").isJsonArray()) { if (data.has("tabs") && data.get("tabs").isJsonArray()) {
JsonArray rows = data.get("tabs").getAsJsonArray(); JsonArray rows = data.get("tabs").getAsJsonArray();
for (JsonElement row : rows) { for (JsonElement row : rows) {
read(row.getAsJsonObject(), code, sender, plugin); read(row.getAsJsonObject(), sender, plugin);
} }
} else { } else {
read(data, code, sender, plugin); read(data, sender, plugin);
} }
return CommandResult.SUCCESS; return CommandResult.SUCCESS;
} }
private boolean read(JsonObject data, String code, Sender sender, LuckPermsPlugin plugin) { private boolean read(JsonObject data, Sender sender, LuckPermsPlugin plugin) {
if (!data.has("who") || data.get("who").getAsString().isEmpty()) { if (!data.has("who") || data.get("who").getAsString().isEmpty()) {
Message.APPLY_EDITS_NO_TARGET.send(sender); Message.APPLY_EDITS_NO_TARGET.send(sender);
return false; return false;
@ -111,28 +111,38 @@ public class ApplyEditsCommand extends SingleCommand {
Set<Node> after = nodes.stream().map(NodeModel::toNode).collect(Collectors.toSet()); Set<Node> after = nodes.stream().map(NodeModel::toNode).collect(Collectors.toSet());
Map.Entry<Set<Node>, Set<Node>> diff = diff(before, after); Map.Entry<Set<Node>, Set<Node>> diff = diff(before, after);
int additions = diff.getKey().size(); Set<Node> diffAdded = diff.getKey();
int deletions = diff.getValue().size(); Set<Node> diffRemoved = diff.getValue();
int additions = diffAdded.size();
int deletions = diffRemoved.size();
if (additions == 0 && deletions == 0) { if (additions == 0 && deletions == 0) {
return false; return false;
} }
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("applyedits", code)
.build().submit(plugin, sender);
holder.setEnduringNodes(after); holder.setEnduringNodes(after);
for (Node n : diffAdded) {
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("webeditor", "add", n.getPermission(), n.getValuePrimitive(), n.getFullContexts())
.build().submit(plugin, sender);
}
for (Node n : diffRemoved) {
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("webeditor", "remove", n.getPermission(), n.getValuePrimitive(), n.getFullContexts())
.build().submit(plugin, sender);
}
String additionsSummary = "addition" + (additions == 1 ? "" : "s"); String additionsSummary = "addition" + (additions == 1 ? "" : "s");
String deletionsSummary = "deletion" + (deletions == 1 ? "" : "s"); String deletionsSummary = "deletion" + (deletions == 1 ? "" : "s");
Message.APPLY_EDITS_SUCCESS.send(sender, holder.getFriendlyName()); Message.APPLY_EDITS_SUCCESS.send(sender, holder.getFriendlyName());
Message.APPLY_EDITS_SUCCESS_SUMMARY.send(sender, additions, additionsSummary, deletions, deletionsSummary); Message.APPLY_EDITS_SUCCESS_SUMMARY.send(sender, additions, additionsSummary, deletions, deletionsSummary);
for (Node n : diff.getKey()) { for (Node n : diffAdded) {
Message.APPLY_EDITS_DIFF_ADDED.send(sender, formatNode(n)); Message.APPLY_EDITS_DIFF_ADDED.send(sender, formatNode(n));
} }
for (Node n : diff.getValue()) { for (Node n : diffRemoved) {
Message.APPLY_EDITS_DIFF_REMOVED.send(sender, formatNode(n)); Message.APPLY_EDITS_DIFF_REMOVED.send(sender, formatNode(n));
} }
StorageAssistant.save(holder, sender, plugin); StorageAssistant.save(holder, sender, plugin);