Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-24 09:09:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in handling receipts

Browse Source 
Fixes an error which has been happening ever since #2158 (v0.21.0-rc1):

> TypeError: argument of type 'ObservableDeferred' is not iterable

fixes #3234
This commit is contained in:
Richard van der Hoff 2018-05-18 09:15:35 +01:00
parent f8a1e76d64
commit 8b1c856d81
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/storage/receipts.py
View File

@ -297,15 +297,19 @@ class ReceiptsWorkerStore(SQLBaseStore):
if receipt_type != "m.read": if receipt_type != "m.read":
return return
# Returns an ObservableDeferred # Returns either an ObservableDeferred or the raw result
res = self.get_users_with_read_receipts_in_room.cache.get( res = self.get_users_with_read_receipts_in_room.cache.get(
room_id, None, update_metrics=False, room_id, None, update_metrics=False,
) )
if res: # first handle the Deferred case
if isinstance(res, defer.Deferred) and res.called: if isinstance(res, defer.Deferred):
if res.called:
res = res.result res = res.result
if user_id in res: else:
res = None
if res and user_id in res:
# We'd only be adding to the set, so no point invalidating if the # We'd only be adding to the set, so no point invalidating if the
# user is already there # user is already there
return return