rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show displayname on reactions

This commit is contained in:
Nicolas Werner 2020-05-06 11:28:24 +02:00
parent 8348a6c35d
commit e045e3eb1c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/timeline/ReactionsModel.cpp
View File

@ -1,9 +1,8 @@
#include "ReactionsModel.h" #include "ReactionsModel.h"
#include <Cache.h>
#include <MatrixClient.h> #include <MatrixClient.h>
#include "Logging.h"
QHash<int, QByteArray> QHash<int, QByteArray>
ReactionsModel::roleNames() const ReactionsModel::roleNames() const
{ {
@ -41,7 +40,8 @@ ReactionsModel::data(const QModelIndex &index, int role) const
users += ", "; users += ", ";
else else
first = false; first = false;
users += QString::fromStdString(reaction.sender); users +=
QString::fromStdString(cache::displayName(room_id_, reaction.sender));
} }
return users; return users;
} }
@ -56,8 +56,11 @@ ReactionsModel::data(const QModelIndex &index, int role) const
} }
void void
ReactionsModel::addReaction(const mtx::events::RoomEvent<mtx::events::msg::Reaction> &reaction) ReactionsModel::addReaction(const std::string &room_id,
const mtx::events::RoomEvent<mtx::events::msg::Reaction> &reaction)
{ {
room_id_ = room_id;
int idx = 0; int idx = 0;
for (auto &storedReactions : reactions) { for (auto &storedReactions : reactions) {
if (storedReactions.key == reaction.content.relates_to.key) { if (storedReactions.key == reaction.content.relates_to.key) {

4
src/timeline/ReactionsModel.h
View File

@ -26,7 +26,8 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
public slots: public slots:
void addReaction(const mtx::events::RoomEvent<mtx::events::msg::Reaction> &reaction); void addReaction(const std::string &room_id,
const mtx::events::RoomEvent<mtx::events::msg::Reaction> &reaction);
void removeReaction(const mtx::events::RoomEvent<mtx::events::msg::Reaction> &reaction); void removeReaction(const mtx::events::RoomEvent<mtx::events::msg::Reaction> &reaction);
private: private:
@ -35,5 +36,6 @@ private:
std::string key; std::string key;
std::map<std::string, mtx::events::RoomEvent<mtx::events::msg::Reaction>> reactions; std::map<std::string, mtx::events::RoomEvent<mtx::events::msg::Reaction>> reactions;
}; };
std::string room_id_;
std::vector<KeyReaction> reactions; std::vector<KeyReaction> reactions;
}; };

2
src/timeline/TimelineModel.cpp
View File

@ -619,7 +619,7 @@ TimelineModel::internalAddEvents(
std::get_if<mtx::events::RoomEvent<mtx::events::msg::Reaction>>(&e)) { std::get_if<mtx::events::RoomEvent<mtx::events::msg::Reaction>>(&e)) {
QString reactedTo = QString reactedTo =
QString::fromStdString(reaction->content.relates_to.event_id); QString::fromStdString(reaction->content.relates_to.event_id);
reactions[reactedTo].addReaction(*reaction); reactions[reactedTo].addReaction(room_id_.toStdString(), *reaction);
int idx = idToIndex(reactedTo); int idx = idToIndex(reactedTo);
if (idx >= 0) if (idx >= 0)
emit dataChanged(index(idx, 0), index(idx, 0)); emit dataChanged(index(idx, 0), index(idx, 0));