git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-12 09:16:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement senders and not_senders filters on /messages

Browse source
This commit is contained in:
Benjamin Lee 2024-05-02 18:53:18 -07:00
parent a11550cdf1
commit fa8d4ebe96
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/utils/filter.rs
View file

@ -16,7 +16,7 @@ use std::{collections::HashSet, hash::Hash};
use ruma::{ use ruma::{
api::client::filter::{RoomEventFilter, UrlFilter}, api::client::filter::{RoomEventFilter, UrlFilter},
RoomId, RoomId, UserId,
}; };
use crate::{Error, PduEvent}; use crate::{Error, PduEvent};
@ -63,6 +63,7 @@ impl<'a, T: ?Sized + Hash + PartialEq + Eq> AllowDenyList<'a, T> {
pub(crate) struct CompiledRoomEventFilter<'a> { pub(crate) struct CompiledRoomEventFilter<'a> {
rooms: AllowDenyList<'a, RoomId>, rooms: AllowDenyList<'a, RoomId>,
senders: AllowDenyList<'a, UserId>,
url_filter: Option<UrlFilter>, url_filter: Option<UrlFilter>,
} }
@ -72,6 +73,7 @@ impl<'a> TryFrom<&'a RoomEventFilter> for CompiledRoomEventFilter<'a> {
fn try_from(source: &'a RoomEventFilter) -> Result<CompiledRoomEventFilter<'a>, Error> { fn try_from(source: &'a RoomEventFilter) -> Result<CompiledRoomEventFilter<'a>, Error> {
Ok(CompiledRoomEventFilter { Ok(CompiledRoomEventFilter {
rooms: AllowDenyList::from_slices(source.rooms.as_deref(), &source.not_rooms), rooms: AllowDenyList::from_slices(source.rooms.as_deref(), &source.not_rooms),
senders: AllowDenyList::from_slices(source.senders.as_deref(), &source.not_senders),
url_filter: source.url_filter, url_filter: source.url_filter,
}) })
} }
@ -89,13 +91,16 @@ impl CompiledRoomEventFilter<'_> {
/// Returns `true` if a PDU event is allowed by the filter. /// Returns `true` if a PDU event is allowed by the filter.
/// ///
/// This tests against the `url_filter` field. /// This tests against the `senders`, `not_senders`, and `url_filter`
/// fields.
/// ///
/// This does *not* check whether the event's room is allowed. It is /// This does *not* check whether the event's room is allowed. It is
/// expected that callers have already filtered out rejected rooms using /// expected that callers have already filtered out rejected rooms using
/// [`CompiledRoomEventFilter::room_allowed`] and /// [`CompiledRoomEventFilter::room_allowed`] and
/// [`CompiledRoomFilter::room_allowed`]. /// [`CompiledRoomFilter::room_allowed`].
pub(crate) fn pdu_event_allowed(&self, pdu: &PduEvent) -> bool { self.allowed_by_url_filter(pdu) } pub(crate) fn pdu_event_allowed(&self, pdu: &PduEvent) -> bool {
self.senders.allowed(&pdu.sender) && self.allowed_by_url_filter(pdu)
}
fn allowed_by_url_filter(&self, pdu: &PduEvent) -> bool { fn allowed_by_url_filter(&self, pdu: &PduEvent) -> bool {
let Some(filter) = self.url_filter else { let Some(filter) = self.url_filter else {