From bbdced9c90a911121ac310aef27b9478d5f7189d Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Sat, 4 May 2024 21:09:22 +0000
Subject: [PATCH] Fix appservice namespace check for room aliases

Only normal users should be prevented from creating an alias within an
exclusive namespace, not the appservice itself. This mirrors the
behaviour in api/client_server/room.rs on room creation.
---
 src/api/client_server/alias.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/api/client_server/alias.rs b/src/api/client_server/alias.rs
index b9008d63..821fa0c2 100644
--- a/src/api/client_server/alias.rs
+++ b/src/api/client_server/alias.rs
@@ -269,9 +269,7 @@ async fn alias_checks(room_alias: &OwnedRoomAliasId, appservice_info: &Option<Re
 		if !info.aliases.is_match(room_alias.as_str()) {
 			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
 		}
-	}
-
-	if services().appservice.is_exclusive_alias(room_alias).await {
+	} else if services().appservice.is_exclusive_alias(room_alias).await {
 		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
 	}