summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-01-07 23:08:54 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-01-07 23:08:54 +0000
commit5ea4d5d38a7551fb8087a14e8bcb7e6eed1a2967 (patch)
treeb84f76b6fa521ddbcfe4b82a9ec17fe8d9c68d34
parententirely blindly implement ?ts for AS. untested (diff)
downloadsynapse-github/matthew/as_ts.tar.xz
-rw-r--r--synapse/rest/client/v1/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 19a317930f..3e33f49478 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -202,7 +202,7 @@ class RoomSendEventRestServlet(ClientV1RestServlet):
             "sender": requester.user.to_string(),
         }
 
-        if request.args['ts'] and requester.app_service:
+        if 'ts' in request.args and requester.app_service:
             event_dict['origin_server_ts'] = parse_integer(request, "ts", 0)
 
         msg_handler = self.handlers.message_handler