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

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

src/database/key_value/mod.rs

@@ -5,6 +5,7 @@ mod globals;
 mod key_backups;
 mod media;
 //mod pdu;
+mod presence;
 mod pusher;
 mod rooms;
 mod sending;

src/database/key_value/presence.rs

@@ -5,13 +5,13 @@ use tracing::error;
 
 use crate::{
 	database::KeyValueDatabase,
-	service::{self, rooms::edus::presence::Presence},
+	service::{self, presence::Presence},
 	services,
 	utils::{self, user_id_from_bytes},
 	Error, Result,
 };
 
-impl service::rooms::edus::presence::Data for KeyValueDatabase {
+impl service::presence::Data for KeyValueDatabase {
 	fn get_presence(&self, room_id: &RoomId, user_id: &UserId) -> Result<Option<PresenceEvent>> {
 		let key = presence_key(room_id, user_id);
 

src/database/key_value/rooms/edus/mod.rs

@@ -1,5 +0,0 @@
-mod presence;
-
-use crate::{database::KeyValueDatabase, service};
-
-impl service::rooms::edus::Data for KeyValueDatabase {}

src/database/key_value/rooms/mod.rs

@@ -1,7 +1,6 @@
 mod alias;
 mod auth_chain;
 mod directory;
-mod edus;
 mod lazy_load;
 mod metadata;
 mod outlier;

src/database/mod.rs

@@ -35,7 +35,7 @@ use tokio::{
 use tracing::{debug, error, info, warn};
 
 use crate::{
-	service::rooms::{edus::presence::presence_handler, timeline::PduCount},
+	service::{presence::presence_handler, rooms::timeline::PduCount},
 	services, utils, Config, Error, PduEvent, Result, Services, SERVICES,
 };