From ce6b4496b3eaa11284a64416deaa19843022fc8e Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 24 Feb 2023 17:23:37 -0800
Subject: [PATCH] modules/federation/make_join: Check visibility only for
 non-public rooms.

---
 modules/federation/make_join.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/federation/make_join.cc b/modules/federation/make_join.cc
index 45310fe46..79426ad74 100644
--- a/modules/federation/make_join.cc
+++ b/modules/federation/make_join.cc
@@ -93,7 +93,7 @@ get__make_join(client &client,
 			"You are not permitted by the room's server access control list."
 		};
 
-	if(!visible(room, user_id))
+	if(!join_rule(room, "public") && !visible(room, user_id))
 		throw m::ACCESS_DENIED
 		{
 			"You are not permitted to view the room at this event."