diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-18 11:14:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-18 11:14:57 +0100 |
| commit | 1c2caacd67d5c00fe96c302749e30da3dc4a213f (patch) | |
| tree | 4ce4c26aeef0ef31471ce238cbae91e7225bccb1 /synapse/storage | |
| parent | Change the MemoryDataStore to implement new storage api (diff) | |
| parent | webclient: Tweak namespace of auto-complete directive. ng- should really only... (diff) | |
| download | synapse-1c2caacd67d5c00fe96c302749e30da3dc4a213f.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/presence.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py index 23b6d1694e..a529104f4d 100644 --- a/synapse/storage/presence.py +++ b/synapse/storage/presence.py @@ -67,6 +67,7 @@ class PresenceStore(SQLBaseStore): table="presence_allow_inbound", keyvalues={"observed_user_id": observed_localpart, "observer_user_id": observer_userid}, + retcols=["observed_user_id"], allow_none=True, ) |