From cdac039658bfafb8a9199c427a4140cd67b50cec Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 8 Mar 2019 10:07:17 -0800
Subject: [PATCH] modules/client/rooms/leave: Simplify leave endpoint handler.

---
 modules/client/rooms/leave.cc | 39 ++++++++++++++---------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/modules/client/rooms/leave.cc b/modules/client/rooms/leave.cc
index 11804dd7a..8f936fdf6 100644
--- a/modules/client/rooms/leave.cc
+++ b/modules/client/rooms/leave.cc
@@ -13,36 +13,29 @@
 using namespace ircd::m;
 using namespace ircd;
 
-extern "C" event::id::buf
-leave__room_user(const room &room,
-                 const id::user &user_id);
-
 resource::response
 post__leave(client &client,
             const resource::request &request,
             const room::id &room_id)
 {
-	leave__room_user(room_id, request.user_id);
+	const m::room room
+	{
+		room_id
+	};
+
+	const auto event_id
+	{
+		send(room, request.user_id, "m.room.member", request.user_id,
+		{
+			{ "membership", "leave" }
+		})
+	};
 
 	return resource::response
 	{
-		client, http::OK
+		client, http::OK, json::members
+		{
+			{ "event_id", event_id }
+		}
 	};
 }
-
-event::id::buf
-leave__room_user(const room &room,
-                 const id::user &user_id)
-{
-	json::iov event;
-	json::iov content;
-	const json::iov::push push[]
-	{
-		{ event,    { "type",        "m.room.member"  }},
-		{ event,    { "sender",      user_id          }},
-		{ event,    { "state_key",   user_id          }},
-		{ content,  { "membership",  "leave"          }},
-	};
-
-	return commit(room, event, content);
-}