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

Fix #108.

Browse Source
This commit is contained in:
Black Hat
2019-05-23 16:44:34 +08:00
parent 0f156ea98b
commit a76e63063d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/messageeventmodel.cpp
View File

@@ -267,7 +267,8 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
const auto& evt = isPending ? **pendingIt : **timelineIt; const auto& evt = isPending ? **pendingIt : **timelineIt;
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
return utils::removeReply(m_currentRoom->eventToString(evt, Qt::RichText)); return utils::cleanHTML(
utils::removeReply(m_currentRoom->eventToString(evt, Qt::RichText)));
} }
if (role == MessageRole) { if (role == MessageRole) {
@@ -410,8 +411,8 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
case ReplyEventIdRole: case ReplyEventIdRole:
return replyEventId; return replyEventId;
case ReplyDisplayRole: case ReplyDisplayRole:
return utils::removeReply( return utils::cleanHTML(utils::removeReply(
m_currentRoom->eventToString(replyEvt, Qt::RichText)); m_currentRoom->eventToString(replyEvt, Qt::RichText)));
case ReplyAuthorRole: case ReplyAuthorRole:
return QVariant::fromValue(m_currentRoom->user(replyEvt.senderId())); return QVariant::fromValue(m_currentRoom->user(replyEvt.senderId()));
} }

2
src/utils.cpp
View File

@@ -7,7 +7,7 @@ QString utils::removeReply(const QString& text) {
return result; return result;
} }
QString utils::cleanHTML(const QString& text, QMatrixClient::Room* room) { QString utils::cleanHTML(const QString& text) {
QString result(text); QString result(text);
result.replace(codePillRegExp, "<i>\\1</i>"); result.replace(codePillRegExp, "<i>\\1</i>");
result.replace(userPillRegExp, "<b>\\1</b>"); result.replace(userPillRegExp, "<b>\\1</b>");

2
src/utils.h
View File

@@ -25,7 +25,7 @@ static const QRegularExpression userPillRegExp{
QRegularExpression::DotMatchesEverythingOption}; QRegularExpression::DotMatchesEverythingOption};
QString removeReply(const QString& text); QString removeReply(const QString& text);
QString cleanHTML(const QString& text, QMatrixClient::Room* room); QString cleanHTML(const QString& text);
} // namespace utils } // namespace utils
#endif #endif