src/database/key_value/rooms/alias.rs

@@ -57,4 +57,28 @@ impl service::rooms::alias::Data for KeyValueDatabase {
                 .map_err(|_| Error::bad_database("Invalid alias in aliasid_alias."))
         }))
     }
+
+    fn all_local_aliases<'a>(
+        &'a self,
+    ) -> Box<dyn Iterator<Item = Result<(OwnedRoomId, String)>> + 'a> {
+        Box::new(
+            self.alias_roomid
+                .iter()
+                .map(|(room_alias_bytes, room_id_bytes)| {
+                    let room_alias_localpart = utils::string_from_bytes(&room_alias_bytes)
+                        .map_err(|_| {
+                            Error::bad_database("Invalid alias bytes in aliasid_alias.")
+                        })?;
+
+                    let room_id = utils::string_from_bytes(&room_id_bytes)
+                        .map_err(|_| {
+                            Error::bad_database("Invalid room_id bytes in aliasid_alias.")
+                        })?
+                        .try_into()
+                        .map_err(|_| Error::bad_database("Invalid room_id in aliasid_alias."))?;
+
+                    Ok((room_id, room_alias_localpart))
+                }),
+        )
+    }
 }

src/service/rooms/alias/data.rs

@@ -16,4 +16,9 @@ pub trait Data: Send + Sync {
         &'a self,
         room_id: &RoomId,
     ) -> Box<dyn Iterator<Item = Result<OwnedRoomAliasId>> + 'a>;
+
+    /// Returns all local aliases on the server
+    fn all_local_aliases<'a>(
+        &'a self,
+    ) -> Box<dyn Iterator<Item = Result<(OwnedRoomId, String)>> + 'a>;
 }

src/service/rooms/alias/mod.rs

@@ -32,4 +32,11 @@ impl Service {
     ) -> Box<dyn Iterator<Item = Result<OwnedRoomAliasId>> + 'a> {
         self.db.local_aliases_for_room(room_id)
     }
+
+    #[tracing::instrument(skip(self))]
+    pub fn all_local_aliases<'a>(
+        &'a self,
+    ) -> Box<dyn Iterator<Item = Result<(OwnedRoomId, String)>> + 'a> {
+        self.db.all_local_aliases()
+    }
 }

src/service/rooms/timeline/mod.rs

@@ -466,7 +466,7 @@ impl Service {
                         && services().globals.emergency_password().is_none();
 
                     if to_conduit && !from_conduit && admin_room.as_ref() == Some(&pdu.room_id) {
-                        services().admin.process_message(body);
+                        services().admin.process_message(body, pdu.event_id.clone());
                     }
                 }
             }