summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-26 10:51:08 +0100
committerErik Johnston <erik@matrix.org>2015-08-26 10:51:08 +0100
commitf4d552589e3cb815144dea646140db66d845a237 (patch)
tree4593604c2d7079d636f399979327edbbbf9c644b
parentBump changelog and version (diff)
downloadsynapse-f4d552589e3cb815144dea646140db66d845a237.tar.xz
Don't loop over all rooms ever in typing.get_new_events_for_user
-rw-r--r--synapse/handlers/typing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index 026bd2b9d4..1ed220d871 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -260,8 +260,8 @@ class TypingNotificationEventSource(object):
         )
 
         events = []
-        for room_id in handler._room_serials:
-            if room_id not in joined_room_ids:
+        for room_id in joined_room_ids:
+            if room_id not in handler._room_serials:
                 continue
             if handler._room_serials[room_id] <= from_key:
                 continue