From 641399e900936ecfbece9e05883e63227639b0d5 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Tue, 16 Apr 2024 19:22:58 -0400
Subject: [PATCH] dont auto join rooms if registrations are from appservices

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 src/api/client_server/account.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/client_server/account.rs b/src/api/client_server/account.rs
index dd81480d..9c00c36f 100644
--- a/src/api/client_server/account.rs
+++ b/src/api/client_server/account.rs
@@ -339,8 +339,9 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 		}
 	}
 
-	if !services().globals.config.auto_join_rooms.is_empty() && !is_guest
-		|| (services().globals.allow_guests_auto_join_rooms() && is_guest)
+	if !body.from_appservice
+		&& !services().globals.config.auto_join_rooms.is_empty()
+		&& (services().globals.allow_guests_auto_join_rooms() || !is_guest)
 	{
 		for room in &services().globals.config.auto_join_rooms {
 			if !services()