Update bypass permissions

Brikster · Jul 6, 2024 · 750202f · 750202f
1 parent 8c81970
commit 750202f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/...src/main/java/ru/brikster/chatty/chat/message/transform/stage/early/CooldownStrategy.java b/...src/main/java/ru/brikster/chatty/chat/message/transform/stage/early/CooldownStrategy.java
@@ -31,7 +31,8 @@ public final class CooldownStrategy implements MessageTransformStrategy<String>
         String chatName = context.getChat().getId();
 
         if (context.getChat().getCooldown() > 0
-                && !context.getSender().hasPermission("chatty.cooldown." + chatName)) {
+                && !context.getSender().hasPermission("chatty.bypass.cooldown")
+                && !context.getSender().hasPermission("chatty.bypass.cooldown." + chatName)) {
             Cache<CommandSender, Long> cache = cooldownCachesMap.computeIfAbsent(chatName, (k) -> CacheBuilder.newBuilder()
                     .maximumSize(1000)
                     .weakKeys()

diff --git a/.../chatty/chat/message/transform/stage/early/moderation/AdModerationStrategyModeration.java b/.../chatty/chat/message/transform/stage/early/moderation/AdModerationStrategyModeration.java
@@ -45,8 +45,8 @@ public AdModerationStrategyModeration(BukkitAudiences audiences, MessagesConfig
 
     @Override
     public @NotNull MessageTransformResult<String> handle(MessageContext<String> context) {
-        if (context.getSender().hasPermission("chatty.moderation.ads.bypass")
-                || context.getSender().hasPermission("chatty.moderation.bypass")) {
+        if (context.getSender().hasPermission("chatty.bypass.moderation")
+                || context.getSender().hasPermission("chatty.bypass.moderation.ads")) {
             return MessageTransformResultBuilder
                     .<String>fromContext(context)
                     .build();

diff --git a/...brikster/chatty/chat/message/transform/stage/early/moderation/CapsModerationStrategy.java b/...brikster/chatty/chat/message/transform/stage/early/moderation/CapsModerationStrategy.java
@@ -36,8 +36,8 @@ public CapsModerationStrategy(BukkitAudiences audiences, MessagesConfig messages
 
     @Override
     public @NotNull MessageTransformResult<String> handle(MessageContext<String> context) {
-        if (context.getSender().hasPermission("chatty.moderation.caps.bypass")
-                || context.getSender().hasPermission("chatty.moderation.bypass")) {
+        if (context.getSender().hasPermission("chatty.bypass.moderation")
+                || context.getSender().hasPermission("chatty.bypass.moderation.caps")) {
             return MessageTransformResultBuilder
                     .<String>fromContext(context)
                     .build();

diff --git a/...atty/chat/message/transform/stage/early/moderation/SwearModerationStrategyModeration.java b/...atty/chat/message/transform/stage/early/moderation/SwearModerationStrategyModeration.java
@@ -53,8 +53,8 @@ public SwearModerationStrategyModeration(BukkitAudiences audiences, MessagesConf
 
     @Override
     public @NotNull MessageTransformResult<String> handle(MessageContext<String> context) {
-        if (context.getSender().hasPermission("chatty.moderation.swear.bypass")
-                || context.getSender().hasPermission("chatty.moderation.bypass")) {
+        if (context.getSender().hasPermission("chatty.bypass.moderation")
+                || context.getSender().hasPermission("chatty.bypass.moderation.swear")) {
             return MessageTransformResultBuilder
                     .<String>fromContext(context)
                     .build();

diff --git a/spigot/src/main/java/ru/brikster/chatty/config/file/ChatsConfig.java b/spigot/src/main/java/ru/brikster/chatty/config/file/ChatsConfig.java
@@ -146,7 +146,7 @@ public static final class ChatConfig extends OkaeriConfig {
         @Comment({
               "",
               "Cooldown in seconds for sending messages in chat.",
-              "Bypass permission: chatty.cooldown.<chat>"
+              "Bypass permission: chatty.bypass.cooldown.<chat>"
         })
         @Min(0)
         private int cooldown = 0;