feat: Typing notifications in simplified sliding sync

What's missing? Being able to use separate rooms & lists for typing
indicators.
At the moment, we use the same ones as we use for the timeline, as
todo_rooms is quite intertwined. We need to disentangle this to get that
functionality, although I'm not sure if clients use it.

.typos.toml

@@ -1,5 +1,5 @@
 [files]
-extend-exclude = ["*.csr"]
+extend-exclude = ["*.csr", "*.lock"]
 
 [default.extend-words]
 "allocatedp" = "allocatedp"

Cargo.lock

@@ -987,7 +987,6 @@ dependencies = [
  "base64 0.22.1",
  "blurhash",
  "bytes",
- "conduwuit_build_metadata",
  "conduwuit_core",
  "conduwuit_database",
  "const-str",
@@ -3696,7 +3695,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.10.1"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "assign",
  "js_int",
@@ -3716,7 +3715,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.10.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3728,7 +3727,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.18.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "as_variant",
  "assign",
@@ -3751,7 +3750,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.13.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "as_variant",
  "base64 0.22.1",
@@ -3783,7 +3782,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.28.1"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "as_variant",
  "indexmap 2.9.0",
@@ -3808,7 +3807,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "bytes",
  "headers",
@@ -3830,7 +3829,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.9.5"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "js_int",
  "thiserror 2.0.12",
@@ -3839,7 +3838,7 @@ dependencies = [
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3849,7 +3848,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.13.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "cfg-if",
  "proc-macro-crate",
@@ -3864,7 +3863,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3876,7 +3875,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.15.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d6870a7fb7f6cccff63f7fd0ff6c581bad80e983#d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a48665b682be1016cea53ea5e7787442dfe7c1de#a48665b682be1016cea53ea5e7787442dfe7c1de"
 dependencies = [
  "base64 0.22.1",
  "ed25519-dalek",

Cargo.toml

@@ -350,7 +350,7 @@ version = "0.1.2"
 [workspace.dependencies.ruma]
 git = "https://forgejo.ellis.link/continuwuation/ruwuma"
 #branch = "conduwuit-changes"
-rev = "d6870a7fb7f6cccff63f7fd0ff6c581bad80e983"
+rev = "a48665b682be1016cea53ea5e7787442dfe7c1de"
 features = [
     "compat",
     "rand",
@@ -381,7 +381,7 @@ features = [
     "unstable-msc4121",
     "unstable-msc4125",
     "unstable-msc4186",
-    "unstable-msc4203", # sending to-device events to appservices 
+    "unstable-msc4203", # sending to-device events to appservices
     "unstable-msc4210", # remove legacy mentions
     "unstable-extensible-events",
     "unstable-pdu",

conduwuit-example.toml

@@ -119,15 +119,6 @@
 #
 #allow_announcements_check = true
 
-# If enabled, continuwuity will send anonymous analytics data periodically
-# to help improve development. This includes basic server metadata like
-# version, commit hash, and federation status. All requests are signed
-# with the server's federation signing key. Data is sent on startup (with
-# up to 5 minutes jitter) and every 12 hours thereafter (with up to 30
-# minutes jitter) to distribute load.
-#
-#allow_analytics = true
-
 # Set this to any float value to multiply continuwuity's in-memory LRU
 # caches with such as "auth_chain_cache_capacity".
 #

docs/static/announcements.schema.json

@@ -3,7 +3,7 @@
     "$id": "https://continwuity.org/schema/announcements.schema.json",
     "type": "object",
     "properties": {
-      "announcements": {
+      "updates": {
         "type": "array",
         "items": {
           "type": "object",
@@ -16,10 +16,6 @@
             },
             "date": {
               "type": "string"
-            },
-            "mention_room": {
-              "type": "boolean",
-              "description": "Whether to mention the room (@room) when posting this announcement"
             }
           },
           "required": [
@@ -30,6 +26,6 @@
       }
     },
     "required": [
-      "announcements"
+      "updates"
     ]
   }

src/admin/server/commands.rs

@@ -145,16 +145,6 @@ pub(super) async fn restart(&self, force: bool) -> Result {
 	self.write_str("Restarting server...").await
 }
 
-#[admin_command]
-pub(super) async fn upload_analytics(&self) -> Result {
-	match self.services.analytics.force_upload().await {
-		| Ok(()) => self.write_str("Analytics uploaded successfully.").await,
-		| Err(e) =>
-			self.write_str(&format!("Failed to upload analytics: {e}"))
-				.await,
-	}
-}
-
 #[admin_command]
 pub(super) async fn shutdown(&self) -> Result {
 	warn!("shutdown command");

src/admin/server/mod.rs

@@ -64,7 +64,4 @@ pub(super) enum ServerCommand {
 
 	/// - Shutdown the server
 	Shutdown,
-
-	/// - Upload analytics
-	UploadAnalytics,
 }

src/api/client/sync/v3.rs

@@ -808,7 +808,7 @@ async fn load_joined_room(
 			let typings = services
 				.rooms
 				.typing
-				.typings_all(room_id, sender_user)
+				.typings_event_for_user(room_id, sender_user)
 				.await?;
 
 			Ok(vec![serde_json::from_str(&serde_json::to_string(&typings)?)?])

src/api/client/sync/v5.rs

@@ -33,6 +33,7 @@
 	events::{
 		AnyRawAccountDataEvent, AnySyncEphemeralRoomEvent, StateEventType, TimelineEventType,
 		room::member::{MembershipState, RoomMemberEventContent},
+		typing::TypingEventContent,
 	},
 	serde::Raw,
 	uint,
@@ -205,6 +206,9 @@ pub(crate) async fn sync_events_v5_route(
 		_ = tokio::time::timeout(duration, watcher).await;
 	}
 
+	let typing = collect_typing_events(services, sender_user, &body, &todo_rooms).await?;
+	response.extensions.typing = typing;
+
 	trace!(
 		rooms = ?response.rooms.len(),
 		account_data = ?response.extensions.account_data.rooms.len(),
@@ -288,6 +292,8 @@ async fn handle_lists<'a, Rooms, AllRooms>(
 	Rooms: Iterator<Item = &'a RoomId> + Clone + Send + 'a,
 	AllRooms: Iterator<Item = &'a RoomId> + Clone + Send + 'a,
 {
+	// TODO MSC4186: Implement remaining list filters: is_dm, is_encrypted,
+	// room_types.
 	for (list_id, list) in &body.lists {
 		let active_rooms: Vec<_> = match list.filters.as_ref().and_then(|f| f.is_invite) {
 			| None => all_rooms.clone().collect(),
@@ -665,6 +671,62 @@ async fn process_rooms<'a, Rooms>(
 	}
 	Ok(rooms)
 }
+
+async fn collect_typing_events(
+	services: &Services,
+	sender_user: &UserId,
+	body: &sync_events::v5::Request,
+	todo_rooms: &TodoRooms,
+) -> Result<sync_events::v5::response::Typing> {
+	if !body.extensions.typing.enabled.unwrap_or(false) {
+		return Ok(sync_events::v5::response::Typing::default());
+	}
+	let rooms: Vec<_> = body.extensions.typing.rooms.clone().unwrap_or_else(|| {
+		body.room_subscriptions
+			.keys()
+			.map(ToOwned::to_owned)
+			.collect()
+	});
+	let lists: Vec<_> = body
+		.extensions
+		.typing
+		.lists
+		.clone()
+		.unwrap_or_else(|| body.lists.keys().map(ToOwned::to_owned).collect::<Vec<_>>());
+
+	if rooms.is_empty() && lists.is_empty() {
+		return Ok(sync_events::v5::response::Typing::default());
+	}
+
+	let mut typing_response = sync_events::v5::response::Typing::default();
+	for (room_id, (required_state_request, timeline_limit, roomsince)) in todo_rooms {
+		if services.rooms.typing.last_typing_update(room_id).await? <= *roomsince {
+			continue;
+		}
+
+		match services
+			.rooms
+			.typing
+			.typing_users_for_user(room_id, sender_user)
+			.await
+		{
+			| Ok(typing_users) => {
+				typing_response.rooms.insert(
+					room_id.to_owned(), // Already OwnedRoomId
+					Raw::new(&sync_events::v5::response::SyncTypingEvent {
+						content: TypingEventContent::new(typing_users),
+					})?,
+				);
+			},
+			| Err(e) => {
+				warn!(%room_id, "Failed to get typing events for room: {}", e);
+			},
+		}
+	}
+
+	Ok(typing_response)
+}
+
 async fn collect_account_data(
 	services: &Services,
 	(sender_user, _, globalsince, body): (&UserId, &DeviceId, u64, &sync_events::v5::Request),

src/core/config/mod.rs

@@ -169,18 +169,6 @@ pub struct Config {
 	#[serde(alias = "allow_check_for_updates", default = "true_fn")]
 	pub allow_announcements_check: bool,
 
-	/// If enabled, continuwuity will send anonymous analytics data periodically
-	/// to help improve development. This includes basic server metadata like
-	/// version, build information and federation status. All requests are
-	/// signed with the server's federation signing key.
-	///
-	/// This is also used to warn about potential problems with federation, if
-	/// federation is enabled.
-	///
-	/// default: true
-	#[serde(default = "true_fn")]
-	pub allow_analytics: bool,
-
 	/// Set this to any float value to multiply continuwuity's in-memory LRU
 	/// caches with such as "auth_chain_cache_capacity".
 	///

src/service/Cargo.toml

@@ -78,7 +78,6 @@ zstd_compression = [
 async-trait.workspace = true
 base64.workspace = true
 bytes.workspace = true
-conduwuit-build-metadata.workspace = true
 conduwuit-core.workspace = true
 conduwuit-database.workspace = true
 const-str.workspace = true

src/service/analytics/mod.rs

@@ -1,245 +0,0 @@
-//! # Analytics service
-//!
-//! This service is responsible for collecting and uploading anonymous server
-//! metadata to help improve continuwuity development.
-//!
-//! All requests are signed with the server's federation signing key for
-//! authentication. This service respects the `allow_analytics` configuration
-//! option and is enabled by default.
-//!
-//! Analytics are sent on startup (with up to 5 minutes jitter) and every 12
-//! hours thereafter (with up to 30 minutes jitter) to distribute load.
-
-use std::{sync::Arc, time::Duration};
-
-use async_trait::async_trait;
-use conduwuit::{
-	Result, Server, debug, err, info,
-	version::{self, user_agent},
-	warn,
-};
-use database::{Deserialized, Map};
-use rand::Rng;
-use ruma::ServerName;
-use serde::{Deserialize, Serialize};
-use tokio::{
-	sync::Notify,
-	time::{MissedTickBehavior, interval},
-};
-
-use crate::{Dep, client, config, federation, globals, server_keys, users};
-
-extern crate conduwuit_build_metadata as build_metadata;
-
-pub struct Service {
-	interval: Duration,
-	jitter: Duration,
-	startup_jitter: Duration,
-	interrupt: Notify,
-	db: Arc<Map>,
-	services: Services,
-}
-
-struct Services {
-	client: Dep<client::Service>,
-	globals: Dep<globals::Service>,
-	server_keys: Dep<server_keys::Service>,
-	federation: Dep<federation::Service>,
-	users: Dep<users::Service>,
-	server: Arc<Server>,
-	config: Dep<config::Service>,
-}
-
-#[derive(Debug, Serialize)]
-struct AnalyticsPayload {
-	server_name: String,
-	version: &'static str,
-	commit_hash: Option<&'static str>,
-	user_count: usize,
-	federation_enabled: bool,
-	room_creation_allowed: bool,
-	public_room_directory_over_federation: bool,
-	build_profile: &'static str,
-	opt_level: &'static str,
-	rustc_version: &'static str,
-	features: Vec<&'static str>,
-	host: &'static str,
-	target: &'static str,
-	// the following can all be derived from the target
-	target_arch: &'static str,
-	target_os: &'static str,
-	target_env: &'static str,
-	target_family: &'static str,
-}
-
-#[derive(Debug, Deserialize)]
-struct AnalyticsResponse {
-	success: bool,
-	message: Option<String>,
-}
-
-const ANALYTICS_URL: &str = "https://analytics.continuwuity.org/api/v1/metrics";
-const ANALYTICS_SERVERNAME: &str = "analytics.continuwuity.org";
-const ANALYTICS_INTERVAL: u64 = 43200; // 12 hours in seconds
-const ANALYTICS_JITTER: u64 = 1800; // 30 minutes in seconds
-const ANALYTICS_STARTUP_JITTER: u64 = 300; // 5 minutes in seconds
-const LAST_ANALYTICS_TIMESTAMP: &[u8; 21] = b"last_analytics_upload";
-
-#[async_trait]
-impl crate::Service for Service {
-	fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
-		let mut rng = rand::thread_rng();
-		let jitter_seconds = rng.gen_range(0..=ANALYTICS_JITTER);
-		let startup_jitter_seconds = rng.gen_range(0..=ANALYTICS_STARTUP_JITTER);
-
-		Ok(Arc::new(Self {
-			interval: Duration::from_secs(ANALYTICS_INTERVAL),
-			jitter: Duration::from_secs(jitter_seconds),
-			startup_jitter: Duration::from_secs(startup_jitter_seconds),
-			interrupt: Notify::new(),
-			db: args.db["global"].clone(),
-			services: Services {
-				globals: args.depend::<globals::Service>("globals"),
-				client: args.depend::<client::Service>("client"),
-				config: args.depend::<config::Service>("config"),
-				server_keys: args.depend::<server_keys::Service>("server_keys"),
-				users: args.depend::<users::Service>("users"),
-				federation: args.depend::<federation::Service>("federation"),
-				server: args.server.clone(),
-			},
-		}))
-	}
-
-	#[tracing::instrument(skip_all, name = "analytics", level = "debug")]
-	async fn worker(self: Arc<Self>) -> Result<()> {
-		if !self.services.server.config.allow_analytics {
-			debug!("Analytics collection is disabled");
-			return Ok(());
-		}
-
-		// Send initial analytics on startup (with shorter jitter)
-		tokio::time::sleep(self.startup_jitter).await;
-		if let Err(e) = self.upload_analytics().await {
-			warn!(%e, "Failed to upload initial analytics");
-		}
-
-		let mut i = interval(self.interval);
-		i.set_missed_tick_behavior(MissedTickBehavior::Delay);
-		i.reset_after(self.interval + self.jitter);
-
-		loop {
-			tokio::select! {
-				() = self.interrupt.notified() => break,
-				_ = i.tick() => {
-					if let Err(e) = self.upload_analytics().await {
-						warn!(%e, "Failed to upload analytics");
-					}
-				}
-			}
-		}
-
-		Ok(())
-	}
-
-	fn interrupt(&self) { self.interrupt.notify_waiters(); }
-
-	fn name(&self) -> &str { crate::service::make_name(std::module_path!()) }
-}
-
-impl Service {
-	#[tracing::instrument(skip_all)]
-	async fn upload_analytics(&self) -> Result<()> {
-		let payload = self.collect_metadata().await;
-		let json_payload = serde_json::to_vec(&payload)?;
-
-		// Create HTTP request
-		let request = http::Request::builder()
-			.method("POST")
-			.uri(ANALYTICS_URL)
-			.header("Content-Type", "application/json")
-			.header("User-Agent", user_agent())
-			.body(json_payload)?;
-
-		// Sign the request using federation signing
-		let reqwest_request = self.services.federation.sign_non_federation_request(
-			ServerName::parse(ANALYTICS_SERVERNAME).unwrap(),
-			request,
-		)?;
-		// self.sign_analytics_request(&mut request).await?;
-
-		let response = self
-			.services
-			.client
-			.default
-			.execute(reqwest_request)
-			.await?;
-		let status = response.status();
-		if let Ok(analytics_response) =
-			serde_json::from_str::<AnalyticsResponse>(&response.text().await?)
-		{
-			if analytics_response.success {
-				debug!("Analytics uploaded successfully");
-				self.update_last_upload_timestamp().await;
-			}
-			let msg = analytics_response.message.unwrap_or_default();
-			warn!("Analytics upload warning: {}", msg);
-		} else if status.is_success() {
-			info!("Analytics uploaded successfully (no structured response)");
-			self.update_last_upload_timestamp().await;
-		} else {
-			warn!("Analytics upload failed (no structured response) with status: {}", status);
-		}
-
-		Ok(())
-	}
-
-	async fn collect_metadata(&self) -> AnalyticsPayload {
-		let config = &self.services.config;
-
-		AnalyticsPayload {
-			server_name: self.services.globals.server_name().to_string(),
-			version: version::version(),
-			commit_hash: build_metadata::GIT_COMMIT_HASH,
-			user_count: self.services.users.count().await,
-			federation_enabled: config.allow_federation,
-			room_creation_allowed: config.allow_room_creation,
-			public_room_directory_over_federation: config
-				.allow_public_room_directory_over_federation,
-			build_profile: build_metadata::built::PROFILE,
-			opt_level: build_metadata::built::OPT_LEVEL,
-			rustc_version: build_metadata::built::RUSTC_VERSION,
-			features: build_metadata::built::FEATURES.to_vec(),
-			host: build_metadata::built::HOST,
-			target: build_metadata::built::TARGET,
-			target_arch: build_metadata::built::CFG_TARGET_ARCH,
-			target_os: build_metadata::built::CFG_OS,
-			target_env: build_metadata::built::CFG_ENV,
-			target_family: build_metadata::built::CFG_FAMILY,
-		}
-	}
-
-	async fn update_last_upload_timestamp(&self) {
-		let timestamp = std::time::SystemTime::now()
-			.duration_since(std::time::UNIX_EPOCH)
-			.unwrap_or_default()
-			.as_secs();
-
-		self.db.raw_put(LAST_ANALYTICS_TIMESTAMP, timestamp);
-	}
-
-	pub async fn last_upload_timestamp(&self) -> u64 {
-		self.db
-			.get(LAST_ANALYTICS_TIMESTAMP)
-			.await
-			.deserialized()
-			.unwrap_or(0_u64)
-	}
-
-	pub async fn force_upload(&self) -> Result<()> {
-		if !self.services.config.allow_analytics {
-			return Err(err!(Config("allow_analytics", "Analytics collection is disabled")));
-		}
-
-		self.upload_analytics().await
-	}
-}

src/service/announcements/mod.rs

@@ -20,7 +20,7 @@
 use async_trait::async_trait;
 use conduwuit::{Result, Server, debug, info, warn};
 use database::{Deserialized, Map};
-use ruma::events::{Mentions, room::message::RoomMessageEventContent};
+use ruma::events::room::message::RoomMessageEventContent;
 use serde::Deserialize;
 use tokio::{
 	sync::Notify,
@@ -53,8 +53,6 @@ struct CheckForAnnouncementsResponseEntry {
 	id: u64,
 	date: Option<String>,
 	message: String,
-	#[serde(default, skip_serializing_if = "bool::not")]
-	mention_room: bool,
 }
 
 const CHECK_FOR_ANNOUNCEMENTS_URL: &str =
@@ -141,20 +139,19 @@ async fn handle(&self, announcement: &CheckForAnnouncementsResponseEntry) {
 		} else {
 			info!("[announcements] {:#}", announcement.message);
 		}
-		let mut message = RoomMessageEventContent::text_markdown(format!(
-			"### New announcement{}\n\n{}",
-			announcement
-				.date
-				.as_ref()
-				.map_or_else(String::new, |date| format!(" - `{date}`")),
-			announcement.message
-		));
 
-		if announcement.mention_room {
-			message = message.add_mentions(Mentions::with_room_mention());
-		}
-
-		self.services.admin.send_message(message).await.ok();
+		self.services
+			.admin
+			.send_message(RoomMessageEventContent::text_markdown(format!(
+				"### New announcement{}\n\n{}",
+				announcement
+					.date
+					.as_ref()
+					.map_or_else(String::new, |date| format!(" - `{date}`")),
+				announcement.message
+			)))
+			.await
+			.ok();
 	}
 
 	#[inline]

src/service/federation/execute.rs

@@ -107,20 +107,6 @@ fn prepare(&self, dest: &ServerName, mut request: http::Request<Vec<u8>>) -> Res
 	Ok(request)
 }
 
-#[implement(super::Service)]
-pub fn sign_non_federation_request(
-	&self,
-	dest: &ServerName,
-	mut request: http::Request<Vec<u8>>,
-) -> Result<Request> {
-	self.sign_request(&mut request, dest);
-
-	let request = Request::try_from(request)?;
-	self.services.server.check_running()?;
-
-	Ok(request)
-}
-
 #[implement(super::Service)]
 fn validate_url(&self, url: &Url) -> Result<()> {
 	if let Some(url_host) = url.host_str() {

src/service/mod.rs

@@ -9,7 +9,6 @@
 
 pub mod account_data;
 pub mod admin;
-pub mod analytics;
 pub mod announcements;
 pub mod appservice;
 pub mod client;

src/service/rooms/typing/mod.rs

@@ -179,18 +179,15 @@ pub async fn last_typing_update(&self, room_id: &RoomId) -> Result<u64> {
 			.unwrap_or(0))
 	}
 
-	/// Returns a new typing EDU.
-	pub async fn typings_all(
+	pub async fn typing_users_for_user(
 		&self,
 		room_id: &RoomId,
 		sender_user: &UserId,
-	) -> Result<SyncEphemeralRoomEvent<ruma::events::typing::TypingEventContent>> {
+	) -> Result<Vec<OwnedUserId>> {
 		let room_typing_indicators = self.typing.read().await.get(room_id).cloned();
 
 		let Some(typing_indicators) = room_typing_indicators else {
-			return Ok(SyncEphemeralRoomEvent {
-				content: ruma::events::typing::TypingEventContent { user_ids: Vec::new() },
-			});
+			return Ok(Vec::new());
 		};
 
 		let user_ids: Vec<_> = typing_indicators
@@ -207,8 +204,19 @@ pub async fn typings_all(
 			.collect()
 			.await;
 
+		Ok(user_ids)
+	}
+
+	/// Returns a new typing EDU.
+	pub async fn typings_event_for_user(
+		&self,
+		room_id: &RoomId,
+		sender_user: &UserId,
+	) -> Result<SyncEphemeralRoomEvent<ruma::events::typing::TypingEventContent>> {
 		Ok(SyncEphemeralRoomEvent {
-			content: ruma::events::typing::TypingEventContent { user_ids },
+			content: ruma::events::typing::TypingEventContent {
+				user_ids: self.typing_users_for_user(room_id, sender_user).await?,
+			},
 		})
 	}
 

src/service/services.rs

@@ -10,8 +10,8 @@
 use tokio::sync::Mutex;
 
 use crate::{
-	account_data, admin, analytics, announcements, appservice, client, config, emergency,
-	federation, globals, key_backups,
+	account_data, admin, announcements, appservice, client, config, emergency, federation,
+	globals, key_backups,
 	manager::Manager,
 	media, moderation, presence, pusher, resolver, rooms, sending, server_keys, service,
 	service::{Args, Map, Service},
@@ -21,7 +21,6 @@
 pub struct Services {
 	pub account_data: Arc<account_data::Service>,
 	pub admin: Arc<admin::Service>,
-	pub analytics: Arc<analytics::Service>,
 	pub appservice: Arc<appservice::Service>,
 	pub config: Arc<config::Service>,
 	pub client: Arc<client::Service>,
@@ -69,7 +68,6 @@ macro_rules! build {
 		Ok(Arc::new(Self {
 			account_data: build!(account_data::Service),
 			admin: build!(admin::Service),
-			analytics: build!(analytics::Service),
 			appservice: build!(appservice::Service),
 			resolver: build!(resolver::Service),
 			client: build!(client::Service),