From 2915830f0e848d87bf747cc9f7eddb75f1c5bc19 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Sat, 15 Sep 2018 14:02:06 +0300
Subject: [PATCH] Simplify leave command

---
 modules/console.cc | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/modules/console.cc b/modules/console.cc
index fe8a04fde..7bbc786e7 100644
--- a/modules/console.cc
+++ b/modules/console.cc
@@ -5624,41 +5624,32 @@ console_cmd__room__join(opt &out, const string_view &line)
 bool
 console_cmd__room__leave(opt &out, const string_view &line)
 {
-	const string_view room_id_or_alias
+	const params param{line, " ",
 	{
-		token(line, ' ', 0)
+		"room_id_or_alias", "user_id"
+	}};
+
+	const m::room::id::buf room_id
+	{
+		m::room_id(param.at("room_id_or_alias"))
 	};
 
-	const m::user::id &user_id
+	const m::user::id::buf user_id
 	{
-		token(line, ' ', 1)
+		param.at("user_id")
 	};
 
-	switch(m::sigil(room_id_or_alias))
+	const m::room room
 	{
-		case m::id::ROOM:
-		case m::id::ROOM_ALIAS:
-		{
-			const m::room room
-			{
-				m::room_id(room_id_or_alias)
-			};
+		room_id
+	};
 
-			const auto leave_event
-			{
-				m::leave(room, user_id)
-			};
-
-			out << leave_event << std::endl;
-			return true;
-		}
-
-		default: throw error
-		{
-			"Don't know how to leave '%s'", room_id_or_alias
-		};
-	}
+	const auto leave_event_id
+	{
+		m::leave(room, user_id)
+	};
 
+	out << leave_event_id << std::endl;
 	return true;
 }