From 4b31426a02d32b26b97bd04328426df1666f756d Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 23 Aug 2016 16:32:04 +0100
Subject: Pass through user-supplied content in /join/$room_id

It was always intended to allow custom keys on the join event, but this has
at some point been lost. Restore it.

If the user specifies keys like "avatar_url" then they will be clobbered.
---
 synapse/rest/client/v1/room.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'synapse/rest/client/v1/room.py')

diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 89c3895118..0d81757010 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -268,6 +268,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet):
             action="join",
             txn_id=txn_id,
             remote_room_hosts=remote_room_hosts,
+            content=content,
             third_party_signed=content.get("third_party_signed", None),
         )
 
-- 
cgit 1.4.1