From 54013e4a00b49721b79f141bca101523a1e82282 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 4 May 2020 13:14:54 +0200
Subject: Basic, broken reaction display

---
 src/timeline/TimelineModel.h | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index cc63eca2..ecb64693 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -9,6 +9,7 @@
 #include <mtxclient/http/errors.hpp>
 
 #include "CacheCryptoStructs.h"
+#include "ReactionsModel.h"
 
 namespace mtx::http {
 using RequestErr = const std::optional<mtx::http::ClientError> &;
@@ -155,6 +156,7 @@ public:
                 State,
                 IsEncrypted,
                 ReplyTo,
+                Reactions,
                 RoomId,
                 RoomName,
                 RoomTopic,
@@ -271,6 +273,7 @@ private:
         QSet<QString> read;
         QList<QString> pending;
         std::vector<QString> eventOrder;
+        std::map<QString, ReactionsModel> reactions;
 
         QString room_id_;
         QString prev_batch_token_;
-- 
cgit 1.5.1


From e5a5a66716ba8190b3d6ae1689e7e1f721563777 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 6 May 2020 12:52:13 +0200
Subject: Fix reaction redaction for real this time

---
 src/timeline/TimelineModel.cpp | 3 +++
 src/timeline/TimelineModel.h   | 2 ++
 2 files changed, 5 insertions(+)

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

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 75f41d1e..836fd59f 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -42,6 +42,8 @@ struct RoomEventType
                 switch (e.type) {
                 case EventType::RoomKeyRequest:
                         return qml_mtx_events::EventType::KeyRequest;
+                case EventType::Reaction:
+                        return qml_mtx_events::EventType::Reaction;
                 case EventType::RoomAliases:
                         return qml_mtx_events::EventType::Aliases;
                 case EventType::RoomAvatar:
@@ -618,6 +620,7 @@ TimelineModel::internalAddEvents(
                       std::get_if<mtx::events::RoomEvent<mtx::events::msg::Reaction>>(&e)) {
                         QString reactedTo =
                           QString::fromStdString(reaction->content.relates_to.event_id);
+                        events.insert(id, e);
                         reactions[reactedTo].addReaction(room_id_.toStdString(), *reaction);
                         int idx = idToIndex(reactedTo);
                         if (idx >= 0)
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index ecb64693..a737aac7 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -30,6 +30,8 @@ enum EventType
         Unsupported,
         /// m.room_key_request
         KeyRequest,
+        /// m.reaction,
+        Reaction,
         /// m.room.aliases
         Aliases,
         /// m.room.avatar
-- 
cgit 1.5.1