Merge branch 'main' into 3-add-togglemsg-command

Author: Dviih

.github/workflows/docs.yml

@@ -0,0 +1,42 @@
+name: JavaDocs
+
+on:
+  push:
+    branches: [ main]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    name: Build JavaDocs and deploy to GitHub Pages
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{steps.deployment.outputs.page_url}}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Generate Javadoc
+        run: mvn -B javadoc:javadoc --file pom.xml
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: target/site/apidocs
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

pom.xml

@@ -43,6 +43,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.6.3</version>
+                <configuration>
+                    <links>
+                        <link>https://jd.papermc.io/paper/1.20/</link>
+                        <link>https://jd.advntr.dev/api/4.15.0/</link>
+                    </links>
+                </configuration>
+            </plugin>
         </plugins>
         <resources>
             <resource>

src/main/java/pro/cloudnode/smp/cloudnodemsg/CloudnodeMSG.java

@@ -9,6 +9,7 @@
 import pro.cloudnode.smp.cloudnodemsg.command.MessageCommand;
 import pro.cloudnode.smp.cloudnodemsg.command.ReplyCommand;
 import pro.cloudnode.smp.cloudnodemsg.command.UnIgnoreCommand;
+import pro.cloudnode.smp.cloudnodemsg.listener.AsyncChatListener;
 import pro.cloudnode.smp.cloudnodemsg.command.ToggleMessageCommand;
 
 import java.util.Objects;
@@ -33,6 +34,8 @@ public void onEnable() {
         Objects.requireNonNull(getCommand("reply")).setExecutor(new ReplyCommand());Objects.requireNonNull(getCommand("ignore")).setExecutor(new IgnoreCommand());
         Objects.requireNonNull(getCommand("unignore")).setExecutor(new UnIgnoreCommand());
         Objects.requireNonNull(getCommand("togglemsg")).setExecutor(new ToggleMessageCommand());
+
+        getServer().getPluginManager().registerEvents(new AsyncChatListener(), this);
     }
 
     @Override

src/main/java/pro/cloudnode/smp/cloudnodemsg/Permission.java

@@ -26,8 +26,8 @@ public final class Permission {
     /**
      * Player's messages are immune to ignoring
      */
-    public final static @NotNull String IGNORE_IMMUNE = "cloudnodemsg.ignore.bypass";
-    
+    public final static @NotNull String IGNORE_BYPASS = "cloudnodemsg.ignore.bypass";
+
     /**
      * Allows using the /togglemsg command
      */

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/IgnoreCommand.java

@@ -32,8 +32,8 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
     }
 
     public static boolean ignore(final @NotNull Player player, final @NotNull OfflinePlayer target) {
-        if (target.isOnline() && Objects.requireNonNull(target.getPlayer()).hasPermission(Permission.IGNORE_IMMUNE)) return new CannotIgnoreError(Optional.ofNullable(target.getName()).orElse("Unknown Player")).send(player);
-        if (!target.hasPlayedBefore()) return new NeverJoinedError(Optional.ofNullable(target.getName()).orElse("Unknown Player")).send(player);
+        if (target.isOnline() && Objects.requireNonNull(target.getPlayer()).hasPermission(Permission.IGNORE_BYPASS)) return new CannotIgnoreError(Optional.ofNullable(target.getName()).orElse("Unknown Player")).send(player);
+        if (!target.isOnline() && !target.hasPlayedBefore()) return new NeverJoinedError(Optional.ofNullable(target.getName()).orElse("Unknown Player")).send(player);
         Message.ignore(player, target);
         return sendMessage(player, CloudnodeMSG.getInstance().config().ignored(Optional.ofNullable(target.getName()).orElse("Unknown Player")));
     }

src/main/java/pro/cloudnode/smp/cloudnodemsg/listener/AsyncChatListener.java

@@ -0,0 +1,37 @@
+package pro.cloudnode.smp.cloudnodemsg.listener;
+
+import io.papermc.paper.event.player.AsyncChatEvent;
+import net.kyori.adventure.audience.Audience;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
+import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
+import pro.cloudnode.smp.cloudnodemsg.Permission;
+import pro.cloudnode.smp.cloudnodemsg.message.Message;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public final class AsyncChatListener implements Listener {
+    @EventHandler (priority = EventPriority.LOWEST)
+    public void onAsyncChat(final @NotNull AsyncChatEvent event) {
+        final @NotNull Set<@NotNull Audience> audience = event.viewers();
+        final @NotNull Iterator<@NotNull Audience> iterator = audience.iterator();
+        final @NotNull Player sender = event.getPlayer();
+
+        while (iterator.hasNext()) {
+            final @NotNull Audience a = iterator.next();
+            if (a instanceof final @NotNull Player player) {
+                final @NotNull Server server = CloudnodeMSG.getInstance().getServer();
+                final @NotNull HashSet<@NotNull OfflinePlayer> ignored = Message.getIgnored(player).stream().map(server::getOfflinePlayer).collect(HashSet::new, HashSet::add, HashSet::addAll);
+
+                if (ignored.contains(sender) && !sender.hasPermission(Permission.IGNORE_BYPASS)) iterator.remove();
+            }
+        }
+    }
+}

src/main/java/pro/cloudnode/smp/cloudnodemsg/message/Message.java

@@ -40,7 +40,7 @@ public void send() throws InvalidPlayerError {
         if (
                 (recipient.isOnline() && Message.isIgnored(Objects.requireNonNull(recipient.getPlayer()), sender))
                 &&
-                (sender.isOnline() && !Objects.requireNonNull(sender.getPlayer()).hasPermission(Permission.IGNORE_IMMUNE))
+                (sender.isOnline() && !Objects.requireNonNull(sender.getPlayer()).hasPermission(Permission.IGNORE_BYPASS))
         ) return;
         sendMessage(recipient, CloudnodeMSG.getInstance().config()
                 .incoming(senderUsername, recipientUsername, message));