From 7a76f4961af67b3b45bbb0b45fe2f8db23aabbc4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 8 Sep 2020 12:28:22 +0100
Subject: [PATCH] notify new streampos after joining peeked rooms

---
 syncapi/consumers/roomserver.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index 8e2feaf2..a846b87d 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -166,14 +166,15 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent(
 		}).Panicf("roomserver output log: write event failure")
 		return nil
 	}
+
+	if pduPos, err = s.notifyJoinedPeeks(ctx, &ev, pduPos); err != nil {
+		return err
+	}
+
 	s.notifier.OnNewEvent(&ev, "", nil, types.NewStreamToken(pduPos, 0, nil))
 
 	s.notifyKeyChanges(&ev)
 
-	if err = s.notifyJoinedPeeks(ctx, &ev); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -192,30 +193,30 @@ func (s *OutputRoomEventConsumer) notifyKeyChanges(ev *gomatrixserverlib.Headere
 	}
 }
 
-func (s *OutputRoomEventConsumer) notifyJoinedPeeks(ctx context.Context, ev *gomatrixserverlib.HeaderedEvent) (error) {
+func (s *OutputRoomEventConsumer) notifyJoinedPeeks(ctx context.Context, ev *gomatrixserverlib.HeaderedEvent, sp types.StreamPosition) (types.StreamPosition, error) {
 	membership, err := ev.Membership()
 	if err != nil {
-		return nil
+		return sp, err
 	}
 	// TODO: check that it's a join and not a profile change (means unmarshalling prev_content)
 	if membership == gomatrixserverlib.Join {
 		// check it's a local join
 		_, domain, err := gomatrixserverlib.SplitID('@', *ev.StateKey())
 		if err != nil {
-			return err
+			return sp, err
 		}
 		if domain != s.cfg.Matrix.ServerName {
-			return nil
+			return sp, nil
 		}
 
 		// cancel any peeks for it
-		_, err = s.db.DeletePeeks(ctx, ev.RoomID(), *ev.StateKey())
+		sp, err = s.db.DeletePeeks(ctx, ev.RoomID(), *ev.StateKey())
 		// XXX: should we do anything with this new streampos?
 		if err != nil {
-			return err
+			return sp, err
 		}
 	}
-	return nil
+	return sp, nil
 }
 
 func (s *OutputRoomEventConsumer) onNewInviteEvent(