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

dont send push notif if user has ignored sender

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-12-16 20:01:07 -05:00
parent 5813419f4b
commit 549eb1609f
No known key found for this signature in database
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/service/rooms/timeline/mod.rs
View file

@ -404,7 +404,7 @@ impl Service {
.state_accessor .state_accessor
.room_state_get_content(&pdu.room_id, &StateEventType::RoomPowerLevels, "") .room_state_get_content(&pdu.room_id, &StateEventType::RoomPowerLevels, "")
.await .await
.map_err(|_| err!(Database("invalid m.room.power_levels event"))) .map_err(|e| err!(Database("invalid m.room.power_levels event in database: {e}")))
.unwrap_or_default(); .unwrap_or_default();
let sync_pdu = pdu.to_sync_room_event(); let sync_pdu = pdu.to_sync_room_event();
@ -414,7 +414,14 @@ impl Service {
.state_cache .state_cache
.active_local_users_in_room(&pdu.room_id) .active_local_users_in_room(&pdu.room_id)
// Don't notify the sender of their own events // Don't notify the sender of their own events
.ready_filter(|user| user != &pdu.sender) .ready_filter(|target_user| target_user != &pdu.sender)
// don't notify other users of an event if they ignored said user from the event
.filter_map(|target_user| async move {
(!self
.services
.users
.user_is_ignored(&pdu.sender, target_user).await).then_some(target_user)
})
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
@ -426,7 +433,13 @@ impl Service {
if let Some(state_key) = &pdu.state_key { if let Some(state_key) = &pdu.state_key {
let target_user_id = UserId::parse(state_key.clone())?; let target_user_id = UserId::parse(state_key.clone())?;
if self.services.users.is_active_local(&target_user_id).await { if self.services.users.is_active_local(&target_user_id).await
&& !self
.services
.users
.user_is_ignored(&pdu.sender, &target_user_id)
.await
{
push_target.insert(target_user_id); push_target.insert(target_user_id);
} }
} }