Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-07-31 23:18:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'client_v2_filter' into client_v2_sync

Browse source 
Conflicts:
	synapse/rest/client/v2_alpha/__init__.py
This commit is contained in:
Mark Haines 2015-01-29 14:58:00 +00:00
commit 396a67a09a
15 changed files with 1100 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/storage/stream.py
View file

@ -82,10 +82,10 @@ class _StreamToken(namedtuple("_StreamToken", "topological stream")):
def parse(cls, string):
try:
if string[0] == 's':
return cls(None, int(string[1:]))
return cls(topological=None, stream=int(string[1:]))
if string[0] == 't':
parts = string[1:].split('-', 1)
return cls(int(parts[1]), int(parts[0]))
return cls(topological=int(parts[0]), stream=int(parts[1]))
except:
pass
raise SynapseError(400, "Invalid token %r" % (string,))
@ -94,7 +94,7 @@ class _StreamToken(namedtuple("_StreamToken", "topological stream")):
def parse_stream_token(cls, string):
try:
if string[0] == 's':
return cls(None, int(string[1:]))
return cls(topological=None, stream=int(string[1:]))
except:
pass
raise SynapseError(400, "Invalid token %r" % (string,))