From e594063e0c356d21f93b51396d0c616be8bbc4f6 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 26 Feb 2018 04:32:25 -0800
Subject: [PATCH] modules/client/join: Determine and route room_id_or_sigil
 appropriately.

---
 modules/client/join.cc | 71 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 9 deletions(-)

diff --git a/modules/client/join.cc b/modules/client/join.cc
index e6264220c..8f85e785d 100644
--- a/modules/client/join.cc
+++ b/modules/client/join.cc
@@ -26,6 +26,16 @@ join_resource
 	}
 };
 
+static resource::response
+_post__join(client &client,
+            const resource::request &request,
+            const m::room::id &room_id);
+
+static resource::response
+_post__join(client &client,
+            const resource::request &request,
+            const m::room::alias &room_alias);
+
 resource::response
 post__join(client &client,
            const resource::request &request)
@@ -33,15 +43,50 @@ post__join(client &client,
 	if(request.parv.size() < 1)
 		throw http::error
 		{
-			http::MULTIPLE_CHOICES, "/join room_id required"
+			http::MULTIPLE_CHOICES, "/join room_id or room_alias required"
 		};
 
-	m::room::id::buf room_id
+	char idbuf[256];
+	const auto &id
 	{
-		url::decode(request.parv[0], room_id)
+		url::decode(request.parv[0], idbuf)
 	};
 
-	m::join(room_id, request.user_id);
+	switch(m::sigil(id))
+	{
+		case m::id::ROOM:
+			return _post__join(client, request, m::room::id{id});
+
+		case m::id::ROOM_ALIAS:
+			return _post__join(client, request, m::room::alias{id});
+
+		default: throw m::UNSUPPORTED
+		{
+			"Cannot join a room using a '%s' MXID", reflect(m::sigil(id))
+		};
+	}
+}
+
+resource::method
+method_post
+{
+	join_resource, "POST", post__join,
+	{
+		method_post.REQUIRES_AUTH
+	}
+};
+
+static resource::response
+_post__join(client &client,
+            const resource::request &request,
+            const m::room::alias &room_alias)
+{
+	throw m::NOT_FOUND{}; //TODO: X
+
+	const m::room::id room_id
+	{
+
+	};
 
 	return resource::response
 	{
@@ -52,10 +97,18 @@ post__join(client &client,
 	};
 }
 
-resource::method method_post
+static resource::response
+_post__join(client &client,
+            const resource::request &request,
+            const m::room::id &room_id)
 {
-	join_resource, "POST", post__join,
+	m::join(room_id, request.user_id);
+
+	return resource::response
 	{
-		method_post.REQUIRES_AUTH
-	}
-};
+		client, json::members
+		{
+			{ "room_id", room_id }
+		}
+	};
+}