summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-03 13:08:17 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-03 13:08:17 +0100
commitcd0afb85c42aa7d550a61661547a6e7131c83f3d (patch)
treee745b2e03c20b6a1190061d4e023192d8e4c05aa
parentapidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in i... (diff)
downloadsynapse-cd0afb85c42aa7d550a61661547a6e7131c83f3d.tar.xz
Updated feedback api docs and fixed feedback content template bug
-rw-r--r--docs/client-server/swagger_matrix/api-docs-rooms10
-rw-r--r--synapse/api/events/room.py3
2 files changed, 11 insertions, 2 deletions
diff --git a/docs/client-server/swagger_matrix/api-docs-rooms b/docs/client-server/swagger_matrix/api-docs-rooms

index 7d1aeb837f..3638e44e8c 100644 --- a/docs/client-server/swagger_matrix/api-docs-rooms +++ b/docs/client-server/swagger_matrix/api-docs-rooms
@@ -640,6 +640,16 @@ "Feedback": { "id": "Feedback", "properties": { + "target_event_id": { + "type": "string", + "description": "The event ID being acknowledged.", + "required": true + }, + "type": { + "type": "string", + "description": "The type of feedback. Either 'delivered' or 'read'.", + "required": true + } } }, "Member": { diff --git a/synapse/api/events/room.py b/synapse/api/events/room.py
index f6d3c59a9a..e4a99ff216 100644 --- a/synapse/api/events/room.py +++ b/synapse/api/events/room.py
@@ -103,8 +103,7 @@ class FeedbackEvent(SynapseEvent): def get_content_template(self): return { "type": u"string", - "target_event_id": u"string", - "msg_sender_id": u"string" + "target_event_id": u"string" }