fix: room list over federation

Cargo.lock

@@ -1635,7 +1635,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.0.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "ruma-api",
  "ruma-appservice-api",
@@ -1651,7 +1651,7 @@ dependencies = [
 [[package]]
 name = "ruma-api"
 version = "0.17.0-alpha.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "http",
  "percent-encoding",
@@ -1666,7 +1666,7 @@ dependencies = [
 [[package]]
 name = "ruma-api-macros"
 version = "0.17.0-alpha.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1677,7 +1677,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.2.0-alpha.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "ruma-api",
  "ruma-common",
@@ -1690,7 +1690,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.10.0-alpha.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "assign",
  "http",
@@ -1709,7 +1709,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.2.0"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "js_int",
  "ruma-api",
@@ -1723,7 +1723,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.22.0-alpha.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -1738,7 +1738,7 @@ dependencies = [
 [[package]]
 name = "ruma-events-macros"
 version = "0.22.0-alpha.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1749,7 +1749,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.0.3"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "js_int",
  "ruma-api",
@@ -1764,7 +1764,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers"
 version = "0.17.4"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "rand",
  "ruma-identifiers-macros",
@@ -1776,7 +1776,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-macros"
 version = "0.17.4"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1787,7 +1787,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.1.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "serde",
  "strum",
@@ -1796,7 +1796,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde"
 version = "0.2.3"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "form_urlencoded",
  "itoa",
@@ -1808,7 +1808,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.6.0-dev.1"
-source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#088382dbdc176e61fa5bde679ae38093865e7053"
 dependencies = [
  "base64",
  "ring",

src/client_server/directory.rs

@@ -14,6 +14,7 @@ use ruma::{
         },
         federation,
     },
+    directory::RoomNetwork,
     directory::{IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk},
     events::{
         room::{avatar, canonical_alias, guest_access, history_visibility, name, topic},
@@ -33,24 +34,13 @@ pub async fn get_public_rooms_filtered_route(
     db: State<'_, Database>,
     body: Ruma<get_public_rooms_filtered::Request<'_>>,
 ) -> ConduitResult<get_public_rooms_filtered::Response> {
-    let Ruma {
-        body:
-            get_public_rooms_filtered::IncomingRequest {
-                limit,
-                server,
-                since,
-                filter,
-                room_network,
-            },
-        ..
-    } = body;
     get_public_rooms_filtered_helper(
         &db,
-        server.as_deref(),
-        limit,
-        since.as_deref(),
-        filter,             // This is not used yet
-        Some(room_network), // This is not used
+        body.server.as_deref(),
+        body.limit,
+        body.since.as_deref(),
+        &body.filter,
+        &body.room_network,
     )
     .await
 }
@@ -68,8 +58,8 @@ pub async fn get_public_rooms_route(
         body.server.as_deref(),
         body.limit,
         body.since.as_deref(),
-        None, // This is not used
-        None, // This is not used
+        &IncomingFilter::default(),
+        &IncomingRoomNetwork::Matrix,
     )
     .await?
     .0;
@@ -122,8 +112,8 @@ pub async fn get_public_rooms_filtered_helper(
     server: Option<&ServerName>,
     limit: Option<js_int::UInt>,
     since: Option<&str>,
-    _filter: Option<IncomingFilter>,
-    _network: Option<IncomingRoomNetwork>,
+    _filter: &IncomingFilter,
+    _network: &IncomingRoomNetwork,
 ) -> ConduitResult<get_public_rooms_filtered::Response> {
     if let Some(other_server) = server
         .clone()
@@ -135,7 +125,7 @@ pub async fn get_public_rooms_filtered_helper(
             federation::directory::get_public_rooms::v1::Request {
                 limit,
                 since: since.as_deref(),
-                room_network: ruma::directory::RoomNetwork::Matrix,
+                room_network: RoomNetwork::Matrix,
             },
         )
         .await?;

src/server_server.rs

@@ -2,8 +2,8 @@ use crate::{client_server, ConduitResult, Database, Error, PduEvent, Result, Rum
 use http::header::{HeaderValue, AUTHORIZATION};
 use rocket::{get, post, put, response::content::Json, State};
 use ruma::{
+    api::federation::directory::get_public_rooms_filtered,
     api::{
-        client,
         federation::{
             directory::get_public_rooms,
             discovery::{
@@ -13,6 +13,7 @@ use ruma::{
         },
         OutgoingRequest,
     },
+    directory::{IncomingFilter, IncomingRoomNetwork},
     EventId, ServerName,
 };
 use serde_json::json;
@@ -209,38 +210,24 @@ pub fn get_server_keys_deprecated(db: State<'_, Database>) -> Json<String> {
     feature = "conduit_bin",
     post("/_matrix/federation/v1/publicRooms", data = "<body>")
 )]
-pub async fn get_public_rooms_route(
+pub async fn get_public_rooms_filtered_route(
     db: State<'_, Database>,
-    body: Ruma<get_public_rooms::v1::Request<'_>>,
-) -> ConduitResult<get_public_rooms::v1::Response> {
-    let Ruma {
-        body:
-            get_public_rooms::v1::IncomingRequest {
-                room_network: _room_network, // TODO
-                limit,
-                since,
-            },
-        ..
-    } = body;
-
-    let client::r0::directory::get_public_rooms_filtered::Response {
-        chunk,
-        prev_batch,
-        next_batch,
-        total_room_count_estimate,
-    } = client_server::get_public_rooms_filtered_helper(
+    body: Ruma<get_public_rooms_filtered::v1::Request<'_>>,
+) -> ConduitResult<get_public_rooms_filtered::v1::Response> {
+    let response = client_server::get_public_rooms_filtered_helper(
         &db,
         None,
-        limit,
-        since.as_deref(),
-        None,
-        Some(ruma::directory::IncomingRoomNetwork::Matrix),
+        body.limit,
+        body.since.as_deref(),
+        &body.filter,
+        &body.room_network,
     )
     .await?
     .0;
 
-    Ok(get_public_rooms::v1::Response {
-        chunk: chunk
+    Ok(get_public_rooms_filtered::v1::Response {
+        chunk: response
+            .chunk
             .into_iter()
             .map(|c| {
                 // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
@@ -255,9 +242,52 @@ pub async fn get_public_rooms_route(
             })
             .filter_map(|r| r.ok())
             .collect(),
-        prev_batch,
-        next_batch,
-        total_room_count_estimate,
+        prev_batch: response.prev_batch,
+        next_batch: response.next_batch,
+        total_room_count_estimate: response.total_room_count_estimate,
+    }
+    .into())
+}
+
+#[cfg_attr(
+    feature = "conduit_bin",
+    get("/_matrix/federation/v1/publicRooms", data = "<body>")
+)]
+pub async fn get_public_rooms_route(
+    db: State<'_, Database>,
+    body: Ruma<get_public_rooms::v1::Request<'_>>,
+) -> ConduitResult<get_public_rooms::v1::Response> {
+    let response = client_server::get_public_rooms_filtered_helper(
+        &db,
+        None,
+        body.limit,
+        body.since.as_deref(),
+        &IncomingFilter::default(),
+        &IncomingRoomNetwork::Matrix,
+    )
+    .await?
+    .0;
+
+    Ok(get_public_rooms::v1::Response {
+        chunk: response
+            .chunk
+            .into_iter()
+            .map(|c| {
+                // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
+                // to ruma::api::client::r0::directory::PublicRoomsChunk
+                Ok::<_, Error>(
+                    serde_json::from_str(
+                        &serde_json::to_string(&c)
+                            .expect("PublicRoomsChunk::to_string always works"),
+                    )
+                    .expect("federation and client-server PublicRoomsChunk are the same type"),
+                )
+            })
+            .filter_map(|r| r.ok())
+            .collect(),
+        prev_batch: response.prev_batch,
+        next_batch: response.next_batch,
+        total_room_count_estimate: response.total_room_count_estimate,
     }
     .into())
 }