Fix timestamps after loading

2 files changed, 9 insertions, 0 deletions

diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp

index bb2644f3..1cf16243 100644
--- a/src/timeline/RoomlistModel.cpp
+++ b/src/timeline/RoomlistModel.cpp
@@ -298,6 +298,7 @@ RoomlistModel::addRoom(const QString &room_id, bool suppressInsertNotification)
                              {
                                Roles::HasLoudNotification,
                                Roles::LastMessage,
+                               Roles::Time,
                                Roles::Timestamp,
                                Roles::NotificationCount,
                                Qt::DisplayRole,
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index c7c1bfc5..3fe4c07f 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1055,6 +1055,10 @@ TimelineModel::updateLastMessage()
                        ts,
                        time};
             if (description != lastMessage_) {
+                if (lastMessage_.timestamp == 0) {
+                    cache::client()->updateLastMessageTimestamp(room_id_.toStdString(),
+                                                                description.timestamp);
+                }
                 lastMessage_ = description;
                 emit lastMessageChanged();
             }
@@ -1068,6 +1072,10 @@ TimelineModel::updateLastMessage()
           QString::fromStdString(http::client()->user_id().to_string()),
           cache::displayName(room_id_, QString::fromStdString(mtx::accessors::sender(*event))));
         if (description != lastMessage_) {
+            if (lastMessage_.timestamp == 0) {
+                cache::client()->updateLastMessageTimestamp(room_id_.toStdString(),
+                                                            description.timestamp);
+            }
             lastMessage_ = description;
             emit lastMessageChanged();
         }