ircd:Ⓜ️ Move user activation definition into client/accounts near is_active().

ircd/m/m.cc

@@ -350,7 +350,7 @@ ircd::m::user::activate(const json::members &contents)
 
 	static import<prototype> function
 	{
-		"client_register", "register__user"
+		"client_account", "activate__user"
 	};
 
 	return function(*this, contents);

modules/client/account/account.cc

@@ -12,6 +12,9 @@
 
 using namespace ircd;
 
+extern "C" bool is_active__user(const m::user &user);
+extern "C" m::event::id::buf activate__user(const m::user &user, const json::members &contents);
+
 mapi::header
 IRCD_MODULE
 {
@@ -27,7 +30,34 @@ account_resource
 	}
 };
 
-extern "C" bool
+m::event::id::buf
+activate__user(const m::user &user,
+               const json::members &contents)
+{
+	//TODO: ABA
+	if(is_active__user(user))
+		throw m::error
+		{
+			http::CONFLICT, "M_USER_IN_USE",
+			"The desired user ID is already in use."
+		};
+
+	const m::room::id::buf user_room_id
+	{
+		user.room_id()
+	};
+
+	//TODO: ABA
+	m::room user_room
+	{
+		create(user_room_id, m::me.user_id, "user")
+	};
+
+	//TODO: ABA
+	return send(user.users, m::me.user_id, "ircd.user", user.user_id, contents);
+}
+
+bool
 is_active__user(const m::user &user)
 {
 	bool ret{false};

modules/client/register.cc

@@ -16,7 +16,6 @@ IRCD_MODULE
 	"Client 3.4.1 :Register"
 };
 
-extern "C" m::event::id::buf register__user(const m::user &user, const json::members &contents);
 static void validate_user_id(const m::id::user &user_id);
 static void validate_password(const string_view &password);
 
@@ -103,16 +102,20 @@ try
 	// for this user in the form of !@user:host and set a key in !users:host
 	// If the user_id is taken this throws 409 Conflict because those assets
 	// will already exist; otherwise the user is registered after this call.
-	user.activate(
+	user.activate();
-	{
-		{ "bind_email", bind_email },
-	});
 
 	// Set the password for the account. This issues an ircd.password state
 	// event to the user's room. User will be able to login with
 	// m.login.password
 	user.password(password);
 
+	// Store the options from registration.
+	m::user::room user_room{user};
+	send(user_room, user.user_id, "ircd.account.options", "registration",
+	{
+		{ "bind_email", bind_email },
+	});
+
 	char access_token_buf[32];
 	const string_view access_token
 	{
@@ -242,43 +245,6 @@ validate_password(const string_view &password)
 		};
 }
 
-/// Register the user by creating a room !@user:myhost and then setting a
-/// an `ircd.account` state event in the `users` room.
-///
-/// Each of the registration options becomes a key'ed state event in the
-/// user's room.
-///
-/// Once this call completes the registration was successful; otherwise
-/// throws.
-m::event::id::buf
-register__user(const m::user &user,
-               const json::members &contents)
-try
-{
-	const m::room::id::buf user_room_id
-	{
-		user.room_id()
-	};
-
-	m::room user_room
-	{
-		create(user_room_id, m::me.user_id, "user")
-	};
-
-	send(user_room, user.user_id, "ircd.account.options", "registration", contents);
-	return send(user.users, m::me.user_id, "ircd.user", user.user_id,
-	{
-		{ "active", true }
-	});
-}
-catch(const m::ALREADY_MEMBER &e)
-{
-	throw m::error
-	{
-		http::CONFLICT, "M_USER_IN_USE", "The desired user ID is already in use."
-	};
-}
-
 static void _first_user_registered(const m::event &event);
 
 const m::hook