diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
| commit | e66d0bd03abc75b5a0445acadc776ba23e1090ba (patch) | |
| tree | d73f7c0c2621a27c1637223213a930e40140728d /synapse/storage/presence.py | |
| parent | Update CHANGES (diff) | |
| parent | Merge pull request #569 from matrix-org/erikj/initial_sync (diff) | |
| download | synapse-e66d0bd03abc75b5a0445acadc776ba23e1090ba.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
Diffstat (limited to 'synapse/storage/presence.py')
| -rw-r--r-- | synapse/storage/presence.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py index 9b3aecaf8c..ef525f34c5 100644 --- a/synapse/storage/presence.py +++ b/synapse/storage/presence.py @@ -68,8 +68,9 @@ class PresenceStore(SQLBaseStore): for row in rows }) + @defer.inlineCallbacks def set_presence_state(self, user_localpart, new_state): - res = self._simple_update_one( + res = yield self._simple_update_one( table="presence", keyvalues={"user_id": user_localpart}, updatevalues={"state": new_state["state"], @@ -79,7 +80,7 @@ class PresenceStore(SQLBaseStore): ) self.get_presence_state.invalidate((user_localpart,)) - return res + defer.returnValue(res) def allow_presence_visible(self, observed_localpart, observer_userid): return self._simple_insert( |