From 5de394b4b7d81d7c6abc177b5c89305cd52e4e42 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sat, 31 Jan 2026 13:50:40 -0500
Subject: [PATCH] Don't scroll the timeline when reacting to messages

BUG: 515306
FIXED-IN: 25.12.2
---
 src/timeline/models/timelinemessagemodel.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/timeline/models/timelinemessagemodel.cpp b/src/timeline/models/timelinemessagemodel.cpp
index e02fa0c97..9b791a815 100644
--- a/src/timeline/models/timelinemessagemodel.cpp
+++ b/src/timeline/models/timelinemessagemodel.cpp
@@ -5,6 +5,8 @@
 #include "events/pollevent.h"
 #include "messagemodel_logging.h"
 
+#include <Quotient/events/reactionevent.h>
+
 using namespace Quotient;
 
 TimelineMessageModel::TimelineMessageModel(QObject *parent)
@@ -62,7 +64,10 @@ void TimelineMessageModel::connectNewRoom()
         });
         connect(m_room, &Room::pendingEventAdded, this, [this](const Quotient::RoomEvent *event) {
             Q_EMIT newEventAdded(event);
-            Q_EMIT newLocalUserEventAdded();
+            // Don't scroll the timeline view for reactions.
+            if (!event->is<ReactionEvent>()) {
+                Q_EMIT newLocalUserEventAdded();
+            }
             if (!m_resetting) {
                 beginInsertRows({}, 0, 0);
                 endInsertRows();