summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:30:17 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:30:17 -0500
commit287c81abf3c5b4bc01b4bf9c415b8ed939413c41 (patch)
tree013f1ce57cdaae78ae6d0ddf0ef7593ff63de5fa /synapse/rest
parentPreserve version string in user agent (diff)
parentExplicitly add Create event as auth event (diff)
downloadsynapse-287c81abf3c5b4bc01b4bf9c415b8ed939413c41.tar.xz
Merge branch 'develop' into daniel/useragent
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/receipts.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/receipts.py b/synapse/rest/client/v2_alpha/receipts.py
index 52e99f54d5..b107b7ce17 100644
--- a/synapse/rest/client/v2_alpha/receipts.py
+++ b/synapse/rest/client/v2_alpha/receipts.py
@@ -15,6 +15,7 @@
 
 from twisted.internet import defer
 
+from synapse.api.errors import SynapseError
 from synapse.http.servlet import RestServlet
 from ._base import client_v2_pattern
 
@@ -41,6 +42,9 @@ class ReceiptRestServlet(RestServlet):
     def on_POST(self, request, room_id, receipt_type, event_id):
         user, _ = yield self.auth.get_user_by_req(request)
 
+        if receipt_type != "m.read":
+            raise SynapseError(400, "Receipt type must be 'm.read'")
+
         yield self.receipts_handler.received_client_receipt(
             room_id,
             receipt_type,