Merge pull request #157 from Alch-Emi/no-escape

Removed double-sanitization of names in "... is typing" messages
This commit is contained in:
DeepBlueV7.X 2020-03-25 06:02:14 +00:00 committed by GitHub
commit e389588bc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1443,7 +1443,7 @@ TimelineModel::formatTypingUsers(const std::vector<QString> &users, QColor bg)
QStringList uidWithoutLast; QStringList uidWithoutLast;
auto formatUser = [this, bg](const QString &user_id) -> QString { auto formatUser = [this, bg](const QString &user_id) -> QString {
auto uncoloredUsername = escapeEmoji(displayName(user_id).toHtmlEscaped()); auto uncoloredUsername = escapeEmoji(displayName(user_id));
QString prefix = QString prefix =
QString("<font color=\"%1\">").arg(manager_->userColor(user_id, bg).name()); QString("<font color=\"%1\">").arg(manager_->userColor(user_id, bg).name());