studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move server user presence handling to presence service

Browse Source
This commit is contained in:
dasha_uwu
2025-08-24 02:39:28 +05:00
parent f51a7b12b5
commit bcd4f80149
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/service/presence/mod.rs
View File

@@ -40,6 +40,15 @@ impl crate::Service for Service {
} }
async fn worker(self: Arc<Self>) -> Result { async fn worker(self: Arc<Self>) -> Result {
// reset dormant online/away statuses to offline, and set the server user as
// online
if self.services.server.config.allow_local_presence && !self.services.db.is_read_only() {
self.unset_all_presence().await;
_ = self
.ping_presence(&self.services.globals.server_user, &PresenceState::Online)
.await;
}
let receiver = self.timer_channel.1.clone(); let receiver = self.timer_channel.1.clone();
let mut presence_timers = FuturesUnordered::new(); let mut presence_timers = FuturesUnordered::new();
@@ -62,6 +71,13 @@ impl crate::Service for Service {
} }
async fn interrupt(&self) { async fn interrupt(&self) {
// set the server user as offline
if self.services.server.config.allow_local_presence && !self.services.db.is_read_only() {
_ = self
.ping_presence(&self.services.globals.server_user, &PresenceState::Offline)
.await;
}
let (timer_sender, _) = &self.timer_channel; let (timer_sender, _) = &self.timer_channel;
if !timer_sender.is_closed() { if !timer_sender.is_closed() {
timer_sender.close(); timer_sender.close();

18
src/service/services.rs
View File

@@ -160,16 +160,6 @@ impl Services {
.start() .start()
.await?; .await?;
// reset dormant online/away statuses to offline, and set the server user as
// online
if self.server.config.allow_local_presence && !self.db.is_read_only() {
self.presence.unset_all_presence().await;
_ = self
.presence
.ping_presence(&self.globals.server_user, &ruma::presence::PresenceState::Online)
.await;
}
debug_info!("Services startup complete."); debug_info!("Services startup complete.");
Ok(Arc::clone(self)) Ok(Arc::clone(self))
@@ -178,14 +168,6 @@ impl Services {
pub async fn stop(&self) { pub async fn stop(&self) {
info!("Shutting down services..."); info!("Shutting down services...");
// set the server user as offline
if self.server.config.allow_local_presence && !self.db.is_read_only() {
_ = self
.presence
.ping_presence(&self.globals.server_user, &ruma::presence::PresenceState::Offline)
.await;
}
self.interrupt().await; self.interrupt().await;
if let Some(manager) = self.manager.lock().await.as_ref() { if let Some(manager) = self.manager.lock().await.as_ref() {
manager.stop().await; manager.stop().await;