Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-24 20:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3235 from matrix-org/rav/fix_receipts_deferred

Browse Source 
Fix error in handling receipts
This commit is contained in:
Richard van der Hoff 2018-05-18 11:23:11 +01:00 committed by GitHub
commit ed3125b0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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