Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(search): filter on channels correctly (#5110)

teo104d0aa6ae30
diff --git a/crates/search_service/src/api/search/channel.rs b/crates/search_service/src/api/search/channel.rs
index bfdce01cef..b1b2a563b2 100644
--- a/crates/search_service/src/api/search/channel.rs
+++ b/crates/search_service/src/api/search/channel.rs
@@ -424,6 +424,24 @@ pub async fn handler(
if filters.channel_ids.is_empty() {
return Err(SearchError::NoChannelIds);
}
+
+ let channel_ids = simple_channel::filter_channels(
+ &ctx,
+ user_id.as_ref(),
+ authorization.user_context.organization_id,
+ &filters,
+ )
+ .await?
+ .channel_ids;
+
+ if channel_ids.is_empty() {
+ return Ok(Json(ChannelSearchResponse {
+ results: vec![],
+ next_cursor: None,
+ total_count: 0,
+ }));
+ }
+
let sort_mode = match req.sort {
ChannelSortTimestamp::Message => ChannelSortMode::Message,
ChannelSortTimestamp::Thread => ChannelSortMode::Thread,
@@ -435,7 +453,7 @@ pub async fn handler(
match_type: req.match_type.to_string(),
cursor: cursor_option,
terms,
- channel_ids: filters.channel_ids,
+ channel_ids: channel_ids.into_iter().map(|id| id.to_string()).collect(),
thread_ids: filters.thread_ids,
mentions: filters.mentions,
sender_ids: filters.sender_ids,