From 7a1a0a0beca3d37003ca272a5e8045f67fae4996 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Wed, 18 Dec 2024 16:01:41 +0000 Subject: [PATCH] revert typings_maintain refactor --- src/service/rooms/typing/mod.rs | 46 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/service/rooms/typing/mod.rs b/src/service/rooms/typing/mod.rs index 1de91e5e..b8c85dc0 100644 --- a/src/service/rooms/typing/mod.rs +++ b/src/service/rooms/typing/mod.rs @@ -146,34 +146,32 @@ impl Service { } }; - if removable.is_empty() { - return Ok(()); - } + if !removable.is_empty() { + let typing = &mut self.typing.write().await; + let room = typing.entry(room_id.to_owned()).or_default(); + for user in &removable { + debug_info!("typing timeout {user:?} in {room_id:?}"); + room.remove(user); + } - let typing = &mut self.typing.write().await; - let room = typing.entry(room_id.to_owned()).or_default(); - for user in &removable { - debug_info!("typing timeout {user:?} in {room_id:?}"); - room.remove(user); - } + // update clients + self.last_typing_update + .write() + .await + .insert(room_id.to_owned(), self.services.globals.next_count()?); - // update clients - self.last_typing_update - .write() - .await - .insert(room_id.to_owned(), self.services.globals.next_count()?); + if self.typing_update_sender.send(room_id.to_owned()).is_err() { + trace!("receiver found what it was looking for and is no longer interested"); + } - if self.typing_update_sender.send(room_id.to_owned()).is_err() { - trace!("receiver found what it was looking for and is no longer interested"); - } + // update appservices + self.appservice_send(room_id).await?; - // update appservices - self.appservice_send(room_id).await?; - - // update federation - for user in &removable { - if self.services.globals.user_is_local(user) { - self.federation_send(room_id, user, false).await?; + // update federation + for user in &removable { + if self.services.globals.user_is_local(user) { + self.federation_send(room_id, user, false).await?; + } } }