conduwuit-example.toml

@@ -1084,13 +1084,6 @@
 #
 #presence_timeout_remote_users = true
 
-# Allow local read receipts.
-#
-# Disabling this will effectively also disable outgoing federated read
-# receipts.
-#
-#allow_local_read_receipts = true
-
 # Allow receiving incoming read receipts from remote servers.
 #
 #allow_incoming_read_receipts = true
@@ -1099,13 +1092,6 @@
 #
 #allow_outgoing_read_receipts = true
 
-# Allow local typing updates.
-#
-# Disabling this will effectively also disable outgoing federated typing
-# updates.
-#
-#allow_local_typing = true
-
 # Allow outgoing typing updates to federation.
 #
 #allow_outgoing_typing = true

src/api/client/read_marker.rs

@@ -58,9 +58,7 @@ pub(crate) async fn set_read_marker_route(
 	}
 
 	if let Some(event) = &body.read_receipt {
-		if services.config.allow_local_read_receipts
+		if !services.users.is_suspended(sender_user).await? {
-			&& !services.users.is_suspended(sender_user).await?
-		{
 			let receipt_content = BTreeMap::from_iter([(
 				event.to_owned(),
 				BTreeMap::from_iter([(

src/api/client/typing.rs

@@ -26,7 +26,7 @@ pub(crate) async fn create_typing_event_route(
 	{
 		return Err!(Request(Forbidden("You are not in this room.")));
 	}
-	if services.config.allow_local_typing && !services.users.is_suspended(sender_user).await? {
+	if !services.users.is_suspended(sender_user).await? {
 		match body.state {
 			| Typing::Yes(duration) => {
 				let duration = utils::clamp(

src/core/config/mod.rs

@@ -1259,13 +1259,6 @@ pub struct Config {
 	#[serde(default = "true_fn")]
 	pub presence_timeout_remote_users: bool,
 
-	/// Allow local read receipts.
-	///
-	/// Disabling this will effectively also disable outgoing federated read
-	/// receipts.
-	#[serde(default = "true_fn")]
-	pub allow_local_read_receipts: bool,
-
 	/// Allow receiving incoming read receipts from remote servers.
 	#[serde(default = "true_fn")]
 	pub allow_incoming_read_receipts: bool,
@@ -1274,13 +1267,6 @@ pub struct Config {
 	#[serde(default = "true_fn")]
 	pub allow_outgoing_read_receipts: bool,
 
-	/// Allow local typing updates.
-	///
-	/// Disabling this will effectively also disable outgoing federated typing
-	/// updates.
-	#[serde(default = "true_fn")]
-	pub allow_local_typing: bool,
-
 	/// Allow outgoing typing updates to federation.
 	#[serde(default = "true_fn")]
 	pub allow_outgoing_typing: bool,