Implement cross-proxy messaging

Brikster · Dec 22, 2023 · f8f6fd7 · f8f6fd7
1 parent 1b95fba
commit f8f6fd7
Show file tree

Hide file tree

Showing 63 changed files with 1,568 additions and 277 deletions.
diff --git a/.gitignore b/.gitignore
@@ -106,4 +106,5 @@ build/
 
 !gradle-wrapper.jar
 
-spigot/run/
+spigot/run/
+compose.yaml
diff --git a/api/src/main/java/ru/brikster/chatty/api/chat/Chat.java b/api/src/main/java/ru/brikster/chatty/api/chat/Chat.java
@@ -18,12 +18,12 @@
 public interface Chat {
 
     /**
-     * Name of chat from plugin configuration
+     * ID of chat from plugin configuration
      *
-     * @return name of chat
+     * @return ID of chat
      */
     @NotNull
-    String getName();
+    String getId();
 
     @NotNull
     String getDisplayName();

diff --git a/spigot/build.gradle b/spigot/build.gradle
@@ -19,6 +19,9 @@ tasks {
         relocations.forEach {
             relocate it, "ru.brikster.chatty.shaded.${it}"
         }
+        mergeServiceFiles {
+            setPath("META-INF/services/org.flywaydb.core.extensibility.Plugin")
+        }
     }
 
     build {
@@ -66,6 +69,11 @@ dependencies {
 
     implementation 'com.zaxxer:HikariCP:5.1.0'
     implementation 'org.flywaydb:flyway-core:9.22.3'
+    implementation 'org.flywaydb:flyway-mysql:9.22.3'
+    implementation 'org.postgresql:postgresql:42.7.1'
+    implementation('org.redisson:redisson:3.25.1') {
+        exclude group: 'org.yaml'
+    }
 
     compileOnly 'net.milkbowl.vault:VaultAPI:1.7'
     compileOnly 'me.clip:placeholderapi:2.10.6'

diff --git a/spigot/src/main/java/ru/brikster/chatty/Chatty.java b/spigot/src/main/java/ru/brikster/chatty/Chatty.java
@@ -36,9 +36,9 @@
 import ru.brikster.chatty.command.CommandSuggestionsProvider;
 import ru.brikster.chatty.command.ProxyingCommandHandler;
 import ru.brikster.chatty.command.ProxyingCommandSuggestionsProvider;
-import ru.brikster.chatty.config.type.MessagesConfig;
-import ru.brikster.chatty.config.type.PmConfig;
-import ru.brikster.chatty.config.type.SettingsConfig;
+import ru.brikster.chatty.config.file.MessagesConfig;
+import ru.brikster.chatty.config.file.PmConfig;
+import ru.brikster.chatty.config.file.SettingsConfig;
 import ru.brikster.chatty.guice.ConfigsLoader;
 import ru.brikster.chatty.guice.GeneralGuiceModule;
 import ru.brikster.chatty.misc.VanillaListener;

diff --git a/spigot/src/main/java/ru/brikster/chatty/chat/ChatImpl.java b/spigot/src/main/java/ru/brikster/chatty/chat/ChatImpl.java
@@ -28,7 +28,7 @@
 public final class ChatImpl implements Chat {
 
     @Getter
-    private final @NotNull String name;
+    private final @NotNull String id;
     private final @Nullable String displayName;
 
     @Getter
@@ -74,7 +74,7 @@ public final class ChatImpl implements Chat {
     @Override
     public @NotNull String getDisplayName() {
         return displayName == null
-                ? name
+                ? id
                 : displayName;
     }
 
@@ -95,33 +95,33 @@ public boolean removeStrategy(@NotNull MessageTransformStrategy<?> strategy) {
 
     @Override
     public boolean hasSymbolWritePermission(Player sender) {
-        return sender.hasPermission("chatty.chat." + getName())
-                || sender.hasPermission("chatty.chat." + getName() + ".write")
-                || sender.hasPermission("chatty.chat." + getName() + ".send")
-                || sender.hasPermission("chatty.chat." + getName() + ".write.symbol")
-                || sender.hasPermission("chatty.chat." + getName() + ".send.symbol");
+        return sender.hasPermission("chatty.chat." + getId())
+                || sender.hasPermission("chatty.chat." + getId() + ".write")
+                || sender.hasPermission("chatty.chat." + getId() + ".send")
+                || sender.hasPermission("chatty.chat." + getId() + ".write.symbol")
+                || sender.hasPermission("chatty.chat." + getId() + ".send.symbol");
     }
 
     @Override
     public boolean hasCommandWritePermission(Player sender) {
-        return sender.hasPermission("chatty.chat." + getName())
-                || sender.hasPermission("chatty.chat." + getName() + ".write")
-                || sender.hasPermission("chatty.chat." + getName() + ".send")
-                || sender.hasPermission("chatty.chat." + getName() + ".write.command")
-                || sender.hasPermission("chatty.chat." + getName() + ".send.command");
+        return sender.hasPermission("chatty.chat." + getId())
+                || sender.hasPermission("chatty.chat." + getId() + ".write")
+                || sender.hasPermission("chatty.chat." + getId() + ".send")
+                || sender.hasPermission("chatty.chat." + getId() + ".write.command")
+                || sender.hasPermission("chatty.chat." + getId() + ".send.command");
     }
 
     @Override
     public boolean hasReadPermission(Player sender) {
-        return sender.hasPermission("chatty.chat." + getName())
-                || sender.hasPermission("chatty.chat." + getName() + ".read")
-                || sender.hasPermission("chatty.chat." + getName() + ".see");
+        return sender.hasPermission("chatty.chat." + getId())
+                || sender.hasPermission("chatty.chat." + getId() + ".read")
+                || sender.hasPermission("chatty.chat." + getId() + ".see");
     }
 
     @Override
     public @NotNull Predicate<Player> getRecipientPredicate(@Nullable Player sender) {
         return player -> {
-            if (player.equals(sender)) {
+            if (player == sender || player.equals(sender)) {
                 return true;
             }
 

diff --git a/...src/main/java/ru/brikster/chatty/chat/component/context/SinglePlayerTransformContext.java b/...src/main/java/ru/brikster/chatty/chat/component/context/SinglePlayerTransformContext.java
@@ -2,12 +2,12 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 
 @Getter
 @RequiredArgsConstructor(staticName = "of")
 public final class SinglePlayerTransformContext implements TransformContext {
 
-    private final Player player;
+    private final OfflinePlayer player;
 
 }
diff --git a/.../src/main/java/ru/brikster/chatty/chat/component/impl/LinkParserComponentTransformer.java b/.../src/main/java/ru/brikster/chatty/chat/component/impl/LinkParserComponentTransformer.java
@@ -5,7 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 import ru.brikster.chatty.chat.component.ComponentTransformer;
 import ru.brikster.chatty.chat.component.context.SinglePlayerTransformContext;
-import ru.brikster.chatty.config.type.SettingsConfig;
+import ru.brikster.chatty.config.file.SettingsConfig;
 import ru.brikster.chatty.convert.component.ComponentStringConverter;
 import ru.brikster.chatty.util.AdventureUtil;
 

diff --git a/...rc/main/java/ru/brikster/chatty/chat/component/impl/ReplacementsComponentTransformer.java b/...rc/main/java/ru/brikster/chatty/chat/component/impl/ReplacementsComponentTransformer.java
@@ -5,7 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 import ru.brikster.chatty.Constants;
 import ru.brikster.chatty.chat.component.context.SinglePlayerTransformContext;
-import ru.brikster.chatty.config.type.ReplacementsConfig;
+import ru.brikster.chatty.config.file.ReplacementsConfig;
 import ru.brikster.chatty.convert.component.ComponentStringConverter;
 import ru.brikster.chatty.util.AdventureUtil;