diff --git a/conduwuit-example.toml b/conduwuit-example.toml index 79ddd927..cfd0b0e9 100644 --- a/conduwuit-example.toml +++ b/conduwuit-example.toml @@ -551,25 +551,24 @@ url_preview_check_root_domain = false ### Presence / Typing Indicators / Read Receipts -# Config option to control local (your server only) presence updates/requests. Defaults to false. +# Config option to control local (your server only) presence updates/requests. Defaults to true. # Note that presence on conduwuit is very fast unlike Synapse's. # If using outgoing presence, this MUST be enabled. -#allow_local_presence = false +# +#allow_local_presence = true # Config option to control incoming federated presence updates/requests. Defaults to true. # This option receives presence updates from other servers, but does not send any unless `allow_outgoing_presence` is true. # Note that presence on conduwuit is very fast unlike Synapse's. +# #allow_incoming_presence = true -# Config option to control outgoing presence updates/requests. Defaults to false. +# Config option to control outgoing presence updates/requests. Defaults to true. # This option sends presence updates to other servers, but does not receive any unless `allow_incoming_presence` is true. # Note that presence on conduwuit is very fast unlike Synapse's. # If using outgoing presence, you MUST enable `allow_local_presence` as well. # -# Warning: Outgoing federated presence is not spec compliant due to relying on PDUs and EDUs combined. -# Outgoing presence will not be very reliable due to this and any issues with federated outgoing presence are very likely attributed to this issue. -# Incoming presence and local presence are unaffected. -#allow_outgoing_presence = false +#allow_outgoing_presence = true # Config option to control how many seconds before presence updates that you are idle. Defaults to 5 minutes. #presence_idle_timeout_s = 300 diff --git a/src/config/check.rs b/src/config/check.rs index 1448a129..6e4c1587 100644 --- a/src/config/check.rs +++ b/src/config/check.rs @@ -124,14 +124,6 @@ For security and safety reasons, conduwuit will shut down. If you are extra sure )); } - if config.allow_outgoing_presence { - warn!( - "! Outgoing federated presence is not spec compliant due to relying on PDUs and EDUs combined.\nOutgoing \ - presence will not be very reliable due to this and any issues with federated outgoing presence are very \ - likely attributed to this issue.\nIncoming presence and local presence are unaffected." - ); - } - if config .url_preview_domain_contains_allowlist .contains(&"*".to_owned()) diff --git a/src/config/mod.rs b/src/config/mod.rs index 671c3a9b..e0b379df 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -211,11 +211,11 @@ pub struct Config { #[serde(default = "default_notification_push_path")] pub notification_push_path: String, - #[serde(default)] + #[serde(default = "true_fn")] pub allow_local_presence: bool, #[serde(default = "true_fn")] pub allow_incoming_presence: bool, - #[serde(default)] + #[serde(default = "true_fn")] pub allow_outgoing_presence: bool, #[serde(default = "default_presence_idle_timeout_s")] pub presence_idle_timeout_s: u64,