diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 0447a56a..781f028e 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -413,17 +413,19 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, const QString &room_i // When a message is sent, check if the current edit/reply relates to that message, // and update the event_id so that it points to the sent message and not the pending one. - connect( - &events, &EventStore::messageSent, this, [this](const std::string &txn_id, const std::string &event_id) { - if (edit_.toStdString() == txn_id) { - edit_ = QString::fromStdString(event_id); - emit editChanged(edit_); - } - if (reply_.toStdString() == txn_id) { - reply_ = QString::fromStdString(event_id); - emit replyChanged(reply_); - } - }); + connect(&events, + &EventStore::messageSent, + this, + [this](const std::string &txn_id, const std::string &event_id) { + if (edit_.toStdString() == txn_id) { + edit_ = QString::fromStdString(event_id); + emit editChanged(edit_); + } + if (reply_.toStdString() == txn_id) { + reply_ = QString::fromStdString(event_id); + emit replyChanged(reply_); + } + }); connect( manager_, &TimelineViewManager::initialSyncChanged, &events, &EventStore::enableKeyRequests); @@ -1064,7 +1066,7 @@ TimelineModel::viewRawMessage(const QString &id) } void -TimelineModel::forwardMessage(const QString & eventId, QString roomId) +TimelineModel::forwardMessage(const QString &eventId, QString roomId) { auto e = events.get(eventId.toStdString(), ""); if (!e) @@ -1426,8 +1428,9 @@ TimelineModel::addPendingMessage(mtx::events::collections::TimelineEvents event) void TimelineModel::openMedia(const QString &eventId) { - cacheMedia(eventId, - [](const QString &filename) { QDesktopServices::openUrl(QUrl::fromLocalFile(filename)); }); + cacheMedia(eventId, [](const QString &filename) { + QDesktopServices::openUrl(QUrl::fromLocalFile(filename)); + }); } bool @@ -1505,7 +1508,8 @@ TimelineModel::saveMedia(const QString &eventId) const } void -TimelineModel::cacheMedia(const QString &eventId, const std::function &callback) +TimelineModel::cacheMedia(const QString &eventId, + const std::function &callback) { mtx::events::collections::TimelineEvents *event = events.get(eventId.toStdString(), ""); if (!event) diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 9ee78831..bbc1e5ef 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -189,7 +189,7 @@ class TimelineModel : public QAbstractListModel public: explicit TimelineModel(TimelineViewManager *manager, - const QString& room_id, + const QString &room_id, QObject *parent = nullptr); enum Roles @@ -272,7 +272,8 @@ public: Q_INVOKABLE bool saveMedia(const QString &eventId) const; Q_INVOKABLE void showEvent(QString eventId); Q_INVOKABLE void copyLinkToEvent(const QString &eventId) const; - void cacheMedia(const QString &eventId, const std::function &callback); + void + cacheMedia(const QString &eventId, const std::function &callback); Q_INVOKABLE void sendReset() { beginResetModel();