From 1b5642604b9e5c662506d0bd2608d867287b6dfb Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 5 Jan 2016 11:56:21 +0000
Subject: [PATCH 1/2] Support inviting 3pids in /createRoom

---
 synapse/handlers/room.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 13f66e0df0..2bdc768199 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -115,6 +115,8 @@ class RoomCreationHandler(BaseHandler):
             except:
                 raise SynapseError(400, "Invalid user_id: %s" % (i,))
 
+        invite_3pid_list = config.get("invite_3pid", [])
+
         is_public = config.get("visibility", None) == "public"
 
         if room_id:
@@ -220,6 +222,20 @@ class RoomCreationHandler(BaseHandler):
                 "content": {"membership": Membership.INVITE},
             }, ratelimit=False)
 
+        for invite_3pid in invite_3pid_list:
+            id_server = invite_3pid["id_server"]
+            address = invite_3pid["address"]
+            medium = invite_3pid["medium"]
+            yield self.hs.get_handlers().room_member_handler.do_3pid_invite(
+                room_id,
+                user,
+                medium,
+                address,
+                id_server,
+                None,
+                None,
+            )
+
         result = {"room_id": room_id}
 
         if room_alias:

From c3ea36304bef9dc643e28d1aa9cd91d99f4434d9 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 5 Jan 2016 12:57:45 +0000
Subject: [PATCH 2/2] Use named args

---
 synapse/handlers/room.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 2bdc768199..0cfeda10d8 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -232,8 +232,8 @@ class RoomCreationHandler(BaseHandler):
                 medium,
                 address,
                 id_server,
-                None,
-                None,
+                token_id=None,
+                txn_id=None,
             )
 
         result = {"room_id": room_id}