diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-04-01 13:29:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-04-01 13:29:05 +0100 |
| commit | e36bfbab38def70e0fcc1bafcecb6e666dbbc1ad (patch) | |
| tree | 6877f36d3097d5199a0dcd2eb32a7c48c0a5256c /synapse/storage/presence.py | |
| parent | Merge pull request #680 from matrix-org/markjh/remove_is_new_state (diff) | |
| download | synapse-e36bfbab38def70e0fcc1bafcecb6e666dbbc1ad.tar.xz | |
Use a stream id generator for backfilled ids
Diffstat (limited to 'synapse/storage/presence.py')
| -rw-r--r-- | synapse/storage/presence.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py index 4cec31e316..59b4ef5ce6 100644 --- a/synapse/storage/presence.py +++ b/synapse/storage/presence.py @@ -68,7 +68,9 @@ class PresenceStore(SQLBaseStore): self._update_presence_txn, stream_orderings, presence_states, ) - defer.returnValue((stream_orderings[-1], self._presence_id_gen.get_max_token())) + defer.returnValue(( + 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): @@ -155,7 +157,7 @@ class PresenceStore(SQLBaseStore): defer.returnValue([UserPresenceState(**row) for row in rows]) def get_current_presence_token(self): - return self._presence_id_gen.get_max_token() + return self._presence_id_gen.get_current_token() def allow_presence_visible(self, observed_localpart, observer_userid): return self._simple_insert( |