From a1661f7006d7661bfd54cdd9971afd6717ed9c92 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Thu, 7 May 2020 20:53:24 -0400
Subject: merge master into reactions

---
 src/timeline/TimelineModel.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/timeline/TimelineModel.cpp')

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 388a5842..022267d0 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -914,6 +914,13 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEvent<mtx::events::msg::
         return {dummy, false};
 }
 
+void
+TimelineModel::reactAction(QString id)
+{
+        setReaction(id);
+        ChatPage::instance()->reactMessage(id);
+}
+
 void
 TimelineModel::replyAction(QString id)
 {
-- 
cgit 1.5.1