oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-07-27 17:28:36 +00:00
Code Wiki Activity

???

Browse source
This commit is contained in:
avdb13 2024-07-06 16:29:13 +02:00
parent 4c726f4a68
commit 734e84c668
3 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/service/globals/mod.rs
View file

@ -509,21 +509,22 @@ impl Service {
pub async fn default_rooms(&self) -> Result<BTreeSet<OwnedRoomId>> {
let mut default_rooms = BTreeSet::new();
for id_or_alias in &self.config.default_rooms {
// OwnedRoomOrAliasId always starts with a '#' or '!', presence of a ':' is not validated
let localpart = id_or_alias
.as_str()
.split_once(':')
.map(|(localpart, _)| localpart)
.unwrap_or(id_or_alias.as_str());
let server_name = id_or_alias
.server_name()
.map(ToOwned::to_owned)
.unwrap_or(self.config.server_name.clone());
for id_or_alias in &self.config.default_rooms.rooms {
// // `OwnedRoomOrAliasId` always starts with a '#' or '!', presence of a ':' is not validated
// let localpart = id_or_alias
// .as_str()
// .split_once(':')
// .map(|(localpart, _)| localpart)
// .unwrap_or(id_or_alias.as_str());
// let server_name = id_or_alias
// .server_name()
// .map(ToOwned::to_owned)
// .unwrap_or(self.config.server_name.clone());
let room_id = match OwnedRoomOrAliasId::from_str(&format!("{localpart}:{server_name}"))
.expect("this should always be valid")
.try_into()
let room_id = match id_or_alias.try_into()
// OwnedRoomOrAliasId::from_str(&format!("{localpart}:{server_name}"))
// .expect("this should always be valid")
// .try_into()
{
Ok(room_id) => room_id,
Err(room_alias) => get_alias_helper(room_alias).await.map(|res| res.room_id)?,