From 841d53716865e4eb02ad41ab17eaaac69100a3d7 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Sun, 9 Dec 2018 00:48:43 -0800 Subject: [PATCH] Fix duplicate events. I'm not sure why they show up twice, but oh well. --- src/Scylla/Sync.elm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Scylla/Sync.elm b/src/Scylla/Sync.elm index 6217df2..3f916fe 100644 --- a/src/Scylla/Sync.elm +++ b/src/Scylla/Sync.elm @@ -278,10 +278,10 @@ mergeEvents : List Event -> List Event -> List Event mergeEvents l1 l2 = l1 ++ l2 mergeStateEvents : List StateEvent -> List StateEvent -> List StateEvent -mergeStateEvents l1 l2 = l1 ++ l2 +mergeStateEvents l1 l2 = uniqueBy .eventId <| l1 ++ l2 mergeRoomEvents : List RoomEvent -> List RoomEvent -> List RoomEvent -mergeRoomEvents l1 l2 = l1 ++ l2 +mergeRoomEvents l1 l2 = uniqueBy .eventId <| l1 ++ l2 mergeStrippedStates : List StrippedState -> List StrippedState -> List StrippedState mergeStrippedStates l1 l2 = l1 ++ l2