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

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

src/api/client_server/presence.rs

@@ -19,7 +19,7 @@ pub async fn set_presence_route(body: Ruma<set_presence::v3::Request>) -> Result
 	for room_id in services().rooms.state_cache.rooms_joined(sender_user) {
 		let room_id = room_id?;
 
-		services().rooms.edus.presence.set_presence(
+		services().presence.set_presence(
 			&room_id,
 			sender_user,
 			body.presence.clone(),
@@ -54,8 +54,6 @@ pub async fn get_presence_route(body: Ruma<get_presence::v3::Request>) -> Result
 		let room_id = room_id?;
 
 		if let Some(presence) = services()
-			.rooms
-			.edus
 			.presence
 			.get_presence(&room_id, sender_user)?
 		{

src/api/client_server/profile.rs

@@ -88,8 +88,6 @@ pub async fn set_displayname_route(
 	if services().globals.allow_local_presence() {
 		// Presence update
 		services()
-			.rooms
-			.edus
 			.presence
 			.ping_presence(sender_user, PresenceState::Online)?;
 	}
@@ -229,8 +227,6 @@ pub async fn set_avatar_url_route(body: Ruma<set_avatar_url::v3::Request>) -> Re
 	if services().globals.allow_local_presence() {
 		// Presence update
 		services()
-			.rooms
-			.edus
 			.presence
 			.ping_presence(sender_user, PresenceState::Online)?;
 	}

src/api/client_server/sync.rs

@@ -173,8 +173,6 @@ async fn sync_helper(
 	// Presence update
 	if services().globals.allow_local_presence() {
 		services()
-			.rooms
-			.edus
 			.presence
 			.ping_presence(&sender_user, body.set_presence)?;
 	}
@@ -531,8 +529,6 @@ async fn process_room_presence_updates(
 ) -> Result<()> {
 	// Take presence updates from this room
 	for (user_id, _, presence_event) in services()
-		.rooms
-		.edus
 		.presence
 		.presence_since(room_id, since)
 	{

src/api/server_server.rs

@@ -339,7 +339,7 @@ pub async fn send_transaction_message_route(
 
 				for update in presence.push {
 					for room_id in services().rooms.state_cache.rooms_joined(&update.user_id) {
-						services().rooms.edus.presence.set_presence(
+						services().presence.set_presence(
 							&room_id?,
 							&update.user_id,
 							update.presence.clone(),