ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't store RoomMembers in ReactionModel

Browse Source 
Don't store RoomMember objects in the reaction model just grab them everytime incase the state event is replaced.
This commit is contained in:
James Graham
2024-05-12 13:13:02 +00:00
committed by Tobias Fella
parent 645438525f
commit 31dd981104
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/models/reactionmodel.cpp
View File

@@ -69,7 +69,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
text += i18nc("Separate the usernames of users", " and "); text += i18nc("Separate the usernames of users", " and ");
} }
} }
text += reaction.authors.at(i).displayName(); text += m_room->member(reaction.authors.at(i)).displayName();
} }
if (reaction.authors.count() > 3) { if (reaction.authors.count() > 3) {
@@ -87,7 +87,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
if (role == HasLocalMember) { if (role == HasLocalMember) {
for (auto author : reaction.authors) { for (auto author : reaction.authors) {
if (author.id() == m_room->localMember().id()) { if (author == m_room->localMember().id()) {
return true; return true;
} }
} }
@@ -116,13 +116,13 @@ void ReactionModel::updateReactions()
return; return;
}; };
QMap<QString, QList<Quotient::RoomMember>> reactions = {}; QMap<QString, QStringList> reactions = {};
for (const auto &a : annotations) { for (const auto &a : annotations) {
if (a->isRedacted()) { // Just in case? if (a->isRedacted()) { // Just in case?
continue; continue;
} }
if (const auto &e = eventCast<const Quotient::ReactionEvent>(a)) { if (const auto &e = eventCast<const Quotient::ReactionEvent>(a)) {
reactions[e->key()].append(m_room->member(e->senderId())); reactions[e->key()].append(e->senderId());
if (e->contentJson()[QStringLiteral("shortcode")].toString().length()) { if (e->contentJson()[QStringLiteral("shortcode")].toString().length()) {
m_shortcodes[e->key()] = e->contentJson()[QStringLiteral("shortcode")].toString().toHtmlEscaped(); m_shortcodes[e->key()] = e->contentJson()[QStringLiteral("shortcode")].toString().toHtmlEscaped();
} }
@@ -135,7 +135,7 @@ void ReactionModel::updateReactions()
} }
auto i = reactions.constBegin(); auto i = reactions.constBegin();
while (i != reactions.constEnd()) { while (i != reactions.constEnd()) {
QList<Quotient::RoomMember> members; QStringList members;
for (const auto &member : i.value()) { for (const auto &member : i.value()) {
members.append(member); members.append(member);
} }

2
src/models/reactionmodel.h
View File

@@ -25,7 +25,7 @@ public:
*/ */
struct Reaction { struct Reaction {
QString reaction; /**< The reaction emoji. */ QString reaction; /**< The reaction emoji. */
QList<Quotient::RoomMember> authors; /**< The list of authors who sent the given reaction. */ QStringList authors; /**< The list of authors who sent the given reaction. */
}; };
/** /**