dolysis
/
conduwuit
mirror of https://github.com/girlbossceo/conduwuit.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dont send events from ignored users over /messages 

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-09-29 20:13:37 -04:00
parent 7a59add8f1
commit 6a81bf23de
1 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/api/client/message.rs
View File

@ -1,7 +1,11 @@
use std::collections::{BTreeMap, HashSet}; use std::collections::{BTreeMap, HashSet};
use axum::extract::State; use axum::extract::State;
use conduit::{err, utils::ReadyExt, Err, PduCount}; use conduit::{
err,
utils::{IterStream, ReadyExt},
Err, PduCount,
};
use futures::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
use ruma::{ use ruma::{
api::client::{ api::client::{
@ -9,7 +13,7 @@ use ruma::{
filter::{RoomEventFilter, UrlFilter}, filter::{RoomEventFilter, UrlFilter},
message::{get_message_events, send_message_event}, message::{get_message_events, send_message_event},
}, },
events::{MessageLikeEventType, StateEventType}, events::{MessageLikeEventType, StateEventType, TimelineEventType::*},
UserId, UserId,
}; };
use serde_json::{from_str, Value}; use serde_json::{from_str, Value};
@ -182,8 +186,30 @@ pub(crate) async fn get_message_events_route(
let events_after: Vec<_> = events_after let events_after: Vec<_> = events_after
.into_iter() .into_iter()
.map(|(_, pdu)| pdu.to_room_event()) .stream()
.collect(); .filter_map(|(_, pdu)| async move {
// list of safe and common non-state events to ignore
if matches!(
&pdu.kind,
RoomMessage
| Sticker | CallInvite
| CallNotify | RoomEncrypted
| Image | File | Audio
| Voice | Video | UnstablePollStart
| PollStart | KeyVerificationStart
| Reaction | Emote | Location
) && services
.users
.user_is_ignored(&pdu.sender, sender_user)
.await
{
return None;
}
Some(pdu.to_room_event())
})
.collect()
.await;
resp.start = from.stringify(); resp.start = from.stringify();
resp.end = next_token.map(|count| count.stringify()); resp.end = next_token.map(|count| count.stringify());
@ -203,6 +229,27 @@ pub(crate) async fn get_message_events_route(
.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| contains_url_filter(item, filter))
.filter_map(|(count, pdu)| async move {
// list of safe and common non-state events to ignore
if matches!(
&pdu.kind,
RoomMessage
| Sticker | CallInvite
| CallNotify | RoomEncrypted
| Image | File | Audio
| Voice | Video | UnstablePollStart
| PollStart | KeyVerificationStart
| Reaction | Emote | Location
) && services
.users
.user_is_ignored(&pdu.sender, sender_user)
.await
{
return None;
}
Some((count, pdu))
})
.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)
@ -243,17 +290,20 @@ pub(crate) async fn get_message_events_route(
}, },
} }
resp.state = Vec::new(); resp.state = lazy_loaded
for ll_id in &lazy_loaded { .iter()
if let Ok(member_event) = services .stream()
.rooms .filter_map(|ll_user_id| async move {
.state_accessor services
.room_state_get(room_id, &StateEventType::RoomMember, ll_id.as_str()) .rooms
.await .state_accessor
{ .room_state_get(room_id, &StateEventType::RoomMember, ll_user_id.as_str())
resp.state.push(member_event.to_state_event()); .await
} .map(|member_event| member_event.to_state_event())
} .ok()
})
.collect()
.await;
// remove the feature check when we are sure clients like element can handle it // remove the feature check when we are sure clients like element can handle it
if !cfg!(feature = "element_hacks") { if !cfg!(feature = "element_hacks") {