diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/MessageType.java b/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/MessageType.java index 0a819711c..2b46d6558 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/MessageType.java +++ b/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; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/Snapshot.java b/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/Snapshot.java index 2a0745850..66619ef06 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/Snapshot.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/Snapshot.java @@ -29,9 +29,9 @@ public class Snapshot implements Comparable this(MessageType.PM, senderId, Collections.singletonList(recipientId), message, LocalDateTime.now()); } - public Snapshot(int senderId, Collection recipientIds, String message) + public Snapshot(MessageType messageType, int senderId, Collection 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 recipientIds, String message, LocalDateTime time) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/SnapshotPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/SnapshotPlugin.java index 3cffae021..cec26a92b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chatsnap/SnapshotPlugin.java +++ b/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 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) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java index 6fe453199..33e8b750d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java +++ b/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; diff --git a/Plugins/Mineplex.ReportSite/message.php b/Plugins/Mineplex.ReportSite/message.php index 45f8a654f..74e4dda70 100644 --- a/Plugins/Mineplex.ReportSite/message.php +++ b/Plugins/Mineplex.ReportSite/message.php @@ -1,29 +1,10 @@ getTimeCreated(); $age = approximateHumanInterval($reportCreationTime->diff(new DateTime('now', $reportCreationTime->getTimezone()))); - if ($displayAmount == 0): ?> + if($displayAmount == 0): ?> No chat log available for this report. getType(); $typeDisplayName = Message::$TYPE_DISPLAY_NAMES[$typeId]; $isPM = $typeId == Message::TYPE_PM; - if ($isPM): ?> + if($isPM): ?> + +