summary refs log tree commit diff
path: root/synapse/types.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-12 10:55:42 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-12 10:55:42 +0100
commit7b49236b3707a20042103cb07ac331c7e4ccde0c (patch)
treeeb1dd5bd1725e3b9e22a96f0c077627ad6ad131f /synapse/types.py
parentMerge pull request #182 from matrix-org/manu/fix_no_rate_limit_in_federation_... (diff)
parentAdd missing space because linter (diff)
downloadsynapse-7b49236b3707a20042103cb07ac331c7e4ccde0c.tar.xz
Merge pull request #216 from matrix-org/auth
Clean up some docs and redundant fluff
Diffstat (limited to 'synapse/types.py')
-rw-r--r--synapse/types.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/types.py b/synapse/types.py

index dd1b10d646..e190374cbd 100644 --- a/synapse/types.py +++ b/synapse/types.py
@@ -178,7 +178,7 @@ class RoomStreamToken(namedtuple("_StreamToken", "topological stream")): Live tokens start with an "s" followed by the "stream_ordering" id of the event it comes after. Historic tokens start with a "t" followed by the - "topological_ordering" id of the event it comes after, follewed by "-", + "topological_ordering" id of the event it comes after, followed by "-", followed by the "stream_ordering" id of the event it comes after. """ __slots__ = [] @@ -211,4 +211,5 @@ class RoomStreamToken(namedtuple("_StreamToken", "topological stream")): return "s%d" % (self.stream,) +# token_id is the primary key ID of the access token, not the access token itself. ClientInfo = namedtuple("ClientInfo", ("device_id", "token_id"))