messing with trait objects

src/api/client_server/membership.rs

@@ -481,7 +481,7 @@ async fn join_room_by_id_helper(
         let (make_join_response, remote_server) = make_join_response_and_server?;
 
         let room_version = match make_join_response.room_version {
-            Some(room_version) if services().rooms.metadata.is_supported_version(&room_version) => room_version,
+            Some(room_version) if services().globals.supported_room_versions().contains(&room_version) => room_version,
             _ => return Err(Error::BadServerResponse("Room version is not supported")),
         };
 
@@ -568,7 +568,7 @@ async fn join_room_by_id_helper(
         let mut state = HashMap::new();
         let pub_key_map = RwLock::new(BTreeMap::new());
 
-        server_server::fetch_join_signing_keys(
+        services().rooms.event_handler.fetch_join_signing_keys(
             &send_join_response,
             &room_version,
             &pub_key_map,
@@ -1048,7 +1048,7 @@ async fn remote_leave_room(
     let (make_leave_response, remote_server) = make_leave_response_and_server?;
 
     let room_version_id = match make_leave_response.room_version {
-        Some(version) if services().rooms.is_supported_version(&version) => version,
+        Some(version) if services().globals.supported_room_versions().contains(&version) => version,
         _ => return Err(Error::BadServerResponse("Room version is not supported")),
     };
 

src/api/client_server/room.rs

@@ -99,7 +99,7 @@ pub async fn create_room_route(
 
     let room_version = match body.room_version.clone() {
         Some(room_version) => {
-            if services().rooms.is_supported_version(&services(), &room_version) {
+            if services().globals.supported_room_versions().contains(&room_version) {
                 room_version
             } else {
                 return Err(Error::BadRequest(
@@ -470,7 +470,7 @@ pub async fn upgrade_room_route(
 ) -> Result<upgrade_room::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services().rooms.is_supported_version(&body.new_version) {
+    if !services().globals.supported_room_versions().contains(&body.new_version) {
         return Err(Error::BadRequest(
             ErrorKind::UnsupportedRoomVersion,
             "This server does not support that room version.",

src/api/client_server/sync.rs

@@ -175,7 +175,7 @@ async fn sync_helper(
     services().rooms.edus.presence.ping_presence(&sender_user)?;
 
     // Setup watchers, so if there's no response, we can wait for them
-    let watcher = services().watch(&sender_user, &sender_device);
+    let watcher = services().globals.db.watch(&sender_user, &sender_device);
 
     let next_batch = services().globals.current_count()?;
     let next_batch_string = next_batch.to_string();