summary refs log tree commit diff
path: root/synapse/storage/presence.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 17:32:09 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 17:32:09 +0100
commitffc30b8f60995ed515bcb87eb480a79be143f0d0 (patch)
treebc873f6e36b2a1b51f7d1472f5ed546cd43bdd1f /synapse/storage/presence.py
parentMerge pull request #5924 from matrix-org/rei/rss_inc6 (diff)
parentRevert "Add m.id_access_token flag (#5930)" (#5945) (diff)
downloadsynapse-ffc30b8f60995ed515bcb87eb480a79be143f0d0.tar.xz
Merge branch 'develop' into rei/rss_target
Diffstat (limited to 'synapse/storage/presence.py')
-rw-r--r--synapse/storage/presence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py

index 1a0f2d5768..5db6f2d84a 100644 --- a/synapse/storage/presence.py +++ b/synapse/storage/presence.py
@@ -90,7 +90,7 @@ class PresenceStore(SQLBaseStore): presence_states, ) - return (stream_orderings[-1], self._presence_id_gen.get_current_token()) + return stream_orderings[-1], self._presence_id_gen.get_current_token() def _update_presence_txn(self, txn, stream_orderings, presence_states): for stream_id, state in zip(stream_orderings, presence_states):