From a0fa0ee7a0da0cddf5471ededf19330bab56ee5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Thu, 18 Mar 2021 12:03:15 +0100
Subject: [PATCH] fix: join appservice room with alias

---
 src/client_server/alias.rs | 20 ++++++++++++++++----
 src/database/rooms.rs      | 24 ++++++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/client_server/alias.rs b/src/client_server/alias.rs
index 03d49093..07b49773 100644
--- a/src/client_server/alias.rs
+++ b/src/client_server/alias.rs
@@ -90,11 +90,23 @@ pub async fn get_alias_helper(
                 let aliases = registration
                     .get("namespaces")
                     .and_then(|ns| ns.get("aliases"))
-                    .and_then(|users| users.get("regex"))
-                    .and_then(|regex| regex.as_str())
-                    .and_then(|regex| Regex::new(regex).ok());
+                    .and_then(|aliases| aliases.as_sequence())
+                    .map_or_else(Vec::new, |aliases| {
+                        aliases
+                            .iter()
+                            .map(|aliases| {
+                                aliases
+                                    .get("regex")
+                                    .and_then(|regex| regex.as_str())
+                                    .and_then(|regex| Regex::new(regex).ok())
+                            })
+                            .filter_map(|o| o)
+                            .collect::<Vec<_>>()
+                    });
 
-                if aliases.map_or(false, |aliases| aliases.is_match(room_alias.as_str()))
+                if aliases
+                    .iter()
+                    .any(|aliases| aliases.is_match(room_alias.as_str()))
                     && db
                         .sending
                         .send_appservice_request(
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 24506227..e6c3b93a 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -1142,15 +1142,23 @@ impl Rooms {
                     });
                 let aliases = namespaces
                     .get("aliases")
-                    .and_then(|users| users.get("regex"))
-                    .and_then(|regex| regex.as_str())
-                    .and_then(|regex| Regex::new(regex).ok());
+                    .and_then(|aliases| aliases.as_sequence())
+                    .map_or_else(Vec::new, |aliases| {
+                        aliases
+                            .iter()
+                            .map(|aliases| {
+                                aliases
+                                    .get("regex")
+                                    .and_then(|regex| regex.as_str())
+                                    .and_then(|regex| Regex::new(regex).ok())
+                            })
+                            .filter_map(|o| o)
+                            .collect::<Vec<_>>()
+                    });
                 let rooms = namespaces
                     .get("rooms")
                     .and_then(|rooms| rooms.as_sequence());
 
-                let room_aliases = self.room_aliases(&room_id);
-
                 let bridge_user_id = appservice
                     .1
                     .get("sender_localpart")
@@ -1170,15 +1178,15 @@ impl Rooms {
                                 .as_ref()
                                 .map_or(false, |state_key| users.is_match(&state_key))
                 };
-                let matching_aliases = |aliases: Regex| {
-                    room_aliases
+                let matching_aliases = |aliases: &Regex| {
+                    self.room_aliases(&room_id)
                         .filter_map(|r| r.ok())
                         .any(|room_alias| aliases.is_match(room_alias.as_str()))
                 };
 
                 if bridge_user_id.map_or(false, user_is_joined)
                     || users.iter().any(matching_users)
-                    || aliases.map_or(false, matching_aliases)
+                    || aliases.iter().any(matching_aliases)
                     || rooms.map_or(false, |rooms| rooms.contains(&room_id.as_str().into()))
                 {
                     db.sending.send_pdu_appservice(&appservice.0, &pdu_id)?;