e

Author: dasha-uwu

src/api/client/state.rs

@@ -320,11 +320,31 @@ async fn allowed_to_send_state_event(
 		| StateEventType::RoomCanonicalAlias => {
 			match json.deserialize_as_unchecked::<RoomCanonicalAliasEventContent>() {
 				| Ok(canonical_alias_content) => {
-					let mut aliases = canonical_alias_content.alt_aliases.clone();
+					let current_aliases = services
+						.state_accessor
+						.room_state_get_content::<RoomCanonicalAliasEventContent>(
+							room_id,
+							&StateEventType::RoomCanonicalAlias,
+							"",
+						)
+						.await
+						.ok()
+						.map(|content| {
+							let mut aliases = content.alt_aliases;
 
-					if let Some(alias) = canonical_alias_content.alias {
-						aliases.push(alias);
-					}
+							if let Some(alias) = content.alias {
+								aliases.push(alias);
+							}
+
+							aliases
+						})
+						.unwrap_or_default();
+
+					let aliases = canonical_alias_content
+						.alt_aliases
+						.iter()
+						.chain(canonical_alias_content.alias.iter())
+						.filter(|alias| !current_aliases.contains(alias));
 
 					for alias in aliases {
 						let (alias_room_id, _servers) = services