summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-23 11:11:56 +0100
committerErik Johnston <erik@matrix.org>2015-10-23 11:11:56 +0100
commit259d10f0e4947f58e70998971b5d862a5ebe17d4 (patch)
tree89ecd1b19ed7668d502418e7fbf1310ed68afaba /synapse/handlers
parentMerge pull request #325 from matrix-org/markjh/filter_dicts (diff)
parentFix receipts for room initial sync (diff)
downloadsynapse-259d10f0e4947f58e70998971b5d862a5ebe17d4.tar.xz
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/receipts.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py

index 86c911c4bf..a47ae3df42 100644 --- a/synapse/handlers/receipts.py +++ b/synapse/handlers/receipts.py
@@ -156,13 +156,7 @@ class ReceiptsHandler(BaseHandler): if not result: defer.returnValue([]) - event = { - "type": "m.receipt", - "room_id": room_id, - "content": result, - } - - defer.returnValue([event]) + defer.returnValue(result) class ReceiptEventSource(object):