From 5f1e48944c816028a9f610db5f19efc867203106 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Wed, 18 Sep 2019 15:45:50 +1000
Subject: [PATCH] Fix message ordering

---
 Signal/src/Loki/LokiGroupChatPoller.swift            | 2 +-
 SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Signal/src/Loki/LokiGroupChatPoller.swift b/Signal/src/Loki/LokiGroupChatPoller.swift
index d35baa966..3ec1683a1 100644
--- a/Signal/src/Loki/LokiGroupChatPoller.swift
+++ b/Signal/src/Loki/LokiGroupChatPoller.swift
@@ -111,7 +111,7 @@ public final class LokiGroupChatPoller : NSObject {
         }
         // Poll
         let _ = LokiGroupChatAPI.getMessages(for: group.serverID, on: group.server).done(on: .main) { messages in
-            messages.reversed().forEach { message in
+            messages.forEach { message in
                 if message.hexEncodedPublicKey != userHexEncodedPublicKey {
                     processIncomingMessage(message)
                 } else {
diff --git a/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift b/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift
index 5dc1ca137..8366ffa76 100644
--- a/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift
+++ b/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift
@@ -162,7 +162,7 @@ public final class LokiGroupChatAPI : NSObject {
                     quote = nil
                 }
                 return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp, quote: quote)
-            }
+            }.sorted { $0.timestamp < $1.timestamp }
         }
     }