move presence up two levels out of rooms.edus and rooms.

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/mod.rs

@@ -15,6 +15,7 @@ pub(crate) mod globals;
 pub(crate) mod key_backups;
 pub(crate) mod media;
 pub(crate) mod pdu;
+pub(crate) mod presence;
 pub(crate) mod pusher;
 pub(crate) mod rooms;
 pub(crate) mod sending;
@@ -30,6 +31,7 @@ pub struct Services<'a> {
 	pub uiaa: uiaa::Service,
 	pub users: users::Service,
 	pub account_data: account_data::Service,
+	pub presence: presence::Service,
 	pub admin: Arc<admin::Service>,
 	pub globals: globals::Service<'a>,
 	pub key_backups: key_backups::Service,
@@ -46,6 +48,7 @@ impl Services<'_> {
 			+ uiaa::Data
 			+ users::Data
 			+ account_data::Data
+			+ presence::Data
 			+ globals::Data
 			+ key_backups::Data
 			+ media::Data
@@ -69,11 +72,6 @@ impl Services<'_> {
 				directory: rooms::directory::Service {
 					db,
 				},
-				edus: rooms::edus::Service {
-					presence: rooms::edus::presence::Service {
-						db,
-					},
-				},
 				event_handler: rooms::event_handler::Service,
 				lazy_loading: rooms::lazy_loading::Service {
 					db,
@@ -152,6 +150,9 @@ impl Services<'_> {
 			account_data: account_data::Service {
 				db,
 			},
+			presence: presence::Service {
+				db,
+			},
 			admin: admin::Service::build(),
 			key_backups: key_backups::Service {
 				db,

src/service/presence/mod.rs

@@ -144,8 +144,6 @@ fn process_presence_timer(user_id: &OwnedUserId) -> Result<()> {
 
 	for room_id in services().rooms.state_cache.rooms_joined(user_id) {
 		let presence_event = services()
-			.rooms
-			.edus
 			.presence
 			.get_presence(&room_id?, user_id)?;
 
@@ -168,7 +166,7 @@ fn process_presence_timer(user_id: &OwnedUserId) -> Result<()> {
 
 	if let Some(new_state) = new_state {
 		for room_id in services().rooms.state_cache.rooms_joined(user_id) {
-			services().rooms.edus.presence.set_presence(
+			services().presence.set_presence(
 				&room_id?,
 				user_id,
 				new_state.clone(),

src/service/rooms/edus/mod.rs

@@ -1,7 +0,0 @@
-pub mod presence;
-
-pub trait Data: presence::Data + 'static {}
-
-pub struct Service {
-	pub presence: presence::Service,
-}

src/service/rooms/mod.rs

@@ -1,7 +1,6 @@
 pub mod alias;
 pub mod auth_chain;
 pub mod directory;
-pub mod edus;
 pub mod event_handler;
 pub mod lazy_loading;
 pub mod metadata;
@@ -24,7 +23,6 @@ pub trait Data:
 	alias::Data
 	+ auth_chain::Data
 	+ directory::Data
-	+ edus::Data
 	+ lazy_loading::Data
 	+ metadata::Data
 	+ outlier::Data
@@ -46,7 +44,6 @@ pub struct Service {
 	pub alias: alias::Service,
 	pub auth_chain: auth_chain::Service,
 	pub directory: directory::Service,
-	pub edus: edus::Service,
 	pub event_handler: event_handler::Service,
 	pub lazy_loading: lazy_loading::Service,
 	pub metadata: metadata::Service,

src/service/sending/mod.rs

@@ -484,8 +484,6 @@ pub fn select_edus_presence(
 	// Look for presence updates in this room
 	let mut presence_updates = Vec::new();
 	for (user_id, count, presence_event) in services()
-		.rooms
-		.edus
 		.presence
 		.presence_since(room_id, since)
 	{