Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-30 23:39:33 +01:00
Code Issues Projects Releases Wiki Activity

Refactor the log creation process

Browse Source
This commit is contained in:
Luck 2017-10-30 21:06:45 +00:00
parent 94a4051d29
commit 357717886e
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
47 changed files with 161 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java
View File

@ -30,6 +30,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.PermissionHolder;
@ -38,8 +39,11 @@ import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.DateUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* An extended version of {@link LogEntry}, with helper methods for
@ -127,6 +131,37 @@ public class ExtendedLogEntry extends LogEntry {
return this;
}
public ExtendedLogEntryBuilder action(Object... args) {
List<String> parts = new ArrayList<>();
for (Object o : args) {
// special formatting for ContextSets instead of just #toString
if (o instanceof ContextSet) {
ContextSet set = (ContextSet) o;
for (String value : set.getValues("server")) {
parts.add("server=" + value);
}
for (String value : set.getValues("world")) {
parts.add("world=" + value);
}
for (Map.Entry<String, String> context : set.toSet()) {
if (context.getKey().equals("server") || context.getKey().equals("world")) {
continue;
}
parts.add(context.getKey() + "=" + context.getValue());
}
} else {
parts.add(String.valueOf(o));
}
}
super.action(parts.stream().collect(Collectors.joining(" ")));
return this;
}
@Override
public ExtendedLogEntry build() {
if (getTimestamp() == 0L) {

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaAddChatMeta.java
View File

@ -51,7 +51,6 @@ import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
import java.util.List;
import java.util.stream.Collectors;
public class MetaAddChatMeta extends SharedSubCommand {
private final ChatMetaType type;
@ -94,7 +93,7 @@ public class MetaAddChatMeta extends SharedSubCommand {
sender.sendMessage(builder.build());
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta add" + type.name().toLowerCase() + " " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta" , "add" + type.name().toLowerCase(), priority, meta, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaAddTempChatMeta.java
View File

@ -56,7 +56,6 @@ import net.kyori.text.event.HoverEvent;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class MetaAddTempChatMeta extends SharedSubCommand {
private final ChatMetaType type;
@ -104,7 +103,7 @@ public class MetaAddTempChatMeta extends SharedSubCommand {
sender.sendMessage(builder.build());
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta addtemp" + type.name().toLowerCase() + " " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta" , "addtemp" + type.name().toLowerCase(), priority, meta, duration, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaClear.java
View File

@ -44,7 +44,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
public class MetaClear extends SharedSubCommand {
public MetaClear(LocaleManager locale) {
@ -109,7 +108,7 @@ public class MetaClear extends SharedSubCommand {
}
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta clear " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta", "clear", context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

8
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaRemoveChatMeta.java
View File

@ -51,7 +51,6 @@ import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
import java.util.List;
import java.util.stream.Collectors;
public class MetaRemoveChatMeta extends SharedSubCommand {
private final ChatMetaType type;
@ -92,6 +91,11 @@ public class MetaRemoveChatMeta extends SharedSubCommand {
n.getFullContexts().makeImmutable().equals(context.makeImmutable())
);
Message.BULK_REMOVE_CHATMETA_SUCCESS.send(sender, holder.getFriendlyName(), type.name().toLowerCase(), priority, Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta" , "remove" + type.name().toLowerCase(), priority, "*", context)
.build().submit(plugin, sender);
save(holder, sender, plugin);
return CommandResult.SUCCESS;
}
@ -108,7 +112,7 @@ public class MetaRemoveChatMeta extends SharedSubCommand {
sender.sendMessage(builder.build());
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta remove" + type.name().toLowerCase() + " " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta" , "remove" + type.name().toLowerCase(), priority, meta, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

8
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaRemoveTempChatMeta.java
View File

@ -51,7 +51,6 @@ import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
import java.util.List;
import java.util.stream.Collectors;
public class MetaRemoveTempChatMeta extends SharedSubCommand {
private final ChatMetaType type;
@ -92,6 +91,11 @@ public class MetaRemoveTempChatMeta extends SharedSubCommand {
n.getFullContexts().makeImmutable().equals(context.makeImmutable())
);
Message.BULK_REMOVE_TEMP_CHATMETA_SUCCESS.send(sender, holder.getFriendlyName(), type.name().toLowerCase(), priority, Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta" , "removetemp" + type.name().toLowerCase(), priority, "*", context)
.build().submit(plugin, sender);
save(holder, sender, plugin);
return CommandResult.SUCCESS;
}
@ -108,7 +112,7 @@ public class MetaRemoveTempChatMeta extends SharedSubCommand {
sender.sendMessage(builder.build());
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta removetemp" + type.name().toLowerCase() + " " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta" , "removetemp" + type.name().toLowerCase(), priority, meta, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaSet.java
View File

@ -49,7 +49,6 @@ import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
import java.util.List;
import java.util.stream.Collectors;
public class MetaSet extends SharedSubCommand {
public MetaSet(LocaleManager locale) {
@ -96,7 +95,7 @@ public class MetaSet extends SharedSubCommand {
sender.sendMessage(builder.build());
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta set " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta", "set", key, value, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaSetTemp.java
View File

@ -53,7 +53,6 @@ import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
import java.util.List;
import java.util.stream.Collectors;
public class MetaSetTemp extends SharedSubCommand {
public MetaSetTemp(LocaleManager locale) {
@ -102,7 +101,7 @@ public class MetaSetTemp extends SharedSubCommand {
sender.sendMessage(builder.build());
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta settemp " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta", "settemp", key, value, duration, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaUnset.java
View File

@ -43,7 +43,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
public class MetaUnset extends SharedSubCommand {
public MetaUnset(LocaleManager locale) {
@ -74,7 +73,7 @@ public class MetaUnset extends SharedSubCommand {
Message.UNSET_META_SUCCESS.send(sender, key, holder.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta unset " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta", "unset", key, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaUnsetTemp.java
View File

@ -43,7 +43,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
public class MetaUnsetTemp extends SharedSubCommand {
public MetaUnsetTemp(LocaleManager locale) {
@ -74,7 +73,7 @@ public class MetaUnsetTemp extends SharedSubCommand {
Message.UNSET_META_TEMP_SUCCESS.send(sender, key, holder.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("meta unsettemp " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("meta", "unsettemp", key, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

13
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/other/HolderClear.java
View File

@ -30,6 +30,7 @@ import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.commands.ArgumentPermissions;
import me.lucko.luckperms.common.commands.CommandException;
import me.lucko.luckperms.common.commands.CommandResult;
import me.lucko.luckperms.common.commands.abstraction.SharedSubCommand;
import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
@ -38,14 +39,11 @@ import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.locale.Message;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
public class HolderClear<T extends PermissionHolder> extends SubCommand<T> {
public HolderClear(LocaleManager locale, boolean user) {
@ -82,15 +80,10 @@ public class HolderClear<T extends PermissionHolder> extends SubCommand<T> {
}
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("clear " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("clear", context)
.build().submit(plugin, sender);
if (holder instanceof User) {
save((User) holder, sender, plugin);
} else if (holder instanceof Group) {
save((Group) holder, sender, plugin);
}
SharedSubCommand.save(holder, sender, plugin);
return CommandResult.SUCCESS;
}
}

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentAdd.java
View File

@ -45,7 +45,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getGroupTabComplete;
@ -91,7 +90,7 @@ public class ParentAdd extends SharedSubCommand {
Message.SET_INHERIT_SUCCESS.send(sender, holder.getFriendlyName(), group.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent add " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "add", group.getName(), context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentAddTemp.java
View File

@ -51,7 +51,6 @@ import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getGroupTabComplete;
@ -105,7 +104,7 @@ public class ParentAddTemp extends SharedSubCommand {
Message.SET_TEMP_INHERIT_SUCCESS.send(sender, holder.getFriendlyName(), group.getFriendlyName(), DateUtil.formatDateDiff(duration), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent addtemp " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "addtemp", group.getName(), duration, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentClear.java
View File

@ -43,7 +43,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
public class ParentClear extends SharedSubCommand {
public ParentClear(LocaleManager locale) {
@ -80,7 +79,7 @@ public class ParentClear extends SharedSubCommand {
}
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent clear " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "clear", context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentClearTrack.java
View File

@ -46,7 +46,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getTrackTabComplete;
@ -117,7 +116,7 @@ public class ParentClearTrack extends SharedSubCommand {
}
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent cleartrack " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "cleartrack", track.getName(), context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentRemove.java
View File

@ -47,7 +47,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getGroupTabComplete;
@ -95,7 +94,7 @@ public class ParentRemove extends SharedSubCommand {
Message.UNSET_INHERIT_SUCCESS.send(sender, holder.getFriendlyName(), groupName, Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent remove " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "remove", groupName, context)
.build().submit(plugin, sender);
if (holder instanceof User) {

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentRemoveTemp.java
View File

@ -45,7 +45,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getGroupTabComplete;
@ -80,7 +79,7 @@ public class ParentRemoveTemp extends SharedSubCommand {
Message.UNSET_TEMP_INHERIT_SUCCESS.send(sender, holder.getFriendlyName(), groupName, Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent removetemp " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "removetemp", groupName, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentSet.java
View File

@ -45,7 +45,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getGroupTabComplete;
@ -94,7 +93,7 @@ public class ParentSet extends SharedSubCommand {
Message.SET_PARENT_SUCCESS.send(sender, holder.getFriendlyName(), group.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent set " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "set", group.getName(), context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentSetTrack.java
View File

@ -46,7 +46,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getGroupTabComplete;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getTrackTabComplete;
@ -131,7 +130,7 @@ public class ParentSetTrack extends SharedSubCommand {
Message.SET_TRACK_PARENT_SUCCESS.send(sender, holder.getFriendlyName(), track.getName(), group.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("parent settrack " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("parent", "settrack", track.getName(), groupName, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionSet.java
View File

@ -45,7 +45,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getBoolTabComplete;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getPermissionTabComplete;
@ -82,7 +81,7 @@ public class PermissionSet extends SharedSubCommand {
Message.SETPERMISSION_SUCCESS.send(sender, node, b, holder.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("permission set " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("permission", "set", node, b, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionSetTemp.java
View File

@ -50,7 +50,6 @@ import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getBoolTabComplete;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getPermissionTabComplete;
@ -90,7 +89,7 @@ public class PermissionSetTemp extends SharedSubCommand {
Message.SETPERMISSION_TEMP_SUCCESS.send(sender, node, b, holder.getFriendlyName(), DateUtil.formatDateDiff(duration), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("permission settemp " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("permission", "settemp", node, b, duration, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionUnset.java
View File

@ -45,7 +45,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getPermissionTabComplete;
@ -87,7 +86,7 @@ public class PermissionUnset extends SharedSubCommand {
Message.UNSETPERMISSION_SUCCESS.send(sender, node, holder.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("permission unset " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("permission", "unset", node, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionUnsetTemp.java
View File

@ -45,7 +45,6 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import java.util.List;
import java.util.stream.Collectors;
import static me.lucko.luckperms.common.commands.abstraction.SubCommand.getPermissionTabComplete;
@ -80,7 +79,7 @@ public class PermissionUnsetTemp extends SharedSubCommand {
Message.UNSET_TEMP_PERMISSION_SUCCESS.send(sender, node, holder.getFriendlyName(), Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("permission unsettemp " + args.stream().map(ArgumentUtils.WRAPPER).collect(Collectors.joining(" ")))
.action("permission", "unsettemp", node, context)
.build().submit(plugin, sender);
save(holder, sender, plugin);

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/group/CreateGroup.java
View File

@ -70,7 +70,11 @@ public class CreateGroup extends SingleCommand {
}
Message.CREATE_SUCCESS.send(sender, groupName);
ExtendedLogEntry.build().actor(sender).actedName(groupName).entryType(LogEntry.Type.GROUP).action("create").build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).actedName(groupName).entryType(LogEntry.Type.GROUP)
.action("create")
.build().submit(plugin, sender);
return CommandResult.SUCCESS;
}
}

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/group/DeleteGroup.java
View File

@ -79,7 +79,11 @@ public class DeleteGroup extends SingleCommand {
}
Message.DELETE_SUCCESS.send(sender, group.getFriendlyName());
ExtendedLogEntry.build().actor(sender).actedName(groupName).entryType(LogEntry.Type.GROUP).action("delete").build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).actedName(groupName).entryType(LogEntry.Type.GROUP)
.action("delete")
.build().submit(plugin, sender);
plugin.getUpdateTaskBuffer().request();
return CommandResult.SUCCESS;
}

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/group/GroupClone.java
View File

@ -77,7 +77,11 @@ public class GroupClone extends SubCommand<Group> {
newGroup.replaceEnduringNodes(group.getEnduringNodes());
Message.CLONE_SUCCESS.send(sender, group.getName(), newGroup.getName());
ExtendedLogEntry.build().actor(sender).acted(group).action("clone " + newGroup.getName()).build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).acted(group)
.action("clone", newGroup.getName())
.build().submit(plugin, sender);
save(newGroup, sender, plugin);
return CommandResult.SUCCESS;
}

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/group/GroupRename.java
View File

@ -80,7 +80,11 @@ public class GroupRename extends SubCommand<Group> {
newGroup.replaceEnduringNodes(group.getEnduringNodes());
Message.RENAME_SUCCESS.send(sender, group.getName(), newGroup.getName());
ExtendedLogEntry.build().actor(sender).acted(group).action("rename " + newGroup.getName()).build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).acted(group)
.action("rename", newGroup.getName())
.build().submit(plugin, sender);
save(newGroup, sender, plugin);
return CommandResult.SUCCESS;
}

15
common/src/main/java/me/lucko/luckperms/common/commands/impl/group/GroupSetDisplayName.java
View File

@ -25,6 +25,7 @@
package me.lucko.luckperms.common.commands.impl.group;
import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.commands.ArgumentPermissions;
import me.lucko.luckperms.common.commands.CommandException;
import me.lucko.luckperms.common.commands.CommandResult;
@ -76,15 +77,25 @@ public class GroupSetDisplayName extends SubCommand<Group> {
group.removeIf(n -> n.getPermission().startsWith("displayname."));
if (name.equals(group.getName())) {
save(group, sender, plugin);
Message.GROUP_SET_DISPLAY_NAME_REMOVED.send(sender, group.getName());
ExtendedLogEntry.build().actor(sender).acted(group)
.action("setdisplayname", name)
.build().submit(plugin, sender);
save(group, sender, plugin);
return CommandResult.SUCCESS;
}
group.setPermission(NodeFactory.newBuilder("displayname." + name).build());
save(group, sender, plugin);
Message.GROUP_SET_DISPLAY_NAME.send(sender, name, group.getName());
ExtendedLogEntry.build().actor(sender).acted(group)
.action("setdisplayname", name)
.build().submit(plugin, sender);
save(group, sender, plugin);
return CommandResult.SUCCESS;
}
}

8
common/src/main/java/me/lucko/luckperms/common/commands/impl/group/GroupSetWeight.java
View File

@ -25,6 +25,7 @@
package me.lucko.luckperms.common.commands.impl.group;
import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.commands.ArgumentPermissions;
import me.lucko.luckperms.common.commands.CommandException;
import me.lucko.luckperms.common.commands.CommandResult;
@ -59,8 +60,13 @@ public class GroupSetWeight extends SubCommand<Group> {
group.removeIf(n -> n.getPermission().startsWith("weight."));
group.setPermission(NodeFactory.newBuilder("weight." + weight).build());
save(group, sender, plugin);
Message.GROUP_SET_WEIGHT.send(sender, weight, group.getFriendlyName());
ExtendedLogEntry.build().actor(sender).acted(group)
.action("setweight", weight)
.build().submit(plugin, sender);
save(group, sender, plugin);
return CommandResult.SUCCESS;
}
}

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

@ -32,6 +32,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.commands.ArgumentPermissions;
import me.lucko.luckperms.common.commands.CommandException;
import me.lucko.luckperms.common.commands.CommandResult;
@ -141,6 +142,10 @@ public class ApplyEditsCommand extends SingleCommand {
return CommandResult.NO_PERMISSION;
}
ExtendedLogEntry.build().actor(sender).acted(holder)
.action("applyedits", part1 + "/" + part2)
.build().submit(plugin, sender);
Set<NodeModel> nodes = deserializePermissions(data.getAsJsonArray("nodes"));
holder.setEnduringNodes(nodes.stream().map(NodeModel::toNode).collect(Collectors.toSet()));
Message.APPLY_EDITS_SUCCESS.send(sender, nodes.size(), holder.getFriendlyName());

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/CreateTrack.java
View File

@ -70,7 +70,11 @@ public class CreateTrack extends SingleCommand {
}
Message.CREATE_SUCCESS.send(sender, trackName);
ExtendedLogEntry.build().actor(sender).actedName(trackName).entryType(LogEntry.Type.TRACK).action("create").build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).actedName(trackName).entryType(LogEntry.Type.TRACK)
.action("create").build()
.submit(plugin, sender);
return CommandResult.SUCCESS;
}
}

7
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/DeleteTrack.java
View File

@ -72,8 +72,11 @@ public class DeleteTrack extends SingleCommand {
}
Message.DELETE_SUCCESS.send(sender, trackName);
ExtendedLogEntry.build().actor(sender).actedName(trackName).entryType(LogEntry.Type.TRACK).action("delete").build().submit(plugin, sender);
plugin.getUpdateTaskBuffer().request();
ExtendedLogEntry.build().actor(sender).actedName(trackName).entryType(LogEntry.Type.TRACK)
.action("delete")
.build().submit(plugin, sender);
return CommandResult.SUCCESS;
}

4
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/TrackAppend.java
View File

@ -75,9 +75,11 @@ public class TrackAppend extends SubCommand<Track> {
if (track.getGroups().size() > 1) {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), group.getName()));
}
ExtendedLogEntry.build().actor(sender).acted(track)
.action("append " + group.getName())
.action("append", group.getName())
.build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
} else {

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/TrackClear.java
View File

@ -49,7 +49,11 @@ public class TrackClear extends SubCommand<Track> {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Track track, List<String> args, String label) throws CommandException {
track.clearGroups();
Message.TRACK_CLEAR.send(sender, track.getName());
ExtendedLogEntry.build().actor(sender).acted(track).action("clear").build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).acted(track)
.action("clear")
.build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
}

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/TrackClone.java
View File

@ -66,7 +66,11 @@ public class TrackClone extends SubCommand<Track> {
newTrack.setGroups(track.getGroups());
Message.CLONE_SUCCESS.send(sender, track.getName(), newTrack.getName());
ExtendedLogEntry.build().actor(sender).acted(track).action("clone " + newTrack.getName()).build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).acted(track)
.action("clone", newTrack.getName())
.build().submit(plugin, sender);
save(newTrack, sender, plugin);
return CommandResult.SUCCESS;
}

4
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/TrackInsert.java
View File

@ -84,9 +84,11 @@ public class TrackInsert extends SubCommand<Track> {
if (track.getGroups().size() > 1) {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), group.getName()));
}
ExtendedLogEntry.build().actor(sender).acted(track)
.action("insert " + group.getName() + " " + pos)
.action("insert", group.getName(), pos)
.build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
} else {

4
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/TrackRemove.java
View File

@ -63,9 +63,11 @@ public class TrackRemove extends SubCommand<Track> {
if (track.getGroups().size() > 1) {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups()));
}
ExtendedLogEntry.build().actor(sender).acted(track)
.action("remove " + groupName)
.action("remove", groupName)
.build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
} else {

6
common/src/main/java/me/lucko/luckperms/common/commands/impl/track/TrackRename.java
View File

@ -80,7 +80,11 @@ public class TrackRename extends SubCommand<Track> {
newTrack.setGroups(track.getGroups());
Message.RENAME_SUCCESS.send(sender, track.getName(), newTrack.getName());
ExtendedLogEntry.build().actor(sender).acted(track).action("rename " + newTrack.getName()).build().submit(plugin, sender);
ExtendedLogEntry.build().actor(sender).acted(track)
.action("rename", newTrack.getName())
.build().submit(plugin, sender);
save(newTrack, sender, plugin);
return CommandResult.SUCCESS;
}

4
common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserDemote.java
View File

@ -134,7 +134,7 @@ public class UserDemote extends SubCommand<User> {
Message.USER_DEMOTE_ENDOFTRACK.send(sender, track.getName(), user.getFriendlyName(), old);
ExtendedLogEntry.build().actor(sender).acted(user)
.action("demote " + args.stream().collect(Collectors.joining(" ")))
.action("demote", track.getName(), context)
.build().submit(plugin, sender);
save(user, sender, plugin);
@ -166,7 +166,7 @@ public class UserDemote extends SubCommand<User> {
}
ExtendedLogEntry.build().actor(sender).acted(user)
.action("demote " + args.stream().collect(Collectors.joining(" ")))
.action("demote", track.getName(), context)
.build().submit(plugin, sender);
save(user, sender, plugin);

5
common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserPromote.java
View File

@ -119,8 +119,9 @@ public class UserPromote extends SubCommand<User> {
user.setPermission(NodeFactory.newBuilder("group." + first).withExtraContext(context).build());
Message.USER_TRACK_ADDED_TO_FIRST.send(sender, user.getFriendlyName(), first, Util.contextSetToString(context));
ExtendedLogEntry.build().actor(sender).acted(user)
.action("promote " + args.stream().collect(Collectors.joining(" ")))
.action("promote", track.getName(), context)
.build().submit(plugin, sender);
save(user, sender, plugin);
@ -177,7 +178,7 @@ public class UserPromote extends SubCommand<User> {
}
ExtendedLogEntry.build().actor(sender).acted(user)
.action("promote " + args.stream().collect(Collectors.joining(" ")))
.action("promote", track.getName(), context)
.build().submit(plugin, sender);
save(user, sender, plugin);

3
common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserSwitchPrimaryGroup.java
View File

@ -79,8 +79,9 @@ public class UserSwitchPrimaryGroup extends SubCommand<User> {
user.getPrimaryGroup().setStoredValue(group.getName());
Message.USER_PRIMARYGROUP_SUCCESS.send(sender, user.getFriendlyName(), group.getFriendlyName());
ExtendedLogEntry.build().actor(sender).acted(user)
.action("setprimarygroup " + group.getName())
.action("setprimarygroup", group.getName())
.build().submit(plugin, sender);
save(user, sender, plugin);

1
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java
View File

@ -199,6 +199,7 @@ public class SqlDao extends AbstractDao {
try (Connection connection = provider.getConnection()) {
try (Statement s = connection.createStatement()) {
s.execute(prefix.apply("ALTER TABLE {prefix}actions MODIFY COLUMN actor_name VARCHAR(36)"));
s.execute(prefix.apply("ALTER TABLE {prefix}actions MODIFY COLUMN action VARCHAR(300)"));
}
}

2
common/src/main/resources/schema/h2.sql
View File

@ -49,7 +49,7 @@ CREATE TABLE `{prefix}actions` (
`type` CHAR(1) NOT NULL,
`acted_uuid` VARCHAR(36) NOT NULL,
`acted_name` VARCHAR(36) NOT NULL,
`action` VARCHAR(256) NOT NULL,
`action` VARCHAR(300) NOT NULL,
PRIMARY KEY (`id`)
);

2
common/src/main/resources/schema/mariadb.sql
View File

@ -49,7 +49,7 @@ CREATE TABLE `{prefix}actions` (
`type` CHAR(1) NOT NULL,
`acted_uuid` VARCHAR(36) NOT NULL,
`acted_name` VARCHAR(36) NOT NULL,
`action` VARCHAR(256) NOT NULL,
`action` VARCHAR(300) NOT NULL,
PRIMARY KEY (`id`)
) DEFAULT CHARSET = utf8;

2
common/src/main/resources/schema/mysql.sql
View File

@ -49,7 +49,7 @@ CREATE TABLE `{prefix}actions` (
`type` CHAR(1) NOT NULL,
`acted_uuid` VARCHAR(36) NOT NULL,
`acted_name` VARCHAR(36) NOT NULL,
`action` VARCHAR(256) NOT NULL,
`action` VARCHAR(300) NOT NULL,
PRIMARY KEY (`id`)
) DEFAULT CHARSET = utf8;

2
common/src/main/resources/schema/postgresql.sql
View File

@ -45,7 +45,7 @@ CREATE TABLE "{prefix}actions" (
"type" CHAR(1) NOT NULL,
"acted_uuid" VARCHAR(36) NOT NULL,
"acted_name" VARCHAR(36) NOT NULL,
"action" VARCHAR(256) NOT NULL
"action" VARCHAR(300) NOT NULL
);
CREATE TABLE "{prefix}tracks" (

2
common/src/main/resources/schema/sqlite.sql
View File

@ -47,7 +47,7 @@ CREATE TABLE `{prefix}actions` (
`type` CHAR(1) NOT NULL,
`acted_uuid` VARCHAR(36) NOT NULL,
`acted_name` VARCHAR(36) NOT NULL,
`action` VARCHAR(256) NOT NULL
`action` VARCHAR(300) NOT NULL
);
CREATE TABLE `{prefix}tracks` (