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

ok

Browse source
This commit is contained in:
avdb13 2024-07-06 22:26:33 +02:00
parent 734e84c668
commit 5e28b9158f
3 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/config/mod.rs
View file

@ -2,15 +2,18 @@ use std::{
collections::BTreeMap,
fmt,
net::{IpAddr, Ipv4Addr},
str::FromStr,
};
use ruma::{OwnedRoomOrAliasId, OwnedServerName, RoomVersionId};
use ruma::{serde::Raw, OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName, RoomVersionId};
use serde::{de::IgnoredAny, Deserialize};
use tracing::warn;
use url::Url;
mod proxy;
use crate::Error;
use self::proxy::ProxyConfig;
#[derive(Clone, Debug, Deserialize)]
@ -105,7 +108,8 @@ pub struct WellKnownConfig {
#[derive(Clone, Debug, Deserialize, Default)]
pub struct DefaultRoomsConfig {
pub rooms: Vec<OwnedRoomOrAliasId>,
#[serde(default = "Vec::new")]
pub rooms: Vec<String>,
pub join_reason: Option<String>,
}