From 90cd7c8fc37eecb5b1674c7745be39008f846272 Mon Sep 17 00:00:00 2001
From: CaptainRexPL <Kapitan.Rex_@outlook.com>
Date: Mon, 15 Jan 2024 11:17:44 +0100
Subject: [PATCH] Fix group messaging

---
 client/pom.xml                                | 22 +++++++--------
 .../client/api/messaging/MessagingApi.java    | 17 +++++------
 .../UntrustedPrivateMessageReceivedEvent.java |  2 +-
 pom.xml                                       | 28 +++++++++----------
 server/pom.xml                                |  4 +--
 shared/pom.xml                                | 12 ++++----
 tests/pom.xml                                 |  2 +-
 7 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 9762af2d..dee13bad 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.92.Final</version>
+            <version>4.1.104.Final</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -73,13 +73,13 @@
                         </filter>
                     </filters>
                     <artifactSet>
-                    <excludes>
-                        <exclude>com.google.guava:guava</exclude>
-                        <exclude>org.apache.logging.log4j:*</exclude>
-                        <exclude>com.google.code.findbugs:*</exclude>
-                        <exclude>net.jcip:jcip-annotations:*</exclude>
-                        <exclude>net.java.dev.jna:*</exclude>
-                    </excludes>
+                        <excludes>
+                            <exclude>com.google.guava:guava</exclude>
+                            <exclude>org.apache.logging.log4j:*</exclude>
+                            <exclude>com.google.code.findbugs:*</exclude>
+                            <exclude>net.jcip:jcip-annotations:*</exclude>
+                            <exclude>net.java.dev.jna:*</exclude>
+                        </excludes>
                     </artifactSet>
                     <relocations>
                         <relocation>
@@ -160,7 +160,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>enforce-bytecode-version</id>
@@ -182,10 +182,10 @@
                     <dependency>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>extra-enforcer-rules</artifactId>
-                        <version>1.6.2</version>
+                        <version>1.7.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/client/src/main/java/com/collarmc/client/api/messaging/MessagingApi.java b/client/src/main/java/com/collarmc/client/api/messaging/MessagingApi.java
index 43800ef8..c20d4e29 100644
--- a/client/src/main/java/com/collarmc/client/api/messaging/MessagingApi.java
+++ b/client/src/main/java/com/collarmc/client/api/messaging/MessagingApi.java
@@ -1,6 +1,7 @@
 package com.collarmc.client.api.messaging;
 
 import com.collarmc.api.groups.Group;
+import com.collarmc.api.identity.ClientIdentity;
 import com.collarmc.api.messaging.Message;
 import com.collarmc.api.session.Player;
 import com.collarmc.client.Collar;
@@ -95,14 +96,14 @@ public boolean handleResponse(ProtocolResponse resp) {
                         try {
                             byte[] contents = groupSession.decrypt(response.message, response.sender);
                             message = Utils.messagePackMapper().readValue(contents, Message.class);
-                    } catch (IOException | CipherException e) {
-                        // We don't throw an exception here in case someone is doing something naughty to disrupt the group and cause the client to exit
-                        LOGGER.error(collar.identity() + "could not read group message from group " + group.id, e);
-                        message = null;
-                    }
-                    if (message != null) {
-                        collar.configuration.eventBus.dispatch(new GroupMessageReceivedEvent(collar, group, response.player, message));
-                    }});
+                        } catch (IOException | CipherException e) {
+                            // We don't throw an exception here in case someone is doing something naughty to disrupt the group and cause the client to exit
+                            LOGGER.error(collar.identity() + "could not read group message from group " + group.id, e);
+                            message = null;
+                        }
+                        if (message != null) {
+                            collar.configuration.eventBus.dispatch(new GroupMessageReceivedEvent(collar, group, new Player((ClientIdentity)response.sender, null), message));
+                        }});
                 });
             } else if (response.sender != null) {
                 Message message;
diff --git a/client/src/main/java/com/collarmc/client/api/messaging/events/UntrustedPrivateMessageReceivedEvent.java b/client/src/main/java/com/collarmc/client/api/messaging/events/UntrustedPrivateMessageReceivedEvent.java
index 7f2d2fb9..a141c03b 100644
--- a/client/src/main/java/com/collarmc/client/api/messaging/events/UntrustedPrivateMessageReceivedEvent.java
+++ b/client/src/main/java/com/collarmc/client/api/messaging/events/UntrustedPrivateMessageReceivedEvent.java
@@ -6,7 +6,7 @@
 import com.collarmc.api.minecraft.MinecraftPlayer;
 
 /**
- * Fired when a private message was attempted with another player but there was not sufficent trust to deliver
+ * Fired when a private message was attempted with another player but there was not sufficient trust to deliver
  */
 public final class UntrustedPrivateMessageReceivedEvent extends AbstractCollarEvent {
     public final MinecraftPlayer player;
diff --git a/pom.xml b/pom.xml
index 812692e6..e2737080 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,11 +27,11 @@
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
-        <jackson-databind.version>2.15.0</jackson-databind.version>
+        <jackson-databind.version>2.16.1</jackson-databind.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <minecraft.java.runtime>16</minecraft.java.runtime>
-        <log4j.version>2.20.0</log4j.version>
+        <log4j.version>2.22.1</log4j.version>
     </properties>
 
     <build>
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>enforce-banned-dependencies</id>
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <goals>
@@ -103,7 +103,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.1</version>
                     <configuration>
                         <source>16</source>
                         <target>16</target>
@@ -112,7 +112,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -126,7 +126,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -179,7 +179,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>32.0.0-jre</version>
+                <version>33.0.0-jre</version>
             </dependency>
             <!-- if someone wants to rewrite and use org.json like a chump be my guest -->
             <dependency>
@@ -200,19 +200,19 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-                <version>4.1.92.Final</version>
+                <version>4.1.104.Final</version>
                 <scope>compile</scope>
             </dependency>
             <!-- a database -->
             <dependency>
                 <groupId>org.mongodb</groupId>
                 <artifactId>mongodb-driver-sync</artifactId>
-                <version>4.9.1</version>
+                <version>4.11.1</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.jna</groupId>
                 <artifactId>jna</artifactId>
-                <version>5.13.0</version>
+                <version>5.14.0</version>
             </dependency>
             <!-- password hashing -->
             <dependency>
@@ -239,12 +239,12 @@
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
                 <artifactId>jersey-client</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.5</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.12.0</version>
+                <version>3.14.0</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
@@ -254,7 +254,7 @@
             <dependency>
                 <groupId>commons-validator</groupId>
                 <artifactId>commons-validator</artifactId>
-                <version>1.7</version>
+                <version>1.8.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index 3d941a93..5e50529d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -119,7 +119,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -162,4 +162,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/shared/pom.xml b/shared/pom.xml
index 396d0556..4df655fd 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>5.13.0</version>
+            <version>5.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -40,10 +40,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.92.Final</version>
+            <version>4.1.104.Final</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -69,7 +69,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>enforce-bytecode-version</id>
@@ -91,10 +91,10 @@
                     <dependency>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>extra-enforcer-rules</artifactId>
-                        <version>1.6.2</version>
+                        <version>1.7.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
index a0cfee9d..f215acfa 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -43,7 +43,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <id>report</id>