From 5303e170d300152bf293df96cd3d7d9b4931bdbb Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 26 Mar 2023 20:55:09 -0700
Subject: [PATCH] modules/console: Add remote arg, use params for join cmd.

---
 modules/console.cc | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/modules/console.cc b/modules/console.cc
index bc775f4ea..ff1e455d2 100644
--- a/modules/console.cc
+++ b/modules/console.cc
@@ -12342,19 +12342,34 @@ console_cmd__room__msghtml(opt &out, const string_view &line)
 bool
 console_cmd__room__join(opt &out, const string_view &line)
 {
+	const params param{line, " ",
+	{
+		"room_id", "user_id", "remote", "event_id"
+	}};
+
 	const string_view room_id_or_alias
 	{
-		token(line, ' ', 0)
+		param.at("room_id")
 	};
 
-	const m::user::id &user_id
+	const m::user::id user_id
 	{
-		token(line, ' ', 1)
+		param.at("user_id")
 	};
 
-	const string_view &event_id
+	const string_view event_id
 	{
-		token(line, ' ', 2, {})
+		param["event_id"]
+	};
+
+	const string_view remote
+	{
+		param["remote"]
+	};
+
+	const vector_view<const string_view> remotes
+	{
+		&remote, 1
 	};
 
 	switch(m::sigil(room_id_or_alias))
@@ -12368,7 +12383,7 @@ console_cmd__room__join(opt &out, const string_view &line)
 
 			const auto join_event
 			{
-				m::join(room, user_id)
+				m::join(room, user_id, remotes)
 			};
 
 			out << join_event << std::endl;