From 6c7e6b0e86ae78479b5f87b8440a8d10f99f14e0 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 19 Sep 2019 21:47:16 +0200
Subject: [PATCH] Fix read indicator

---
 resources/qml/StatusIndicator.qml |  4 ++--
 src/timeline2/TimelineModel.cpp   | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml
index 0b14e246..440a7e47 100644
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
@@ -9,13 +9,13 @@ Rectangle {
 	color: "transparent"
 	width: 16
 	height: 16
-	ToolTip.visible: ma.containsMouse
+	ToolTip.visible: ma.containsMouse && state != MtxEvent.Empty
 	ToolTip.text: switch (state) {
 		case MtxEvent.Failed: return qsTr("Failed")
 		case MtxEvent.Sent: return qsTr("Sent")
 		case MtxEvent.Received: return qsTr("Received")
 		case MtxEvent.Read: return qsTr("Read")
-		default: return qsTr("Empty")
+		default: return ""
 	}
 	MouseArea{
 		id: ma
diff --git a/src/timeline2/TimelineModel.cpp b/src/timeline2/TimelineModel.cpp
index d0daae25..1c9070b1 100644
--- a/src/timeline2/TimelineModel.cpp
+++ b/src/timeline2/TimelineModel.cpp
@@ -268,6 +268,10 @@ TimelineModel::TimelineModel(QString room_id, QObject *parent)
                   ev);
                 events.remove(txn_id);
                 events.insert(event_id, ev);
+
+                // ask to be notified for read receipts
+                cache::client()->addPendingReceipt(room_id_, event_id);
+
                 emit dataChanged(index(idx, 0), index(idx, 0));
         });
 }
@@ -373,11 +377,17 @@ TimelineModel::data(const QModelIndex &index, int role) const
         case Id:
                 return id;
         case State:
-                if (failed.contains(id))
+                // only show read receipts for messages not from us
+                if (boost::apply_visitor([](const auto &e) -> QString { return senderId(e); },
+                                         event)
+                      .toStdString() != http::client()->user_id().to_string())
+                        return qml_mtx_events::Empty;
+                else if (failed.contains(id))
                         return qml_mtx_events::Failed;
                 else if (pending.contains(id))
                         return qml_mtx_events::Sent;
-                else if (read.contains(id))
+                else if (read.contains(id) ||
+                         cache::client()->readReceipts(id, room_id_).size() > 1)
                         return qml_mtx_events::Read;
                 else
                         return qml_mtx_events::Received;
@@ -695,6 +705,7 @@ TimelineModel::indexToId(int index) const
         return eventOrder[index];
 }
 
+// Note: this will only be called for our messages
 void
 TimelineModel::markEventsAsRead(const std::vector<QString> &event_ids)
 {