diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 28c674730e..c73eec2b91 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -36,10 +36,6 @@ def stopped_user_eventstream(distributor, user):
return distributor.fire("stopped_user_eventstream", user)
-def user_joined_room(distributor, user, room_id):
- return distributor.fire("user_joined_room", user, room_id)
-
-
class EventStreamHandler(BaseHandler):
def __init__(self, hs):
@@ -136,9 +132,6 @@ class EventStreamHandler(BaseHandler):
# thundering herds on restart.
timeout = random.randint(int(timeout*0.9), int(timeout*1.1))
- if is_guest:
- yield user_joined_room(self.distributor, auth_user, room_id)
-
events, tokens = yield self.notifier.get_events_for(
auth_user, pagin_config, timeout,
only_room_events=only_room_events,
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 27fdbe28ee..33c1a4512c 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -585,7 +585,8 @@ class SyncHandler(BaseHandler):
sync_config, leave_event, since_token, tags_by_room,
account_data_by_room
)
- archived.append(room_sync)
+ if room_sync:
+ archived.append(room_sync)
invited = [
InvitedSyncResult(room_id=event.room_id, invite=event)
@@ -726,6 +727,9 @@ class SyncHandler(BaseHandler):
leave_token = since_token.copy_and_replace("room_key", stream_token)
+ if since_token.is_after(leave_token):
+ defer.returnValue(None)
+
batch = yield self.load_filtered_recents(
leave_event.room_id, sync_config, leave_token, since_token,
)
|
