diff --git a/cli/src/main.rs b/cli/src/main.rs index c9e77cf97a116e6bbb07755bb3749c64e55f55b7..0639df5b93939acce3ef13f6a8269176d2c8f046 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1857,6 +1857,7 @@ async fn run() -> Result<()> { None => None, }, limit: Some(limit), + room: None, }], ) .await?; diff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs index a8b960491de845fa876da7ad9bd3204766ff4999..3f5d5ced73a7d8d6ba941bdfa53e5c076e32ebca 100644 --- a/server/src/api/rpc.rs +++ b/server/src/api/rpc.rs @@ -80,6 +80,7 @@ fn rpc_feed( requested_since: Option, implicit_anchor: Option<(usize, i64)>, limit: usize, + room_filter: Option<&str>, ) -> FeedResponse { let since = requested_since.or_else(|| implicit_anchor.map(|(_, ts)| ts)); let implicit_anchor_index = requested_since @@ -104,6 +105,11 @@ fn rpc_feed( .map(|(_, id)| id.as_str()) .filter(|id| { reduced.ingests_by_id.get(*id).is_some_and(|ing| { + if let Some(room) = room_filter { + if ing.room_id != room { + return false; + } + } let scope = scope_from_room_wire(&ing.room_id); can_view_scope(reduced, &scope, Some(viewer)) }) @@ -1799,6 +1805,7 @@ pub async fn dispatch_rpc(state: &AppState, headers: &HeaderMap, cmd: RpcCommand delegate, since, limit, + room, } => { const DEFAULT_LIMIT: usize = 50; const MAX_LIMIT: usize = 200; @@ -1806,6 +1813,11 @@ pub async fn dispatch_rpc(state: &AppState, headers: &HeaderMap, cmd: RpcCommand match verify_bearer_principal(&headers, &reduced) { Err((_, m)) => line_err(m, None), Ok(viewer) => { + let room_filter = room + .as_deref() + .map(str::trim) + .filter(|s| !s.is_empty()) + .map(|s| reduced.resolve_room_id(s).unwrap_or_else(|| s.to_string())); let delegate_parsed: Option> = delegate .as_deref() .map(str::trim) @@ -1845,6 +1857,7 @@ pub async fn dispatch_rpc(state: &AppState, headers: &HeaderMap, cmd: RpcCommand since, implicit_anchor, limit, + room_filter.as_deref(), ))) }; drop(reduced); @@ -1869,6 +1882,7 @@ pub async fn dispatch_rpc(state: &AppState, headers: &HeaderMap, cmd: RpcCommand since, implicit_anchor, limit, + room_filter.as_deref(), ))); drop(reduced); line diff --git a/server/src/mcp/mod.rs b/server/src/mcp/mod.rs index 7fa8b49bed7af440889af646e142e86c8e5a9c2b..4f77424e7b2e922cbd19814d1715807a7c67d972 100644 --- a/server/src/mcp/mod.rs +++ b/server/src/mcp/mod.rs @@ -1295,12 +1295,13 @@ async fn read_room(state: &AppState, headers: &HeaderMap, args: &Value) -> Value delegate: None, since: Some(0), limit: Some(40), + room: Some(room_id.clone()), }, ) .await { Ok(RpcResult::Feed(feed)) => { - feed_posts_json(state, feed.posts.into_iter().filter(|p| p.room == room_id)).await + feed_posts_json(state, feed.posts).await } Ok(_) => json!([]), Err((e, h)) => return write_rpc_err(e, h), @@ -1347,17 +1348,13 @@ async fn get_feed(state: &AppState, headers: &HeaderMap, args: &Value) -> Value delegate: delegate.clone(), since, limit, + room: room_filter.clone(), }, ) .await { Ok(RpcResult::Feed(feed)) => { - let posts = match room_filter.as_deref() { - Some(room) => { - feed_posts_json(state, feed.posts.into_iter().filter(|p| p.room == room)).await - } - None => feed_posts_json(state, feed.posts).await, - }; + let posts = feed_posts_json(state, feed.posts).await; tool_ok( json!({ "posts": posts, diff --git a/types/src/lib.rs b/types/src/lib.rs index f0ebf477451b300e83a96a1249064ec42c21e775..04948b0d753134bc3d4a1694666b7b90dadb22a5 100644 --- a/types/src/lib.rs +++ b/types/src/lib.rs @@ -520,6 +520,11 @@ pub enum RpcCommand { since: Option, #[serde(default)] limit: Option, + /// When set, only posts in this room (`"public"` or a private room id). + /// The filter applies before the limit, so `total` counts matching + /// posts in that room only. + #[serde(default, skip_serializing_if = "Option::is_none")] + room: Option, }, /// Remove the author's post from the garden and replace the body with a tombstone in the thread. PostRedact {