Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #784 from matrix-org/markjh/receipts_fix 

Allow receipts for events we haven't seen in the db
This commit is contained in:
Mark Haines 2016-05-13 15:55:26 +01:00
parent 99b5a2e560 b7381d5338
commit a8affd606e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/storage/receipts.py
View File

@ -249,9 +249,11 @@ class ReceiptsStore(SQLBaseStore):
table="events", table="events",
retcols=["topological_ordering", "stream_ordering"], retcols=["topological_ordering", "stream_ordering"],
keyvalues={"event_id": event_id}, keyvalues={"event_id": event_id},
allow_none=True
) )
topological_ordering = int(res["topological_ordering"])
stream_ordering = int(res["stream_ordering"]) topological_ordering = int(res["topological_ordering"]) if res else None
stream_ordering = int(res["stream_ordering"]) if res else None
# We don't want to clobber receipts for more recent events, so we # We don't want to clobber receipts for more recent events, so we
# have to compare orderings of existing receipts # have to compare orderings of existing receipts
@ -264,7 +266,7 @@ class ReceiptsStore(SQLBaseStore):
txn.execute(sql, (room_id, receipt_type, user_id)) txn.execute(sql, (room_id, receipt_type, user_id))
results = txn.fetchall() results = txn.fetchall()
if results: if results and topological_ordering:
for to, so, _ in results: for to, so, _ in results:
if int(to) > topological_ordering: if int(to) > topological_ordering:
return False return False
@ -294,7 +296,7 @@ class ReceiptsStore(SQLBaseStore):
} }
) )
if receipt_type == "m.read": if receipt_type == "m.read" and topological_ordering:
self._remove_push_actions_before_txn( self._remove_push_actions_before_txn(
txn, txn,
room_id=room_id, room_id=room_id,