diff --git a/complement/Dockerfile b/complement/Dockerfile index e168b1b8..11c0f3b4 100644 --- a/complement/Dockerfile +++ b/complement/Dockerfile @@ -32,7 +32,6 @@ RUN sed -i "s/#log = \"warn\"/log = \"debug\"/g" conduit.toml RUN sed -i 's/#\strusted_servers\s=\s\["matrix.org"\]/trusted_servers = []/g' conduit.toml RUN sed -i 's/# `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse` to/yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true/g' conduit.toml RUN sed -i "s/allow_outgoing_presence = false/allow_outgoing_presence = true/g" conduit.toml -RUN sed -i "s/allow_incoming_presence = false/allow_incoming_presence = true/g" conduit.toml RUN sed -i "s/allow_local_presence = false/allow_local_presence = true/g" conduit.toml RUN sed -i "s/address = \"127.0.0.1\"/address = \"0.0.0.0\"/g" conduit.toml diff --git a/conduwuit-example.toml b/conduwuit-example.toml index b5b4bfe1..d90e4ddf 100644 --- a/conduwuit-example.toml +++ b/conduwuit-example.toml @@ -538,10 +538,10 @@ url_preview_check_root_domain = false # If using outgoing presence, this MUST be enabled. #allow_local_presence = false -# Config option to control incoming federated presence updates/requests. Defaults to false. +# 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 = false +#allow_incoming_presence = true # Config option to control outgoing presence updates/requests. Defaults to false. # This option sends presence updates to other servers, but does not receive any unless `allow_incoming_presence` is true. diff --git a/src/config/mod.rs b/src/config/mod.rs index e183e4eb..587a291e 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -183,7 +183,7 @@ pub struct Config { #[serde(default)] pub allow_local_presence: bool, - #[serde(default)] + #[serde(default = "true_fn")] pub allow_incoming_presence: bool, #[serde(default)] pub allow_outgoing_presence: bool,