Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit d323853

Browse files
authored
add ?ts massaging for ASes (#2754)
blindly implement ?ts for AS. untested
1 parent b2da272 commit d323853

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

synapse/rest/client/v1/room.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,20 @@ def on_POST(self, request, room_id, event_type, txn_id=None):
195195
requester = yield self.auth.get_user_by_req(request, allow_guest=True)
196196
content = parse_json_object_from_request(request)
197197

198+
event_dict = {
199+
"type": event_type,
200+
"content": content,
201+
"room_id": room_id,
202+
"sender": requester.user.to_string(),
203+
}
204+
205+
if 'ts' in request.args and requester.app_service:
206+
event_dict['origin_server_ts'] = parse_integer(request, "ts", 0)
207+
198208
msg_handler = self.handlers.message_handler
199209
event = yield msg_handler.create_and_send_nonmember_event(
200210
requester,
201-
{
202-
"type": event_type,
203-
"content": content,
204-
"room_id": room_id,
205-
"sender": requester.user.to_string(),
206-
},
211+
event_dict,
207212
txn_id=txn_id,
208213
)
209214

0 commit comments

Comments
 (0)