From 39433efb158b56af86695b340024c4388760b485 Mon Sep 17 00:00:00 2001
From: Infi <infi@infi.sh>
Date: Wed, 5 Jun 2024 14:51:02 +0200
Subject: [PATCH] perf: skip catchup MessageFrame|s

Signed-off-by: Infi <infi@infi.sh>
---
 .../revolt/screens/chat/views/channel/ChannelScreenViewModel.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
index d6f40c3a..6fb064b1 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
@@ -460,6 +460,8 @@ class ChannelScreenViewModel @Inject constructor(
                     when (it) {
                         is MessageFrame -> {
                             if (it.channel != channel?.id) return@onEach
+                            // If we already have the message we are just catching up on the WebSocket connection. Skip
+                            if (items.any { m -> (m is ChannelScreenItem.RegularMessage && m.message.id == it.id) || (m is ChannelScreenItem.SystemMessage && m.message.id == it.id) }) return@onEach
 
                             it.author?.let { userId ->
                                 if (RevoltAPI.userCache[userId] == null) {