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

Update libqmatrixclient && disable local echo for now until #40 is fixed.

Browse Source
This commit is contained in:
Black Hat
2018-11-02 15:08:01 +08:00
parent e19e3b8ff9
commit 564b4c4578
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libqmatrixclient

Submodule include/libqmatrixclient updated: 98c4168131...7c7ce3d468

5
src/messageeventmodel.cpp
View File

@@ -240,7 +240,8 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
if (role == MessageRole) { if (role == MessageRole) {
static const QRegExp rmReplyRegExp("^> <@.*:.*> .*\n\n(.*)"); static const QRegExp rmReplyRegExp("^> <@.*:.*> .*\n\n(.*)");
return utils::eventToString(evt, m_currentRoom).replace(rmReplyRegExp, "\\1"); return utils::eventToString(evt, m_currentRoom)
.replace(rmReplyRegExp, "\\1");
} }
if (role == Qt::ToolTipRole) { if (role == Qt::ToolTipRole) {
@@ -308,7 +309,7 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
if (role == ReadMarkerRole) return evt.id() == lastReadEventId; if (role == ReadMarkerRole) return evt.id() == lastReadEventId;
if (role == SpecialMarksRole) { if (role == SpecialMarksRole) {
if (isPending) return pendingIt->deliveryStatus(); if (isPending) return EventStatus::Hidden;
if (is<RedactionEvent>(evt)) return EventStatus::Hidden; if (is<RedactionEvent>(evt)) return EventStatus::Hidden;
if (evt.isRedacted()) return EventStatus::Redacted; if (evt.isRedacted()) return EventStatus::Redacted;

3
src/spectraluser.cpp
View File

@@ -2,5 +2,6 @@
SpectralUser::SpectralUser(QString userId, Connection* connection) SpectralUser::SpectralUser(QString userId, Connection* connection)
: User(userId, connection) { : User(userId, connection) {
connect(this, &User::avatarChanged, this, &SpectralUser::inheritedAvatarChanged); connect(this, &User::avatarChanged, this,
&SpectralUser::inheritedAvatarChanged);
} }