From 54013e4a00b49721b79f141bca101523a1e82282 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Mon, 4 May 2020 13:14:54 +0200 Subject: Basic, broken reaction display --- src/Olm.cpp | 4 +- src/timeline/ReactionsModel.cpp | 98 +++++++++++++++++++++++++++++++++++++++++ src/timeline/ReactionsModel.h | 39 ++++++++++++++++ src/timeline/TimelineModel.cpp | 29 ++++++++++++ src/timeline/TimelineModel.h | 3 ++ 5 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 src/timeline/ReactionsModel.cpp create mode 100644 src/timeline/ReactionsModel.h (limited to 'src') diff --git a/src/Olm.cpp b/src/Olm.cpp index c8e4c13c..8ea39566 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -164,8 +164,8 @@ encrypt_group_message(const std::string &room_id, const std::string &device_id, using namespace mtx::events; // relations shouldn't be encrypted... - mtx::common::RelatesTo relation; - if (body["content"].count("m.relates_to") != 0) { + mtx::common::ReplyRelatesTo relation; + if (body["content"]["m.relates_to"].contains("m.in_reply_to")) { relation = body["content"]["m.relates_to"]; body["content"].erase("m.relates_to"); } diff --git a/src/timeline/ReactionsModel.cpp b/src/timeline/ReactionsModel.cpp new file mode 100644 index 00000000..fd061b14 --- /dev/null +++ b/src/timeline/ReactionsModel.cpp @@ -0,0 +1,98 @@ +#include "ReactionsModel.h" + +#include + +#include "Logging.h" + +QHash +ReactionsModel::roleNames() const +{ + return { + {Key, "key"}, + {Count, "counter"}, + {Users, "users"}, + {SelfReacted, "selfReacted"}, + }; +} + +int +ReactionsModel::rowCount(const QModelIndex &) const +{ + return static_cast(reactions.size()); +} + +QVariant +ReactionsModel::data(const QModelIndex &index, int role) const +{ + const int i = index.row(); + if (i < 0 || i >= static_cast(reactions.size())) + return {}; + + switch (role) { + case Key: + return QString::fromStdString(reactions[i].key); + case Count: + return static_cast(reactions[i].reactions.size()); + case Users: { + QString users; + for (size_t r = 0; r < reactions[i].reactions.size(); r++) { + if (r != 0) + users += ", "; + users += QString::fromStdString(reactions[i].reactions[r].sender); + } + return users; + } + case SelfReacted: + for (const auto &reaction : reactions[i].reactions) + if (reaction.sender == http::client()->user_id().to_string()) + return true; + return false; + default: + return {}; + } +} + +void +ReactionsModel::addReaction(const mtx::events::RoomEvent &reaction) +{ + int idx = 0; + for (auto &storedReactions : reactions) { + if (storedReactions.key == reaction.content.relates_to.key) { + storedReactions.reactions.push_back(reaction); + emit dataChanged(index(idx, 0), index(idx, 0)); + return; + } + idx++; + } + + beginInsertRows(QModelIndex(), idx, idx); + reactions.push_back(KeyReaction{reaction.content.relates_to.key, {reaction}}); + endInsertRows(); +} + +void +ReactionsModel::removeReaction(const mtx::events::RoomEvent &reaction) +{ + int idx = 0; + for (auto &storedReactions : reactions) { + if (storedReactions.key == reaction.content.relates_to.key) { + for (auto it = begin(storedReactions.reactions); + it != end(storedReactions.reactions); + ++it) { + if (it->event_id == reaction.event_id) { + storedReactions.reactions.erase(it); + break; + } + } + + if (storedReactions.reactions.size() == 0) { + beginRemoveRows(QModelIndex(), idx, idx); + reactions.erase(reactions.begin() + idx); + endRemoveRows(); + } else + emit dataChanged(index(idx, 0), index(idx, 0)); + return; + } + idx++; + } +} diff --git a/src/timeline/ReactionsModel.h b/src/timeline/ReactionsModel.h new file mode 100644 index 00000000..ba71f2b7 --- /dev/null +++ b/src/timeline/ReactionsModel.h @@ -0,0 +1,39 @@ +#pragma once + +#include +#include + +#include +#include + +#include + +class ReactionsModel : public QAbstractListModel +{ + Q_OBJECT +public: + explicit ReactionsModel(QObject *parent = nullptr) { Q_UNUSED(parent); } + enum Roles + { + Key, + Count, + Users, + SelfReacted, + }; + + QHash roleNames() const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + +public slots: + void addReaction(const mtx::events::RoomEvent &reaction); + void removeReaction(const mtx::events::RoomEvent &reaction); + +private: + struct KeyReaction + { + std::string key; + std::vector> reactions; + }; + std::vector reactions; +}; diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 340bae39..0555d2ba 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -223,6 +223,7 @@ TimelineModel::roleNames() const {State, "state"}, {IsEncrypted, "isEncrypted"}, {ReplyTo, "replyTo"}, + {Reactions, "reactions"}, {RoomId, "roomId"}, {RoomName, "roomName"}, {RoomTopic, "roomTopic"}, @@ -337,6 +338,11 @@ TimelineModel::data(const QString &id, int role) const } case ReplyTo: return QVariant(QString::fromStdString(in_reply_to_event(event))); + case Reactions: + if (reactions.count(id)) + return QVariant::fromValue((QObject *)&reactions.at(id)); + else + return {}; case RoomId: return QVariant(QString::fromStdString(room_id(event))); case RoomName: @@ -574,6 +580,18 @@ TimelineModel::internalAddEvents( QString redacts = QString::fromStdString(redaction->redacts); auto redacted = std::find(eventOrder.begin(), eventOrder.end(), redacts); + auto event = events.value(redacts); + if (auto reaction = + std::get_if>( + &event)) { + QString reactedTo = + QString::fromStdString(reaction->content.relates_to.event_id); + reactions[reactedTo].removeReaction(*reaction); + int idx = idToIndex(reactedTo); + if (idx >= 0) + emit dataChanged(index(idx, 0), index(idx, 0)); + } + if (redacted != eventOrder.end()) { auto redactedEvent = std::visit( [](const auto &ev) @@ -597,6 +615,17 @@ TimelineModel::internalAddEvents( continue; // don't insert redaction into timeline } + if (auto reaction = + std::get_if>(&e)) { + QString reactedTo = + QString::fromStdString(reaction->content.relates_to.event_id); + reactions[reactedTo].addReaction(*reaction); + int idx = idToIndex(reactedTo); + if (idx >= 0) + emit dataChanged(index(idx, 0), index(idx, 0)); + continue; // don't insert reaction into timeline + } + if (auto event = std::get_if>(&e)) { auto e_ = decryptEvent(*event).event; 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 #include "CacheCryptoStructs.h" +#include "ReactionsModel.h" namespace mtx::http { using RequestErr = const std::optional &; @@ -155,6 +156,7 @@ public: State, IsEncrypted, ReplyTo, + Reactions, RoomId, RoomName, RoomTopic, @@ -271,6 +273,7 @@ private: QSet read; QList pending; std::vector eventOrder; + std::map reactions; QString room_id_; QString prev_batch_token_; -- cgit 1.5.1 From e55a09906fa9dbb15a5e8f07d23f651ef246613d Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 5 May 2020 23:43:43 +0200 Subject: Misc color fixes --- resources/qml/Avatar.qml | 4 ++-- resources/qml/Reactions.qml | 10 +++++----- resources/qml/TimelineView.qml | 4 ++-- resources/styles/system.qss | 6 +++--- src/UserSettingsPage.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index b1007469..ed065270 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -19,7 +19,7 @@ Rectangle { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter visible: img.status != Image.Ready - color: colors.brightText + color: colors.text } Image { @@ -43,5 +43,5 @@ Rectangle { } } } - color: colors.dark + color: colors.base } diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index a33d5f61..c70519a4 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -32,7 +32,7 @@ Flow { text: reaction.text font.family: settings.emoji_font_family opacity: enabled ? 1.0 : 0.3 - color: reaction.hovered ? colors.highlight : colors.buttonText + color: reaction.hovered ? colors.highlight : colors.text horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -41,7 +41,7 @@ Flow { Rectangle { height: reactionText.implicitHeight width: 1 - color: reaction.hovered ? colors.highlight : colors.buttonText + color: reaction.hovered ? colors.highlight : colors.text } Text { @@ -49,7 +49,7 @@ Flow { text: model.counter font: reaction.font opacity: enabled ? 1.0 : 0.3 - color: reaction.hovered ? colors.highlight : colors.buttonText + color: reaction.hovered ? colors.highlight : colors.text horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -61,8 +61,8 @@ Flow { implicitWidth: reaction.implicitWidth implicitHeight: reaction.implicitHeight opacity: enabled ? 1 : 0.3 - border.color: (reaction.hovered || model.selfReacted )? colors.highlight : colors.buttonText - color: colors.dark + border.color: (reaction.hovered || model.selfReacted )? colors.highlight : colors.text + color: colors.base border.width: 1 radius: reaction.height / 2.0 } diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 28d282a1..a63ca049 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -211,7 +211,7 @@ Page { anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined visible: section.includes(" ") text: chat.model.formatDateSeparator(modelData.timestamp) - color: colors.brightText + color: colors.text height: fontMetrics.height * 1.4 width: contentWidth * 1.2 @@ -219,7 +219,7 @@ Page { horizontalAlignment: Text.AlignHCenter background: Rectangle { radius: parent.height / 2 - color: colors.dark + color: colors.base } } Row { diff --git a/resources/styles/system.qss b/resources/styles/system.qss index dd2a90ef..01951aff 100644 --- a/resources/styles/system.qss +++ b/resources/styles/system.qss @@ -98,15 +98,15 @@ UserMentionsWidget { qproperty-highlightedTitleColor: palette(highlighted-text); qproperty-highlightedSubtitleColor: palette(highlighted-text); - qproperty-hoverTitleColor: palette(highlightedtext); - qproperty-hoverSubtitleColor: palette(highlightedtext); + qproperty-hoverTitleColor: palette(dark); + qproperty-hoverSubtitleColor: palette(dark); qproperty-btnColor: palette(dark); qproperty-btnTextColor: palette(bright-text); qproperty-timestampColor: palette(text); qproperty-highlightedTimestampColor: palette(highlighted-text); - qproperty-hoverTimestampColor: palette(highlighted-text); + qproperty-hoverTimestampColor: palette(dark); qproperty-bubbleBgColor: palette(base); qproperty-bubbleFgColor: palette(text); diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 54bce52c..e19aa876 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -115,7 +115,7 @@ UserSettings::applyTheme() /*mid*/ QColor(110, 110, 110), /*text*/ QColor("#333"), /*bright_text*/ QColor("#333"), - /*base*/ QColor("white"), + /*base*/ QColor("#eee"), /*window*/ QColor("white")); lightActive.setColor(QPalette::Highlight, QColor("#38a3d8")); lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color()); -- cgit 1.5.1 From 8348a6c35dfd49e1711488e8972db841c8daa137 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 May 2020 11:15:45 +0200 Subject: Fix reaction count --- src/timeline/ReactionsModel.cpp | 25 +++++++++++-------------- src/timeline/ReactionsModel.h | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/timeline/ReactionsModel.cpp b/src/timeline/ReactionsModel.cpp index fd061b14..f21b1c53 100644 --- a/src/timeline/ReactionsModel.cpp +++ b/src/timeline/ReactionsModel.cpp @@ -35,16 +35,19 @@ ReactionsModel::data(const QModelIndex &index, int role) const return static_cast(reactions[i].reactions.size()); case Users: { QString users; - for (size_t r = 0; r < reactions[i].reactions.size(); r++) { - if (r != 0) + bool first = true; + for (const auto &[event_id, reaction] : reactions[i].reactions) { + if (!first) users += ", "; - users += QString::fromStdString(reactions[i].reactions[r].sender); + else + first = false; + users += QString::fromStdString(reaction.sender); } return users; } case SelfReacted: for (const auto &reaction : reactions[i].reactions) - if (reaction.sender == http::client()->user_id().to_string()) + if (reaction.second.sender == http::client()->user_id().to_string()) return true; return false; default: @@ -58,7 +61,7 @@ ReactionsModel::addReaction(const mtx::events::RoomEventevent_id == reaction.event_id) { - storedReactions.reactions.erase(it); - break; - } - } + storedReactions.reactions.erase(reaction.event_id); if (storedReactions.reactions.size() == 0) { beginRemoveRows(QModelIndex(), idx, idx); diff --git a/src/timeline/ReactionsModel.h b/src/timeline/ReactionsModel.h index ba71f2b7..a0a8580d 100644 --- a/src/timeline/ReactionsModel.h +++ b/src/timeline/ReactionsModel.h @@ -33,7 +33,7 @@ private: struct KeyReaction { std::string key; - std::vector> reactions; + std::map> reactions; }; std::vector reactions; }; -- cgit 1.5.1 From e045e3eb1cbb3785153ca7634f76ba80b9d16bb1 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 May 2020 11:28:24 +0200 Subject: Show displayname on reactions --- src/timeline/ReactionsModel.cpp | 11 +++++++---- src/timeline/ReactionsModel.h | 4 +++- src/timeline/TimelineModel.cpp | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/timeline/ReactionsModel.cpp b/src/timeline/ReactionsModel.cpp index f21b1c53..b686c750 100644 --- a/src/timeline/ReactionsModel.cpp +++ b/src/timeline/ReactionsModel.cpp @@ -1,9 +1,8 @@ #include "ReactionsModel.h" +#include #include -#include "Logging.h" - QHash ReactionsModel::roleNames() const { @@ -41,7 +40,8 @@ ReactionsModel::data(const QModelIndex &index, int role) const users += ", "; else first = false; - users += QString::fromStdString(reaction.sender); + users += + QString::fromStdString(cache::displayName(room_id_, reaction.sender)); } return users; } @@ -56,8 +56,11 @@ ReactionsModel::data(const QModelIndex &index, int role) const } void -ReactionsModel::addReaction(const mtx::events::RoomEvent &reaction) +ReactionsModel::addReaction(const std::string &room_id, + const mtx::events::RoomEvent &reaction) { + room_id_ = room_id; + int idx = 0; for (auto &storedReactions : reactions) { if (storedReactions.key == reaction.content.relates_to.key) { diff --git a/src/timeline/ReactionsModel.h b/src/timeline/ReactionsModel.h index a0a8580d..5f61cd42 100644 --- a/src/timeline/ReactionsModel.h +++ b/src/timeline/ReactionsModel.h @@ -26,7 +26,8 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; public slots: - void addReaction(const mtx::events::RoomEvent &reaction); + void addReaction(const std::string &room_id, + const mtx::events::RoomEvent &reaction); void removeReaction(const mtx::events::RoomEvent &reaction); private: @@ -35,5 +36,6 @@ private: std::string key; std::map> reactions; }; + std::string room_id_; std::vector reactions; }; diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 0555d2ba..5e57952a 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -619,7 +619,7 @@ TimelineModel::internalAddEvents( std::get_if>(&e)) { QString reactedTo = QString::fromStdString(reaction->content.relates_to.event_id); - reactions[reactedTo].addReaction(*reaction); + reactions[reactedTo].addReaction(room_id_.toStdString(), *reaction); int idx = idToIndex(reactedTo); if (idx >= 0) emit dataChanged(index(idx, 0), index(idx, 0)); -- cgit 1.5.1 From ff54ce9334b03f3e5b9fbee9c7198a99a408bbce Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 May 2020 11:37:40 +0200 Subject: Fix rooms with a lot of reactions not paginating correctly --- src/timeline/TimelineModel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 5e57952a..75f41d1e 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -469,7 +469,6 @@ TimelineModel::fetchMore(const QModelIndex &) mtx::errors::to_string(err->matrix_error.errcode), err->matrix_error.error, err->parse_error); - emit oldMessagesRetrieved(std::move(res)); setPaginationInProgress(false); return; } @@ -701,6 +700,11 @@ TimelineModel::addBackwardsEvents(const mtx::responses::Messages &msgs) } prev_batch_token_ = QString::fromStdString(msgs.end); + + if (ids.empty() && !msgs.chunk.empty()) { + // no visible events fetched, prevent loading from stopping + fetchMore(QModelIndex()); + } } QString -- cgit 1.5.1 From e5a5a66716ba8190b3d6ae1689e7e1f721563777 Mon Sep 17 00:00:00 2001 From: Nicolas Werner 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') 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>(&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 From 0b1d3a40f4e19d4c0257bfdbe276f373414542d6 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 May 2020 13:45:38 +0200 Subject: Remove unused binding name --- src/timeline/ReactionsModel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/timeline/ReactionsModel.cpp b/src/timeline/ReactionsModel.cpp index b686c750..2e249819 100644 --- a/src/timeline/ReactionsModel.cpp +++ b/src/timeline/ReactionsModel.cpp @@ -35,13 +35,13 @@ ReactionsModel::data(const QModelIndex &index, int role) const case Users: { QString users; bool first = true; - for (const auto &[event_id, reaction] : reactions[i].reactions) { + for (const auto &reaction : reactions[i].reactions) { if (!first) users += ", "; else first = false; - users += - QString::fromStdString(cache::displayName(room_id_, reaction.sender)); + users += QString::fromStdString( + cache::displayName(room_id_, reaction.second.sender)); } return users; } -- cgit 1.5.1