From 946ab4d0f287307c24e310c6d2faef931f094ec5 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Fri, 3 Jan 2020 23:21:33 +0100 Subject: invert timeline --- src/timeline/TimelineModel.cpp | 52 ++++++++++++++++++++++++++++++++---------- src/timeline/TimelineModel.h | 1 + 2 files changed, 41 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 593a21df..8746a31f 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -202,6 +202,7 @@ TimelineModel::roleNames() const {ReplyTo, "replyTo"}, {RoomName, "roomName"}, {RoomTopic, "roomTopic"}, + {Dump, "dump"}, }; } int @@ -235,7 +236,7 @@ TimelineModel::data(const QModelIndex &index, int role) const std::string userId = acc::sender(event); - for (int r = index.row() - 1; r > 0; r--) { + for (size_t r = index.row() + 1; r < eventOrder.size(); r++) { auto tempEv = events.value(eventOrder[r]); QDateTime prevDate = origin_server_ts(tempEv); prevDate.setTime(QTime()); @@ -314,6 +315,35 @@ TimelineModel::data(const QModelIndex &index, int role) const return QVariant(QString::fromStdString(room_name(event))); case RoomTopic: return QVariant(QString::fromStdString(room_topic(event))); + case Dump: { + QVariantMap m; + auto names = roleNames(); + + // m.insert(names[Section], data(index, static_cast(Section))); + m.insert(names[Type], data(index, static_cast(Type))); + m.insert(names[Body], data(index, static_cast(Body))); + m.insert(names[FormattedBody], data(index, static_cast(FormattedBody))); + m.insert(names[UserId], data(index, static_cast(UserId))); + m.insert(names[UserName], data(index, static_cast(UserName))); + m.insert(names[Timestamp], data(index, static_cast(Timestamp))); + m.insert(names[Url], data(index, static_cast(Url))); + m.insert(names[ThumbnailUrl], data(index, static_cast(ThumbnailUrl))); + m.insert(names[Filename], data(index, static_cast(Filename))); + m.insert(names[Filesize], data(index, static_cast(Filesize))); + m.insert(names[MimeType], data(index, static_cast(MimeType))); + m.insert(names[Height], data(index, static_cast(Height))); + m.insert(names[Width], data(index, static_cast(Width))); + m.insert(names[ProportionalHeight], + data(index, static_cast(ProportionalHeight))); + m.insert(names[Id], data(index, static_cast(Id))); + m.insert(names[State], data(index, static_cast(State))); + m.insert(names[IsEncrypted], data(index, static_cast(IsEncrypted))); + m.insert(names[ReplyTo], data(index, static_cast(ReplyTo))); + m.insert(names[RoomName], data(index, static_cast(RoomName))); + m.insert(names[RoomTopic], data(index, static_cast(RoomTopic))); + + return QVariant(m); + } default: return QVariant(); } @@ -335,10 +365,8 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline) if (ids.empty()) return; - beginInsertRows(QModelIndex(), - static_cast(this->eventOrder.size()), - static_cast(this->eventOrder.size() + ids.size() - 1)); - this->eventOrder.insert(this->eventOrder.end(), ids.begin(), ids.end()); + beginInsertRows(QModelIndex(), 0, static_cast(ids.size() - 1)); + this->eventOrder.insert(this->eventOrder.begin(), ids.rbegin(), ids.rend()); endInsertRows(); updateLastMessage(); @@ -362,7 +390,7 @@ isMessage(const mtx::events::Event &) void TimelineModel::updateLastMessage() { - for (auto it = eventOrder.rbegin(); it != eventOrder.rend(); ++it) { + for (auto it = eventOrder.begin(); it != eventOrder.end(); ++it) { auto event = events.value(*it); if (auto e = std::get_if>( &event)) { @@ -499,8 +527,10 @@ TimelineModel::addBackwardsEvents(const mtx::responses::Messages &msgs) std::vector ids = internalAddEvents(msgs.chunk); if (!ids.empty()) { - beginInsertRows(QModelIndex(), 0, static_cast(ids.size() - 1)); - this->eventOrder.insert(this->eventOrder.begin(), ids.rbegin(), ids.rend()); + beginInsertRows(QModelIndex(), + static_cast(this->eventOrder.size()), + static_cast(this->eventOrder.size() + ids.size() - 1)); + this->eventOrder.insert(this->eventOrder.end(), ids.begin(), ids.end()); endInsertRows(); } @@ -1120,11 +1150,9 @@ TimelineModel::addPendingMessage(mtx::events::collections::TimelineEvents event) internalAddEvents({event}); QString txn_id_qstr = QString::fromStdString(mtx::accessors::event_id(event)); - beginInsertRows(QModelIndex(), - static_cast(this->eventOrder.size()), - static_cast(this->eventOrder.size())); + beginInsertRows(QModelIndex(), 0, 0); pending.push_back(txn_id_qstr); - this->eventOrder.insert(this->eventOrder.end(), txn_id_qstr); + this->eventOrder.insert(this->eventOrder.begin(), txn_id_qstr); endInsertRows(); updateLastMessage(); diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 7ff80c45..4161a0fc 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -147,6 +147,7 @@ public: ReplyTo, RoomName, RoomTopic, + Dump, }; QHash roleNames() const override; -- cgit 1.5.1