Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: Invert pending_invite_state check

Browse Source
This commit is contained in:
timedout
2026-02-15 16:11:19 +00:00
committed by Jade Ellis
parent 81b984b2cc
commit cb846a3ad1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service/rooms/event_handler/handle_incoming_pdu.rs
+5 -6
View File
@@ -63,20 +63,19 @@ async fn should_rescind_invite(
for event in pending_invite_state { for event in pending_invite_state {
if event if event
.get_field::<String>("type")? .get_field::<String>("type")?
.is_none_or(|t| t != "m.room.member") .is_some_and(|t| t == "m.room.member")
|| event || event
.get_field::<OwnedUserId>("state_key")? .get_field::<OwnedUserId>("state_key")?
.is_none_or(|s| s != *target_user_id) .is_some_and(|s| s == *target_user_id)
|| event || event
.get_field::<OwnedUserId>("sender")? .get_field::<OwnedUserId>("sender")?
.is_none_or(|s| s != *sender) .is_some_and(|s| s == *sender)
|| event || event
.get_field::<RoomMemberEventContent>("content")? .get_field::<RoomMemberEventContent>("content")?
.is_none_or(|c| c.membership != MembershipState::Invite) .is_some_and(|c| c.membership == MembershipState::Invite)
{ {
continue; return Ok(Some(pdu_event));
} }
return Ok(Some(pdu_event)); // Found a pending invite, so this is a rescind
} }
Ok(None) Ok(None)