summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-02 14:11:14 +0000
committerErik Johnston <erik@matrix.org>2016-02-02 14:11:14 +0000
commitb023995538ae2ed13934638009463abcbae08f92 (patch)
treea55c472f633ef2b9c4e5e1bfe1def6bab1a70b79
parentMerge pull request #547 from matrix-org/dbkr/fix_guest_upgrade (diff)
downloadsynapse-b023995538ae2ed13934638009463abcbae08f92.tar.xz
WARN if we get a topo token instead of stream.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index a71cba8ef1..68e2c75a48 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -18,7 +18,7 @@ from twisted.internet import defer
 
 from ._base import BaseHandler
 
-from synapse.types import UserID, RoomAlias, RoomID
+from synapse.types import UserID, RoomAlias, RoomID, RoomStreamToken
 from synapse.api.constants import (
     EventTypes, Membership, JoinRules, RoomCreationPreset,
 )
@@ -997,6 +997,11 @@ class RoomEventSource(object):
 
         to_key = yield self.get_current_key()
 
+        from_token = RoomStreamToken.parse(from_key)
+        if from_token.topological:
+            logger.warn("Stream has topological part!!!! %r", from_key)
+            from_key = "s%s" % (from_token.stream,)
+
         app_service = yield self.store.get_app_service_by_user_id(
             user.to_string()
         )