tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libqmatrixclient

@ -1 +1 @@
Subproject commit 98c416813177f7141079101da978fe1222574b5c Subproject commit 7c7ce3d468af242364efb53e77ed12047b6a5382

2
src/main.cpp
View File

@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
qRegisterMetaType<Room *>("Room*"); qRegisterMetaType<Room *>("Room*");
qRegisterMetaType<MessageEventType>("MessageEventType"); qRegisterMetaType<MessageEventType>("MessageEventType");
qRegisterMetaType<SpectralRoom *>("SpectralRoom*"); qRegisterMetaType<SpectralRoom *>("SpectralRoom*");
qRegisterMetaType<SpectralUser *>("SpectralUser*"); qRegisterMetaType<SpectralUser *>("SpectralUser*");
QQmlApplicationEngine engine; QQmlApplicationEngine engine;

43
src/messageeventmodel.cpp
View File

@ -43,7 +43,7 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const {
return roles; return roles;
} }
MessageEventModel::MessageEventModel(QObject* parent) MessageEventModel::MessageEventModel(QObject *parent)
: QAbstractListModel(parent), m_currentRoom(nullptr) { : QAbstractListModel(parent), m_currentRoom(nullptr) {
using namespace QMatrixClient; using namespace QMatrixClient;
qmlRegisterType<FileTransferInfo>(); qmlRegisterType<FileTransferInfo>();
@ -54,7 +54,7 @@ MessageEventModel::MessageEventModel(QObject* parent)
MessageEventModel::~MessageEventModel() {} MessageEventModel::~MessageEventModel() {}
void MessageEventModel::setRoom(SpectralRoom* room) { void MessageEventModel::setRoom(SpectralRoom *room) {
if (room == m_currentRoom) return; if (room == m_currentRoom) return;
beginResetModel(); beginResetModel();
@ -95,7 +95,7 @@ void MessageEventModel::setRoom(SpectralRoom* room) {
connect(m_currentRoom, &Room::pendingEventAdded, this, connect(m_currentRoom, &Room::pendingEventAdded, this,
&MessageEventModel::endInsertRows); &MessageEventModel::endInsertRows);
connect(m_currentRoom, &Room::pendingEventAboutToMerge, this, connect(m_currentRoom, &Room::pendingEventAboutToMerge, this,
[this](RoomEvent*, int i) { [this](RoomEvent *, int i) {
if (i == 0) return; // No need to move anything, just refresh if (i == 0) return; // No need to move anything, just refresh
movingEvent = true; movingEvent = true;
@ -130,7 +130,7 @@ void MessageEventModel::setRoom(SpectralRoom* room) {
}); });
connect( connect(
m_currentRoom, &Room::replacedEvent, this, m_currentRoom, &Room::replacedEvent, this,
[this](const RoomEvent* newEvent) { refreshEvent(newEvent->id()); }); [this](const RoomEvent *newEvent) { refreshEvent(newEvent->id()); });
connect(m_currentRoom, &Room::fileTransferProgress, this, connect(m_currentRoom, &Room::fileTransferProgress, this,
&MessageEventModel::refreshEvent); &MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::fileTransferCompleted, this, connect(m_currentRoom, &Room::fileTransferCompleted, this,
@ -140,7 +140,7 @@ void MessageEventModel::setRoom(SpectralRoom* room) {
connect(m_currentRoom, &Room::fileTransferCancelled, this, connect(m_currentRoom, &Room::fileTransferCancelled, this,
&MessageEventModel::refreshEvent); &MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::readMarkerForUserMoved, this, connect(m_currentRoom, &Room::readMarkerForUserMoved, this,
[=](User* user, QString fromEventId, QString toEventId) { [=](User *user, QString fromEventId, QString toEventId) {
refreshEventRoles(fromEventId, {UserMarkerRole}); refreshEventRoles(fromEventId, {UserMarkerRole});
refreshEventRoles(toEventId, {UserMarkerRole}); refreshEventRoles(toEventId, {UserMarkerRole});
}); });
@ -151,7 +151,7 @@ void MessageEventModel::setRoom(SpectralRoom* room) {
endResetModel(); endResetModel();
} }
int MessageEventModel::refreshEvent(const QString& eventId) { int MessageEventModel::refreshEvent(const QString &eventId) {
return refreshEventRoles(eventId); return refreshEventRoles(eventId);
} }
@ -161,13 +161,13 @@ int MessageEventModel::timelineBaseIndex() const {
return m_currentRoom ? int(m_currentRoom->pendingEvents().size()) : 0; return m_currentRoom ? int(m_currentRoom->pendingEvents().size()) : 0;
} }
void MessageEventModel::refreshEventRoles(int row, const QVector<int>& roles) { void MessageEventModel::refreshEventRoles(int row, const QVector<int> &roles) {
const auto idx = index(row); const auto idx = index(row);
emit dataChanged(idx, idx, roles); emit dataChanged(idx, idx, roles);
} }
int MessageEventModel::refreshEventRoles(const QString& eventId, int MessageEventModel::refreshEventRoles(const QString &eventId,
const QVector<int>& roles) { const QVector<int> &roles) {
const auto it = m_currentRoom->findInTimeline(eventId); const auto it = m_currentRoom->findInTimeline(eventId);
if (it == m_currentRoom->timelineEdge()) { if (it == m_currentRoom->timelineEdge()) {
qWarning() << "Trying to refresh inexistent event:" << eventId; qWarning() << "Trying to refresh inexistent event:" << eventId;
@ -179,13 +179,13 @@ int MessageEventModel::refreshEventRoles(const QString& eventId,
return row; return row;
} }
inline bool hasValidTimestamp(const QMatrixClient::TimelineItem& ti) { inline bool hasValidTimestamp(const QMatrixClient::TimelineItem &ti) {
return ti->timestamp().isValid(); return ti->timestamp().isValid();
} }
QDateTime MessageEventModel::makeMessageTimestamp( QDateTime MessageEventModel::makeMessageTimestamp(
const QMatrixClient::Room::rev_iter_t& baseIt) const { const QMatrixClient::Room::rev_iter_t &baseIt) const {
const auto& timeline = m_currentRoom->messageEvents(); const auto &timeline = m_currentRoom->messageEvents();
auto ts = baseIt->event()->timestamp(); auto ts = baseIt->event()->timestamp();
if (ts.isValid()) return ts; if (ts.isValid()) return ts;
@ -214,12 +214,12 @@ QString MessageEventModel::renderDate(QDateTime timestamp) const {
return date.toString(Qt::DefaultLocaleShortDate); return date.toString(Qt::DefaultLocaleShortDate);
} }
int MessageEventModel::rowCount(const QModelIndex& parent) const { int MessageEventModel::rowCount(const QModelIndex &parent) const {
if (!m_currentRoom || parent.isValid()) return 0; if (!m_currentRoom || parent.isValid()) return 0;
return m_currentRoom->timelineSize(); return m_currentRoom->timelineSize();
} }
QVariant MessageEventModel::data(const QModelIndex& idx, int role) const { QVariant MessageEventModel::data(const QModelIndex &idx, int role) const {
const auto row = idx.row(); const auto row = idx.row();
if (!m_currentRoom || row < 0 || if (!m_currentRoom || row < 0 ||
@ -232,7 +232,7 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
std::max(0, row - timelineBaseIndex()); std::max(0, row - timelineBaseIndex());
const auto pendingIt = m_currentRoom->pendingEvents().crbegin() + const auto pendingIt = m_currentRoom->pendingEvents().crbegin() +
std::min(row, timelineBaseIndex()); std::min(row, timelineBaseIndex());
const auto& evt = isPending ? **pendingIt : **timelineIt; const auto &evt = isPending ? **pendingIt : **timelineIt;
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
return utils::eventToString(evt, m_currentRoom, Qt::RichText); return utils::eventToString(evt, m_currentRoom, Qt::RichText);
@ -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) {
@ -278,7 +279,7 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
if (role == ContentTypeRole) { if (role == ContentTypeRole) {
if (auto e = eventCast<const RoomMessageEvent>(&evt)) { if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
const auto& contentType = e->mimeType().name(); const auto &contentType = e->mimeType().name();
return contentType == "text/plain" ? QStringLiteral("text/html") return contentType == "text/plain" ? QStringLiteral("text/html")
: contentType; : contentType;
} }
@ -308,13 +309,13 @@ 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;
if (evt.isStateEvent() && if (evt.isStateEvent() &&
static_cast<const StateEventBase&>(evt).repeatsState()) static_cast<const StateEventBase &>(evt).repeatsState())
return EventStatus::Hidden; return EventStatus::Hidden;
return EventStatus::Normal; return EventStatus::Normal;
@ -340,7 +341,7 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
if (role == UserMarkerRole) { if (role == UserMarkerRole) {
QVariantList variantList; QVariantList variantList;
for (User* user : m_currentRoom->usersAtEventId(evt.id())) { for (User *user : m_currentRoom->usersAtEventId(evt.id())) {
if (user == m_currentRoom->localUser()) continue; if (user == m_currentRoom->localUser()) continue;
variantList.append(QVariant::fromValue(user)); variantList.append(QVariant::fromValue(user));
} }
@ -366,7 +367,7 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
return {}; return {};
} }
int MessageEventModel::eventIDToIndex(const QString& eventID) { int MessageEventModel::eventIDToIndex(const QString &eventID) {
const auto it = m_currentRoom->findInTimeline(eventID); const auto it = m_currentRoom->findInTimeline(eventID);
if (it == m_currentRoom->timelineEdge()) { if (it == m_currentRoom->timelineEdge()) {
qWarning() << "Trying to find inexistent event:" << eventID; qWarning() << "Trying to find inexistent event:" << eventID;

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);
} }