revert typings_maintain refactor

This commit is contained in:
Jade Ellis 2024-12-18 16:01:41 +00:00
parent 4dd809fdc4
commit 7a1a0a0bec
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2

View file

@ -146,34 +146,32 @@ impl Service {
} }
}; };
if removable.is_empty() { if !removable.is_empty() {
return Ok(()); 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; // update clients
let room = typing.entry(room_id.to_owned()).or_default(); self.last_typing_update
for user in &removable { .write()
debug_info!("typing timeout {user:?} in {room_id:?}"); .await
room.remove(user); .insert(room_id.to_owned(), self.services.globals.next_count()?);
}
// update clients if self.typing_update_sender.send(room_id.to_owned()).is_err() {
self.last_typing_update trace!("receiver found what it was looking for and is no longer interested");
.write() }
.await
.insert(room_id.to_owned(), self.services.globals.next_count()?);
if self.typing_update_sender.send(room_id.to_owned()).is_err() { // update appservices
trace!("receiver found what it was looking for and is no longer interested"); self.appservice_send(room_id).await?;
}
// update appservices // update federation
self.appservice_send(room_id).await?; for user in &removable {
if self.services.globals.user_is_local(user) {
// update federation self.federation_send(room_id, user, false).await?;
for user in &removable { }
if self.services.globals.user_is_local(user) {
self.federation_send(room_id, user, false).await?;
} }
} }