From cc45b9e2553f896d09b53dab8d8975e91fcf285c Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Tue, 14 Sep 2021 15:07:42 +0100
Subject: [PATCH] Simplify how last message is handled.

---
 package.json                                   |  2 +-
 src/components/navigation/items/ButtonItem.tsx | 10 ++++++----
 src/components/navigation/left/common.ts       | 17 +----------------
 yarn.lock                                      |  8 ++++----
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 1ec562d2..38c970d9 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
         "react-virtuoso": "^1.10.4",
         "redux": "^4.1.0",
         "revolt-api": "0.5.3-alpha.0-patch.0",
-        "revolt.js": "5.1.0-alpha.0-patch.1",
+        "revolt.js": "5.1.0-alpha.1",
         "rimraf": "^3.0.2",
         "sass": "^1.35.1",
         "shade-blend-color": "^1.0.0",
diff --git a/src/components/navigation/items/ButtonItem.tsx b/src/components/navigation/items/ButtonItem.tsx
index ae38ba54..1f7d274c 100644
--- a/src/components/navigation/items/ButtonItem.tsx
+++ b/src/components/navigation/items/ButtonItem.tsx
@@ -82,8 +82,9 @@ export const UserButton = observer((props: UserProps) => {
                 </div>
                 {
                     <div className={styles.subText}>
-                        {channel?.last_message && alert ? (
-                            (channel.last_message as { short: string }).short
+                        {typeof channel?.last_message?.content === "string" &&
+                        alert ? (
+                            channel.last_message.content.slice(0, 32)
                         ) : (
                             <UserStatus user={user} />
                         )}
@@ -162,8 +163,9 @@ export const ChannelButton = observer((props: ChannelProps) => {
                 <div>{channel.name}</div>
                 {channel.channel_type === "Group" && (
                     <div className={styles.subText}>
-                        {channel.last_message && alert ? (
-                            (channel.last_message as { short: string }).short
+                        {typeof channel.last_message?.content === "string" &&
+                        alert ? (
+                            channel.last_message.content.slice(0, 32)
                         ) : (
                             <Text
                                 id="quantities.members"
diff --git a/src/components/navigation/left/common.ts b/src/components/navigation/left/common.ts
index 1a1683b2..80d304ac 100644
--- a/src/components/navigation/left/common.ts
+++ b/src/components/navigation/left/common.ts
@@ -49,22 +49,7 @@ export function useUnreads({ channel, unreads }: UnreadProps) {
 }
 
 export function mapChannelWithUnread(channel: Channel, unreads: Unreads) {
-    let last_message_id;
-    if (
-        channel.channel_type === "DirectMessage" ||
-        channel.channel_type === "Group"
-    ) {
-        last_message_id = (channel.last_message as { _id: string })?._id;
-    } else if (channel.channel_type === "TextChannel") {
-        last_message_id = channel.last_message as string;
-    } else {
-        return {
-            channel,
-            unread: undefined,
-            alertCount: undefined,
-            timestamp: channel._id,
-        };
-    }
+    const last_message_id = channel.last_message_id;
 
     let unread: "mention" | "unread" | undefined;
     let alertCount: undefined | number;
diff --git a/yarn.lock b/yarn.lock
index 4b1a0d67..7e260135 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3659,10 +3659,10 @@ revolt-api@0.5.3-alpha.0-patch.0:
   resolved "https://registry.yarnpkg.com/revolt-api/-/revolt-api-0.5.3-alpha.0-patch.0.tgz#158556832843bb06cb06a4df50ffca24ab64be3b"
   integrity sha512-76l+kGyrUy6uGMSIziyAHE27r9gD97OEh5gSzb2OJRsQM55TN0NurAsfFIEiB9hUzDDlwsXchtJiqdS4UVAwQw==
 
-revolt.js@5.1.0-alpha.0-patch.1:
-  version "5.1.0-alpha.0-patch.1"
-  resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.1.0-alpha.0-patch.1.tgz#68fd28af78a8b0b60cc2ed3523d8e9fbfa15a903"
-  integrity sha512-VanPjG6vZGoFGNfRFGyj7PTstJeniE/Fly5KNhz7bTIzHkxn7xtsLEE+EKeEpZY4Y9km+l09qav1/VfIZUm9NA==
+revolt.js@5.1.0-alpha.1:
+  version "5.1.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.1.0-alpha.1.tgz#0ac89eb67bb217ba270f3d3d5aa00621c9e69904"
+  integrity sha512-90B6QgfccvPDKu2vlZr2vxofkqWCHpdHrDTdieA0SkgIFZ0rJ+zIMv7YbWCToA+sh6OppH+7I5MP3suHs3AtSA==
   dependencies:
     axios "^0.19.2"
     eventemitter3 "^4.0.7"