improvement: change federation_enabled to federation_disabled
This enables federation by default
This commit is contained in:
@@ -37,7 +37,7 @@ pub struct Config {
|
|||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
encryption_disabled: bool,
|
encryption_disabled: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
federation_enabled: bool,
|
federation_disabled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_cache_capacity() -> u64 {
|
fn default_cache_capacity() -> u64 {
|
||||||
|
|||||||
@@ -119,8 +119,8 @@ impl Globals {
|
|||||||
self.config.encryption_disabled
|
self.config.encryption_disabled
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn federation_enabled(&self) -> bool {
|
pub fn federation_disabled(&self) -> bool {
|
||||||
self.config.federation_enabled
|
self.config.federation_disabled
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn dns_resolver(&self) -> &TokioAsyncResolver {
|
pub fn dns_resolver(&self) -> &TokioAsyncResolver {
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ pub async fn send_request<T: OutgoingRequest>(
|
|||||||
where
|
where
|
||||||
T: Debug,
|
T: Debug,
|
||||||
{
|
{
|
||||||
if !globals.federation_enabled() {
|
if globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -322,7 +322,7 @@ pub async fn request_well_known(
|
|||||||
pub fn get_server_version_route(
|
pub fn get_server_version_route(
|
||||||
db: State<'_, Database>,
|
db: State<'_, Database>,
|
||||||
) -> ConduitResult<get_server_version::Response> {
|
) -> ConduitResult<get_server_version::Response> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -337,7 +337,7 @@ pub fn get_server_version_route(
|
|||||||
|
|
||||||
#[cfg_attr(feature = "conduit_bin", get("/_matrix/key/v2/server"))]
|
#[cfg_attr(feature = "conduit_bin", get("/_matrix/key/v2/server"))]
|
||||||
pub fn get_server_keys_route(db: State<'_, Database>) -> Json<String> {
|
pub fn get_server_keys_route(db: State<'_, Database>) -> Json<String> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
// TODO: Use proper types
|
// TODO: Use proper types
|
||||||
return Json("Federation is disabled.".to_owned());
|
return Json("Federation is disabled.".to_owned());
|
||||||
}
|
}
|
||||||
@@ -390,7 +390,7 @@ pub async fn get_public_rooms_filtered_route(
|
|||||||
db: State<'_, Database>,
|
db: State<'_, Database>,
|
||||||
body: Ruma<get_public_rooms_filtered::v1::Request<'_>>,
|
body: Ruma<get_public_rooms_filtered::v1::Request<'_>>,
|
||||||
) -> ConduitResult<get_public_rooms_filtered::v1::Response> {
|
) -> ConduitResult<get_public_rooms_filtered::v1::Response> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -437,7 +437,7 @@ pub async fn get_public_rooms_route(
|
|||||||
db: State<'_, Database>,
|
db: State<'_, Database>,
|
||||||
body: Ruma<get_public_rooms::v1::Request<'_>>,
|
body: Ruma<get_public_rooms::v1::Request<'_>>,
|
||||||
) -> ConduitResult<get_public_rooms::v1::Response> {
|
) -> ConduitResult<get_public_rooms::v1::Response> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -484,7 +484,7 @@ pub async fn send_transaction_message_route<'a>(
|
|||||||
db: State<'a, Database>,
|
db: State<'a, Database>,
|
||||||
body: Ruma<send_transaction_message::v1::Request<'_>>,
|
body: Ruma<send_transaction_message::v1::Request<'_>>,
|
||||||
) -> ConduitResult<send_transaction_message::v1::Response> {
|
) -> ConduitResult<send_transaction_message::v1::Response> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -587,7 +587,7 @@ pub fn get_missing_events_route<'a>(
|
|||||||
db: State<'a, Database>,
|
db: State<'a, Database>,
|
||||||
body: Ruma<get_missing_events::v1::Request<'_>>,
|
body: Ruma<get_missing_events::v1::Request<'_>>,
|
||||||
) -> ConduitResult<get_missing_events::v1::Response> {
|
) -> ConduitResult<get_missing_events::v1::Response> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -632,7 +632,7 @@ pub fn get_profile_information_route<'a>(
|
|||||||
db: State<'a, Database>,
|
db: State<'a, Database>,
|
||||||
body: Ruma<get_profile_information::v1::Request<'_>>,
|
body: Ruma<get_profile_information::v1::Request<'_>>,
|
||||||
) -> ConduitResult<get_profile_information::v1::Response> {
|
) -> ConduitResult<get_profile_information::v1::Response> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -666,7 +666,7 @@ pub fn get_user_devices_route<'a>(
|
|||||||
db: State<'a, Database>,
|
db: State<'a, Database>,
|
||||||
body: Ruma<membership::v1::Request<'_>>,
|
body: Ruma<membership::v1::Request<'_>>,
|
||||||
) -> ConduitResult<get_profile_information::v1::Response> {
|
) -> ConduitResult<get_profile_information::v1::Response> {
|
||||||
if !db.globals.federation_enabled() {
|
if db.globals.federation_disabled() {
|
||||||
return Err(Error::bad_config("Federation is disabled."));
|
return Err(Error::bad_config("Federation is disabled."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user