From 1c98ead69579b4700be0b51c9020bb8402336cc6 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Tue, 17 Feb 2026 22:13:17 +0000 Subject: [PATCH] revert: disable user update events (#593) * Revert "fix: cut presence traffic too while we engineer a new events architecture (#561)" This reverts commit 1f8ea963ad742f693f405e6438f1c343c81e6579. * Revert "fix: cut events traffic while we engineer a new events architecture (#559)" This reverts commit a11986ba1ad16b672ff1080913a684567d88adbb. * chore: only revert user update --- crates/bonfire/src/events/impl.rs | 3 ++- crates/bonfire/src/websocket.rs | 27 +++++++++++++++++-- .../core/database/src/models/users/model.rs | 16 +++++------ 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs index 82667175..0fbe1624 100644 --- a/crates/bonfire/src/events/impl.rs +++ b/crates/bonfire/src/events/impl.rs @@ -398,7 +398,8 @@ impl State { } /// Push presence change to the user and all associated server topics - pub async fn broadcast_presence_change(&self, target: bool) { + pub async fn broadcast_presence_change(&self, _target: bool) { + // disabled events // if if let Some(status) = &self.cache.users.get(&self.cache.user_id).unwrap().status { // status.presence != Some(Presence::Invisible) // } else { diff --git a/crates/bonfire/src/websocket.rs b/crates/bonfire/src/websocket.rs index c92da23b..4a8cfe4c 100644 --- a/crates/bonfire/src/websocket.rs +++ b/crates/bonfire/src/websocket.rs @@ -463,8 +463,31 @@ async fn worker( }; match payload { - ClientMessage::BeginTyping { .. } => {} - ClientMessage::EndTyping { .. } => {} + // disabled events + // ClientMessage::BeginTyping { channel } => { + // if !subscribed.read().await.contains(&channel) { + // continue; + // } + + // EventV1::ChannelStartTyping { + // id: channel.clone(), + // user: user_id.clone(), + // } + // .p(channel.clone()) + // .await; + // } + // ClientMessage::EndTyping { channel } => { + // if !subscribed.read().await.contains(&channel) { + // continue; + // } + + // EventV1::ChannelStopTyping { + // id: channel.clone(), + // user: user_id.clone(), + // } + // .p(channel.clone()) + // .await; + // } ClientMessage::Subscribe { server_id } => { let mut servers = active_servers.lock().await; let has_item = servers.contains_key(&server_id); diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs index e35d4809..0c2b6cee 100644 --- a/crates/core/database/src/models/users/model.rs +++ b/crates/core/database/src/models/users/model.rs @@ -653,14 +653,14 @@ impl User { self.apply_options(partial.clone()); db.update_user(&self.id, &partial, remove.clone()).await?; - // EventV1::UserUpdate { - // id: self.id.clone(), - // data: partial.into(), - // clear: remove.into_iter().map(|v| v.into()).collect(), - // event_id: Some(Ulid::new().to_string()), - // } - // .p_user(self.id.clone(), db) - // .await; + EventV1::UserUpdate { + id: self.id.clone(), + data: partial.into(), + clear: remove.into_iter().map(|v| v.into()).collect(), + event_id: Some(Ulid::new().to_string()), + } + .p_user(self.id.clone(), db) + .await; Ok(()) }