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

Split pusher service send/request into unit.

Browse Source 
Refactor sender's push destination handler.

Combine remnants of service::rooms::user with pusher service.

Further split and reorg pusher service units.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-10-27 15:55:55 +00:00
parent 563873af77
commit 5e89f0acae
13 changed files with 565 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/service/rooms/delete/mod.rs
View File

@@ -159,7 +159,7 @@ impl Service {
debug!("Deleting the room's last notifications read.");
self.services
.user
.pusher
.delete_room_notification_read(room_id)
.await
.log_err()

1
src/service/rooms/mod.rs
View File

@@ -17,4 +17,3 @@ pub mod state_compressor;
pub mod threads;
pub mod timeline;
pub mod typing;
pub mod user;

2
src/service/rooms/timeline/append.rs
View File

@@ -168,7 +168,7 @@ where
.private_read_set(pdu.room_id(), pdu.sender(), *next_count2);
self.services
.user
.pusher
.reset_notification_counts(pdu.sender(), pdu.room_id());
let count = PduCount::Normal(*next_count1);

108
src/service/rooms/user/mod.rs
View File

@@ -1,108 +0,0 @@
use std::sync::Arc;
use ruma::{RoomId, UserId};
use tuwunel_core::{
Result, implement, trace,
utils::stream::{ReadyExt, TryIgnore},
};
use tuwunel_database::{Deserialized, Interfix, Map};
pub struct Service {
db: Data,
services: Arc<crate::services::OnceServices>,
}
struct Data {
userroomid_notificationcount: Arc<Map>,
userroomid_highlightcount: Arc<Map>,
roomuserid_lastnotificationread: Arc<Map>,
}
impl crate::Service for Service {
fn build(args: &crate::Args<'_>) -> Result<Arc<Self>> {
Ok(Arc::new(Self {
db: Data {
userroomid_notificationcount: args.db["userroomid_notificationcount"].clone(),
userroomid_highlightcount: args.db["userroomid_highlightcount"].clone(),
roomuserid_lastnotificationread: args.db["roomuserid_lastnotificationread"]
.clone(),
},
services: args.services.clone(),
}))
}
fn name(&self) -> &str { crate::service::make_name(std::module_path!()) }
}
#[implement(Service)]
#[tracing::instrument(level = "debug", skip(self))]
pub fn reset_notification_counts(&self, user_id: &UserId, room_id: &RoomId) {
let count = self.services.globals.next_count();
let userroom_id = (user_id, room_id);
self.db
.userroomid_highlightcount
.put(userroom_id, 0_u64);
self.db
.userroomid_notificationcount
.put(userroom_id, 0_u64);
let roomuser_id = (room_id, user_id);
self.db
.roomuserid_lastnotificationread
.put(roomuser_id, *count);
}
#[implement(Service)]
#[tracing::instrument(level = "debug", skip(self), ret(level = "trace"))]
pub async fn notification_count(&self, user_id: &UserId, room_id: &RoomId) -> u64 {
let key = (user_id, room_id);
self.db
.userroomid_notificationcount
.qry(&key)
.await
.deserialized()
.unwrap_or(0)
}
#[implement(Service)]
#[tracing::instrument(level = "debug", skip(self), ret(level = "trace"))]
pub async fn highlight_count(&self, user_id: &UserId, room_id: &RoomId) -> u64 {
let key = (user_id, room_id);
self.db
.userroomid_highlightcount
.qry(&key)
.await
.deserialized()
.unwrap_or(0)
}
#[implement(Service)]
#[tracing::instrument(level = "debug", skip(self), ret(level = "trace"))]
pub async fn last_notification_read(&self, user_id: &UserId, room_id: &RoomId) -> u64 {
let key = (room_id, user_id);
self.db
.roomuserid_lastnotificationread
.qry(&key)
.await
.deserialized()
.unwrap_or(0)
}
#[implement(Service)]
pub async fn delete_room_notification_read(&self, room_id: &RoomId) -> Result {
let key = (room_id, Interfix);
self.db
.roomuserid_lastnotificationread
.keys_prefix_raw(&key)
.ignore_err()
.ready_for_each(|key| {
trace!("Removing key: {key:?}");
self.db
.roomuserid_lastnotificationread
.remove(key);
})
.await;
Ok(())
}