magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apply room event filter to messages endpoint (#596)

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-27 01:48:57 +00:00
parent d281b8d3ae
commit 5e6dbaa27f
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/api/client/message.rs
View file

@ -9,13 +9,13 @@ use conduit::{
use futures::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
use ruma::{ use ruma::{
api::client::{ api::client::{
filter::{RoomEventFilter, UrlFilter}, filter::RoomEventFilter,
message::{get_message_events, send_message_event}, message::{get_message_events, send_message_event},
}, },
events::{MessageLikeEventType, StateEventType, TimelineEventType::*}, events::{MessageLikeEventType, StateEventType, TimelineEventType::*},
UserId, UserId,
}; };
use serde_json::{from_str, Value}; use serde_json::from_str;
use service::rooms::timeline::PdusIterItem; use service::rooms::timeline::PdusIterItem;
use crate::{ use crate::{
@ -151,7 +151,7 @@ pub(crate) async fn get_message_events_route(
.timeline .timeline
.pdus_after(sender_user, room_id, from) .pdus_after(sender_user, room_id, from)
.await? .await?
.ready_filter_map(|item| contains_url_filter(item, filter)) .ready_filter_map(|item| event_filter(item, filter))
.filter_map(|item| visibility_filter(&services, item, sender_user)) .filter_map(|item| visibility_filter(&services, item, sender_user))
.ready_take_while(|(count, _)| Some(*count) != to) // Stop at `to` .ready_take_while(|(count, _)| Some(*count) != to) // Stop at `to`
.take(limit) .take(limit)
@ -225,7 +225,7 @@ pub(crate) async fn get_message_events_route(
.timeline .timeline
.pdus_until(sender_user, room_id, from) .pdus_until(sender_user, room_id, from)
.await? .await?
.ready_filter_map(|item| contains_url_filter(item, filter)) .ready_filter_map(|item| event_filter(item, filter))
.filter_map(|(count, pdu)| async move { .filter_map(|(count, pdu)| async move {
// list of safe and common non-state events to ignore // list of safe and common non-state events to ignore
if matches!( if matches!(
@ -329,19 +329,7 @@ async fn visibility_filter(services: &Services, item: PdusIterItem, user_id: &Us
.then_some(item) .then_some(item)
} }
fn contains_url_filter(item: PdusIterItem, filter: &RoomEventFilter) -> Option<PdusIterItem> { fn event_filter(item: PdusIterItem, filter: &RoomEventFilter) -> Option<PdusIterItem> {
let (_, pdu) = &item; let (_, pdu) = &item;
pdu.matches(filter).then_some(item)
if filter.url_filter.is_none() {
return Some(item);
}
let content: Value = from_str(pdu.content.get()).unwrap();
let res = match filter.url_filter {
Some(UrlFilter::EventsWithoutUrl) => !content["url"].is_string(),
Some(UrlFilter::EventsWithUrl) => content["url"].is_string(),
None => true,
};
res.then_some(item)
} }