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 room.state.(not_)rooms filter on /sync

Browse source
This commit is contained in:
Benjamin Lee 2024-05-03 17:09:19 -07:00
parent 8b43336487
commit 4b6e2fae52
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
2 changed files with 111 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

218
src/api/client_server/sync.rs
View file

@ -351,7 +351,11 @@ async fn sync_helper(
} }
}; };
if !services().rooms.metadata.exists(&room_id)? { let state = if !compiled_filter.room.state.room_allowed(&room_id) {
State {
events: vec![],
}
} else if !services().rooms.metadata.exists(&room_id)? {
// This is just a rejected invite, not a room we know // This is just a rejected invite, not a room we know
// Insert a leave event anyways // Insert a leave event anyways
let event = PduEvent { let event = PduEvent {
@ -377,90 +381,84 @@ async fn sync_helper(
signatures: None, signatures: None,
}; };
left_rooms.insert( State {
room_id.into_owned(), events: vec![event.to_sync_state_event()],
LeftRoom { }
account_data: RoomAccountData { } else {
events: Vec::new(), let mut left_state_events = Vec::new();
},
timeline,
state: State {
events: vec![event.to_sync_state_event()],
},
},
);
continue;
}
let mut left_state_events = Vec::new(); let since_shortstatehash = services()
.rooms
.user
.get_token_shortstatehash(&room_id, since)?;
let since_shortstatehash = services() let since_state_ids = match since_shortstatehash {
.rooms Some(s) => services().rooms.state_accessor.state_full_ids(s).await?,
.user None => HashMap::new(),
.get_token_shortstatehash(&room_id, since)?; };
let since_state_ids = match since_shortstatehash { let Some(left_event_id) = services().rooms.state_accessor.room_state_get_id(
Some(s) => services().rooms.state_accessor.state_full_ids(s).await?, &room_id,
None => HashMap::new(), &StateEventType::RoomMember,
}; sender_user.as_str(),
)?
else {
error!("Left room but no left state event");
continue;
};
let Some(left_event_id) = services().rooms.state_accessor.room_state_get_id( let Some(left_shortstatehash) = services()
&room_id, .rooms
&StateEventType::RoomMember, .state_accessor
sender_user.as_str(), .pdu_shortstatehash(&left_event_id)?
)? else {
else { error!("Leave event has no state");
error!("Left room but no left state event"); continue;
continue; };
};
let Some(left_shortstatehash) = services() let mut left_state_ids = services()
.rooms .rooms
.state_accessor .state_accessor
.pdu_shortstatehash(&left_event_id)? .state_full_ids(left_shortstatehash)
else { .await?;
error!("Leave event has no state");
continue;
};
let mut left_state_ids = services() let leave_shortstatekey = services()
.rooms .rooms
.state_accessor .short
.state_full_ids(left_shortstatehash) .get_or_create_shortstatekey(&StateEventType::RoomMember, sender_user.as_str())?;
.await?;
let leave_shortstatekey = services() left_state_ids.insert(leave_shortstatekey, left_event_id);
.rooms
.short
.get_or_create_shortstatekey(&StateEventType::RoomMember, sender_user.as_str())?;
left_state_ids.insert(leave_shortstatekey, left_event_id); let mut i = 0;
for (key, id) in left_state_ids {
if full_state || since_state_ids.get(&key) != Some(&id) {
let (event_type, state_key) = services().rooms.short.get_statekey_from_short(key)?;
let mut i = 0; if !lazy_load_enabled
for (key, id) in left_state_ids { || event_type != StateEventType::RoomMember
if full_state || since_state_ids.get(&key) != Some(&id) { || full_state
let (event_type, state_key) = services().rooms.short.get_statekey_from_short(key)?; // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
|| (cfg!(feature = "element_hacks") && *sender_user == state_key)
{
let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
error!("Pdu in state not found: {}", id);
continue;
};
if !lazy_load_enabled left_state_events.push(pdu.to_sync_state_event());
|| event_type != StateEventType::RoomMember
|| full_state
// TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
|| (cfg!(feature = "element_hacks") && *sender_user == state_key)
{
let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
error!("Pdu in state not found: {}", id);
continue;
};
left_state_events.push(pdu.to_sync_state_event()); i += 1;
if i % 100 == 0 {
i += 1; tokio::task::yield_now().await;
if i % 100 == 0 { }
tokio::task::yield_now().await;
} }
} }
} }
}
State {
events: left_state_events,
}
};
left_rooms.insert( left_rooms.insert(
room_id.into_owned(), room_id.into_owned(),
@ -469,9 +467,7 @@ async fn sync_helper(
events: Vec::new(), events: Vec::new(),
}, },
timeline, timeline,
state: State { state,
events: left_state_events,
},
}, },
); );
} }
@ -727,6 +723,8 @@ async fn load_joined_room(
.user .user
.get_token_shortstatehash(room_id, since)?; .get_token_shortstatehash(room_id, since)?;
let skip_state_events = !filter.room.state.room_allowed(room_id);
let (heroes, joined_member_count, invited_member_count, joined_since_last_sync, state_events) = let (heroes, joined_member_count, invited_member_count, joined_since_last_sync, state_events) =
if timeline_pdus.is_empty() && since_shortstatehash == Some(current_shortstatehash) { if timeline_pdus.is_empty() && since_shortstatehash == Some(current_shortstatehash) {
// No state changes // No state changes
@ -827,44 +825,46 @@ async fn load_joined_room(
let mut state_events = Vec::new(); let mut state_events = Vec::new();
let mut lazy_loaded = HashSet::new(); let mut lazy_loaded = HashSet::new();
let mut i = 0; if !skip_state_events {
for (shortstatekey, id) in current_state_ids { let mut i = 0;
let (event_type, state_key) = services() for (shortstatekey, id) in current_state_ids {
.rooms let (event_type, state_key) = services()
.short .rooms
.get_statekey_from_short(shortstatekey)?; .short
.get_statekey_from_short(shortstatekey)?;
if event_type != StateEventType::RoomMember { if event_type != StateEventType::RoomMember {
let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else { let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
error!("Pdu in state not found: {}", id); error!("Pdu in state not found: {}", id);
continue; continue;
}; };
state_events.push(pdu); state_events.push(pdu);
i += 1; i += 1;
if i % 100 == 0 { if i % 100 == 0 {
tokio::task::yield_now().await; tokio::task::yield_now().await;
} }
} else if !lazy_load_enabled } else if !lazy_load_enabled
|| full_state || full_state
|| timeline_users.contains(&state_key) || timeline_users.contains(&state_key)
// TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565 // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
|| (cfg!(feature = "element_hacks") && *sender_user == state_key) || (cfg!(feature = "element_hacks") && *sender_user == state_key)
{ {
let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else { let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
error!("Pdu in state not found: {}", id); error!("Pdu in state not found: {}", id);
continue; continue;
}; };
// This check is in case a bad user ID made it into the database // This check is in case a bad user ID made it into the database
if let Ok(uid) = UserId::parse(&state_key) { if let Ok(uid) = UserId::parse(&state_key) {
lazy_loaded.insert(uid); lazy_loaded.insert(uid);
} }
state_events.push(pdu); state_events.push(pdu);
i += 1; i += 1;
if i % 100 == 0 { if i % 100 == 0 {
tokio::task::yield_now().await; tokio::task::yield_now().await;
}
} }
} }
} }
@ -891,7 +891,7 @@ async fn load_joined_room(
let mut state_events = Vec::new(); let mut state_events = Vec::new();
let mut lazy_loaded = HashSet::new(); let mut lazy_loaded = HashSet::new();
if since_shortstatehash != current_shortstatehash { if !skip_state_events && since_shortstatehash != current_shortstatehash {
let current_state_ids = services() let current_state_ids = services()
.rooms .rooms
.state_accessor .state_accessor

2
src/utils/filter.rs
View file

@ -137,6 +137,7 @@ pub(crate) struct CompiledFilterDefinition<'a> {
pub(crate) struct CompiledRoomFilter<'a> { pub(crate) struct CompiledRoomFilter<'a> {
rooms: AllowDenyList<'a, RoomId>, rooms: AllowDenyList<'a, RoomId>,
pub(crate) timeline: CompiledRoomEventFilter<'a>, pub(crate) timeline: CompiledRoomEventFilter<'a>,
pub(crate) state: CompiledRoomEventFilter<'a>,
} }
pub(crate) struct CompiledRoomEventFilter<'a> { pub(crate) struct CompiledRoomEventFilter<'a> {
@ -167,6 +168,7 @@ impl<'a> TryFrom<&'a RoomFilter> for CompiledRoomFilter<'a> {
// all of the sub-filters // all of the sub-filters
rooms: AllowDenyList::from_slices(source.rooms.as_deref(), &source.not_rooms), rooms: AllowDenyList::from_slices(source.rooms.as_deref(), &source.not_rooms),
timeline: (&source.timeline).try_into()?, timeline: (&source.timeline).try_into()?,
state: (&source.state).try_into()?,
}) })
} }
} }