Handle party chat correctly

Plugins/Mineplex.Core/src/mineplex/core/chatsnap/MessageType.java

@@ -6,7 +6,8 @@ package mineplex.core.chatsnap;
 public enum MessageType
 {
 	CHAT(0),
-	PM(1);
+	PM(1),
+	PARTY(2);
 
 	private final int _id;
 

Plugins/Mineplex.Core/src/mineplex/core/chatsnap/Snapshot.java

@@ -29,9 +29,9 @@ public class Snapshot implements Comparable<Snapshot>
 		this(MessageType.PM, senderId, Collections.singletonList(recipientId), message, LocalDateTime.now());
 	}
 
-	public Snapshot(int senderId, Collection<Integer> recipientIds, String message)
+	public Snapshot(MessageType messageType, int senderId, Collection<Integer> recipientIds, String message)
 	{
-		this(MessageType.CHAT, senderId, recipientIds, message, LocalDateTime.now());
+		this(messageType, senderId, recipientIds, message, LocalDateTime.now());
 	}
 
 	public Snapshot(MessageType messageType, int senderId, Collection<Integer> recipientIds, String message, LocalDateTime time)

Plugins/Mineplex.Core/src/mineplex/core/chatsnap/SnapshotPlugin.java

@@ -58,10 +58,17 @@ public class SnapshotPlugin extends MiniPlugin
 
 	public Snapshot createSnapshot(AsyncPlayerChatEvent e)
 	{
+		MessageType messageType = MessageType.CHAT;
 		int senderId = _clientManager.getAccountId(e.getPlayer());
 		Set<Integer> recipientIds = getAccountIds(e.getRecipients());
 		recipientIds.remove(senderId);
-		return new Snapshot(senderId, recipientIds, e.getMessage());
+
+		if (e.getFormat().contains("Party"))
+		{
+			messageType = MessageType.PARTY;
+		}
+
+		return new Snapshot(messageType, senderId, recipientIds, e.getMessage());
 	}
 
 	public Snapshot createSnapshot(PrivateMessageEvent e)

Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java

@@ -7,8 +7,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 

Plugins/Mineplex.ReportSite/message.php

@@ -1,29 +1,10 @@
 <?php class Message
 {
-    public static $TYPE_DISPLAY_NAMES = array("Chat", "PM");
+    public static $TYPE_DISPLAY_NAMES = array("Chat", "PM", "Party");
 
     const TYPE_CHAT = 0;
     const TYPE_PM = 1;
-
+    const TYPE_PARTY = 2;
-    /**
-     * @param $type
-     * @return int
-     */
-    public static function getTypeFromString($type)
-    {
-        if (strcmp($type, "CHAT") == 0)
-        {
-            return self::TYPE_CHAT;
-        }
-        else if (strcmp($type, "PM") == 0)
-        {
-            return self::TYPE_PM;
-        }
-        else
-        {
-            return -1;
-        }
-    }
 
     /** @var User */
     private $sender;

Plugins/Mineplex.ReportSite/view.php

@@ -455,17 +455,19 @@
                             $reportCreationTime = $report->getTimeCreated();
                             $age = approximateHumanInterval($reportCreationTime->diff(new DateTime('now', $reportCreationTime->getTimezone())));
 
-                            if ($displayAmount == 0): ?>
+                            if($displayAmount == 0): ?>
                                 <span class="black">No chat log available for this report.</span>
                             <?php else:
-                                for ($i = 0; $i < $displayAmount; $i++):
+                                for($i = 0; $i < $displayAmount; $i++):
                                     $message = $messages[$i];
                                     $typeId = $message->getType();
                                     $typeDisplayName = Message::$TYPE_DISPLAY_NAMES[$typeId];
                                     $isPM = $typeId == Message::TYPE_PM;
 
-                                    if ($isPM): ?>
+                                    if($isPM): ?>
                                         <span class="label label-primary chat pm" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;"><?= $typeDisplayName ?></span>
+                                    <?php elseif($typeId == Message::TYPE_PARTY): ?>
+                                        <span class="label label-warning chat" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;"><?= $typeDisplayName ?></span>
                                     <?php else: ?>
                                         <span class="label label-info chat" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;"><?= $typeDisplayName ?></span>
                                     <?php endif; ?>