diff options
| author | David Baker <dave@matrix.org> | 2017-04-26 11:31:55 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-04-26 11:31:55 +0100 |
| commit | 81804909d3a7c20330b2992cf1fed0672dd8f531 (patch) | |
| tree | a6849618c8e3d2e6eb8f7136c8055c5c4b3e10fb /synapse/storage/receipts.py | |
| parent | Fix get_json (diff) | |
| parent | document how to make IPv6 work (#2088) (diff) | |
| download | synapse-81804909d3a7c20330b2992cf1fed0672dd8f531.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error
Diffstat (limited to 'synapse/storage/receipts.py')
| -rw-r--r-- | synapse/storage/receipts.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py index 6b0f8c2787..efb90c3c91 100644 --- a/synapse/storage/receipts.py +++ b/synapse/storage/receipts.py @@ -47,10 +47,13 @@ class ReceiptsStore(SQLBaseStore): # Returns an ObservableDeferred res = self.get_users_with_read_receipts_in_room.cache.get((room_id,), None) - if res and res.called and user_id in res.result: - # We'd only be adding to the set, so no point invalidating if the - # user is already there - return + if res: + if isinstance(res, defer.Deferred) and res.called: + res = res.result + if user_id in res: + # We'd only be adding to the set, so no point invalidating if the + # user is already there + return self.get_users_with_read_receipts_in_room.invalidate((room_id,)) |