ircd:Ⓜ️:room::auth: Split out event::idx fetch tools; minor reorg.

include/ircd/m/room/auth.h

@@ -26,10 +26,12 @@ struct ircd::m::room::auth
 	using FAIL = AUTH_FAIL;
 
 	static bool is_power_event(const event &);
+	static std::array<event::idx, 5> relative_idx(const event &, const room &);
+	static std::array<event::idx, 4> static_idx(const event &);
 
 	static passfail check(const event &, hookdata &);
 	static passfail check(const event &, const vector_view<event::idx> &);
-	static passfail check(const event &, const room &);
+
 	static passfail check_static(const event &);
 	static passfail check_present(const event &);
 	static passfail check_relative(const event &);

matrix/room_auth.cc

@@ -142,7 +142,7 @@ ircd::m::room::auth::check(const event &event)
 
 	const bool check_relative
 	{
-		m::exists(event.event_id)
+		true
 	};
 
 	const bool check_present
@@ -208,12 +208,28 @@ try
 {
 	using json::at;
 
-	const m::room room
+	if(at<"type"_>(event) == "m.room.create")
+		return {true, {}};
+
+	if(!m::exists(event.event_id))
+		return {true, {}};
+
+	const auto &room_id
 	{
-		at<"room_id"_>(event), event.event_id
+		at<"room_id"_>(event)
 	};
 
-	return check(event, room);
+	const m::room room
+	{
+		room_id, event.event_id
+	};
+
+	const auto idxs
+	{
+		relative_idx(event, room)
+	};
+
+	return check(event, idxs);
 }
 catch(const ctx::interrupted &)
 {
@@ -250,7 +266,12 @@ try
 		at<"room_id"_>(event)
 	};
 
-	return check(event, room);
+	const auto idxs
+	{
+		relative_idx(event, room)
+	};
+
+	return check(event, idxs);
 }
 catch(const ctx::interrupted &)
 {
@@ -268,35 +289,12 @@ ircd::m::room::auth::passfail
 ircd::m::room::auth::check_static(const event &event)
 try
 {
-	using json::at;
+	const auto idx
-
-	const m::event::prev refs
 	{
-		event
+		static_idx(event)
 	};
 
-	const auto count
+	return check(event, idx);
-	{
-		refs.auth_events_count()
-	};
-
-	if(count > 4)
-		log::dwarning
-		{
-			"Event %s has an unexpected %zu auth_events references",
-			string_view{event.event_id},
-			count,
-		};
-
-	m::event::idx idx[4]
-	{
-		count > 0? m::index(refs.auth_event(0)): 0UL,
-		count > 1? m::index(refs.auth_event(1)): 0UL,
-		count > 2? m::index(refs.auth_event(2)): 0UL,
-		count > 3? m::index(refs.auth_event(3)): 0UL,
-	};
-
-	return check(event, vector_view<event::idx>{idx, count});
 }
 catch(const ctx::interrupted &)
 {
@@ -310,31 +308,6 @@ catch(const std::exception &)
 	};
 }
 
-ircd::m::room::auth::passfail
-ircd::m::room::auth::check(const event &event,
-                           const room &room)
-{
-	using json::at;
-
-	m::event::idx idx[5]
-	{
-		room.get(std::nothrow, "m.room.create", ""),
-		room.get(std::nothrow, "m.room.power_levels", ""),
-		room.get(std::nothrow, "m.room.member", at<"sender"_>(event)),
-
-		at<"type"_>(event) == "m.room.member" &&
-		(membership(event) == "join" || membership(event) == "invite")?
-			room.get(std::nothrow, "m.room.join_rules", ""): 0UL,
-
-		at<"type"_>(event) == "m.room.member" &&
-		at<"sender"_>(event) != json::get<"state_key"_>(event) &&
-		valid(m::id::USER, json::get<"state_key"_>(event))?
-			room.get(std::nothrow, "m.room.member", at<"state_key"_>(event)): 0UL,
-	};
-
-	return check(event, vector_view<event::idx>{idx, 5});
-}
-
 ircd::m::room::auth::passfail
 ircd::m::room::auth::check(const event &event,
                            const vector_view<event::idx> &idx)
@@ -580,6 +553,61 @@ ircd::m::check_room_auth_rule_9(const m::event &event,
 			};
 }
 
+std::array<ircd::m::event::idx, 4>
+ircd::m::room::auth::static_idx(const event &event)
+{
+	const m::event::prev refs
+	{
+		event
+	};
+
+	const auto count
+	{
+		refs.auth_events_count()
+	};
+
+	if(count > 4)
+		log::dwarning
+		{
+			"Event %s has an unexpected %zu auth_events references",
+			string_view{event.event_id},
+			count,
+		};
+
+	return
+	{
+		count > 0? m::index(refs.auth_event(0)): 0UL,
+		count > 1? m::index(refs.auth_event(1)): 0UL,
+		count > 2? m::index(refs.auth_event(2)): 0UL,
+		count > 3? m::index(refs.auth_event(3)): 0UL,
+	};
+}
+
+std::array<ircd::m::event::idx, 5>
+ircd::m::room::auth::relative_idx(const event &event,
+                                  const room &room)
+{
+	using json::at;
+
+	return
+	{
+		room.get(std::nothrow, "m.room.create", ""),
+
+		room.get(std::nothrow, "m.room.power_levels", ""),
+
+		room.get(std::nothrow, "m.room.member", at<"sender"_>(event)),
+
+		at<"type"_>(event) == "m.room.member" &&
+		(membership(event) == "join" || membership(event) == "invite")?
+			room.get(std::nothrow, "m.room.join_rules", ""): 0UL,
+
+		at<"type"_>(event) == "m.room.member" &&
+		at<"sender"_>(event) != json::get<"state_key"_>(event) &&
+		valid(m::id::USER, json::get<"state_key"_>(event))?
+			room.get(std::nothrow, "m.room.member", at<"state_key"_>(event)): 0UL,
+	};
+}
+
 bool
 ircd::m::room::auth::is_power_event(const m::event &event)
 {