From 1e14cd3ff0bed9c066d4c23878713f95c8dbe5bc Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Mon, 9 Nov 2020 19:09:38 +0100
Subject: [PATCH] fix: Hotfix request archive

---
 lib/src/client.dart | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/src/client.dart b/lib/src/client.dart
index 251e0c2b..033c8f04 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -476,12 +476,20 @@ class Client extends MatrixApi {
             mHeroes: []);
         if (room.timeline?.events != null) {
           for (var event in room.timeline.events) {
-            leftRoom.setState(Event.fromMatrixEvent(event, leftRoom));
+            leftRoom.setState(Event.fromMatrixEvent(
+              event,
+              leftRoom,
+              sortOrder: event.originServerTs.millisecondsSinceEpoch.toDouble(),
+            ));
           }
         }
         if (room.state != null) {
           for (var event in room.state) {
-            leftRoom.setState(Event.fromMatrixEvent(event, leftRoom));
+            leftRoom.setState(Event.fromMatrixEvent(
+              event,
+              leftRoom,
+              sortOrder: event.originServerTs.millisecondsSinceEpoch.toDouble(),
+            ));
           }
         }
         archiveList.add(leftRoom);