From f30898ea31dfc4725b87ed9f84722068b616e21c Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sun, 10 Jul 2022 16:58:37 +0800
Subject: [PATCH] ui: fix messages sort

---
 .../messagepad/MessagePadDialogueContentContainer.jsx      | 4 +++-
 .../messagepad/MessagePadDialogueListContainer.jsx         | 7 +++----
 packages/ui-default/package.json                           | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx b/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx
index 2f5aacfc9..1d748a816 100644
--- a/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx
+++ b/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx
@@ -67,7 +67,9 @@ export default connect(mapStateToProps)(class MessagePadDialogueContentContainer
 
   renderInner() {
     if (this.props.activeId === null) return [];
-    return this.props.item.messages.map((msg) => (
+    const sorted = this.props.item.messages
+      .sort((msg1, msg2) => parseMongoId(msg1._id).timestamp - parseMongoId(msg2._id).timestamp);
+    return sorted.map((msg) => (
       <Message
         key={msg._id}
         isSelf={msg.from === UserContext._id}
diff --git a/packages/ui-default/components/messagepad/MessagePadDialogueListContainer.jsx b/packages/ui-default/components/messagepad/MessagePadDialogueListContainer.jsx
index 67fbcb2bd..1c967e603 100644
--- a/packages/ui-default/components/messagepad/MessagePadDialogueListContainer.jsx
+++ b/packages/ui-default/components/messagepad/MessagePadDialogueListContainer.jsx
@@ -39,11 +39,10 @@ export default connect(mapStateToProps, mapDispatchToProps)(class MessagePadDial
           <ListItem
             key={dialogue._id}
             userName={dialogue.udoc.uname}
-            // eslint-disable-next-line no-nested-ternary
-            summary={_.last(dialogue.messages)
-              ? (_.last(dialogue.messages).flag & 4)
+            summary={dialogue.messages.length
+              ? (_.maxBy(dialogue.messages, '_id').flag & 4)
                 ? i18n('[Richtext message]')
-                : _.last(dialogue.messages).content
+                : _.maxBy(dialogue.messages, '_id').content
               : ''}
             faceUrl={dialogue.udoc.avatarUrl}
             active={dialogue._id === this.props.activeId}
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index ab21921ec..eeef9679f 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.38.10",
+  "version": "4.38.11",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",