From dcddea6fb89246d63be91a1f1151ce2dbd255a12 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 13 Apr 2020 16:22:30 +0200
Subject: Fix reply not closing

fixes #124
---
 src/timeline/TimelineModel.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 84dd9885..d54677f7 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -800,6 +800,16 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEvent<mtx::events::msg::
 void
 TimelineModel::replyAction(QString id)
 {
+        setReply(id);
+        ChatPage::instance()->focusMessageInput();
+}
+
+RelatedInfo
+TimelineModel::relatedInfo(QString id)
+{
+        if (!events.contains(id))
+                return {};
+
         auto event = events.value(id);
         if (auto e =
               std::get_if<mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(&event)) {
@@ -815,10 +825,9 @@ TimelineModel::replyAction(QString id)
         related.quoted_formatted_body = mtx::accessors::formattedBodyWithFallback(event);
         related.quoted_formatted_body.remove(QRegularExpression(
           "<mx-reply>.*</mx-reply>", QRegularExpression::DotMatchesEverythingOption));
-        nhlog::ui()->debug("after replacement: {}", related.quoted_body.toStdString());
         related.room = room_id_;
 
-        ChatPage::instance()->messageReply(related);
+        return related;
 }
 
 void
-- 
cgit 1.5.1