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

Adapt to behavior change in libQuotient

Browse Source 
(cherry picked from commit 4e6850a60c)
This commit is contained in:
Tobias Fella
2024-04-30 17:05:20 +02:00
parent 2398d917f0
commit 8ef41b9c90
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/eventhandler.cpp
View File

@@ -1038,7 +1038,11 @@ QString EventHandler::getReadMarkersString() const
QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size()); QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
for (const auto &userId : userIds) { for (const auto &userId : userIds) {
auto user = m_room->user(userId); auto user = m_room->user(userId);
readMarkersString += user->displayname(m_room) + i18nc("list separator", ", "); auto displayName = user->displayname(m_room);
if (displayName.isEmpty()) {
displayName = userId;
}
readMarkersString += displayName + i18nc("list separator", ", ");
} }
readMarkersString.chop(2); readMarkersString.chop(2);
return readMarkersString; return readMarkersString;

3
src/models/reactionmodel.cpp
View File

@@ -68,7 +68,8 @@ 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).toMap()[QStringLiteral("displayName")].toString(); auto displayName = reaction.authors.at(i).toMap()[QStringLiteral("displayName")].toString();
text += displayName.isEmpty() ? reaction.authors.at(i).toMap()[QStringLiteral("id")].toString() : displayName;
} }
if (reaction.authors.count() > 3) { if (reaction.authors.count() > 3) {