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

Fix line strike.

Browse Source 
Fix code block wrapping.
Fix replyModel being garbage collected.
Reply message in RoomPanelInput is richtext now.
This commit is contained in:
Black Hat
2019-09-29 20:29:59 -07:00
parent 887f69fac3
commit 617855a780
11 changed files with 131 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/messageeventmodel.cpp
View File

@@ -285,12 +285,11 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
const auto& evt = isPending ? **pendingIt : **timelineIt;
if (role == Qt::DisplayRole) {
return utils::cleanHTML(
utils::removeReply(m_currentRoom->eventToString(evt, Qt::RichText)));
return m_currentRoom->eventToString(evt, Qt::RichText);
}
if (role == MessageRole) {
return utils::removeReply(m_currentRoom->eventToString(evt));
return m_currentRoom->eventToString(evt);
}
if (role == Qt::ToolTipRole) {
@@ -443,8 +442,7 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
return QVariantMap{
{"eventId", replyEventId},
{"display", utils::cleanHTML(utils::removeReply(
m_currentRoom->eventToString(replyEvt, Qt::RichText)))},
{"display", m_currentRoom->eventToString(replyEvt, Qt::RichText)},
{"author",
QVariant::fromValue(m_currentRoom->user(replyEvt.senderId()))}};
}