magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slightly adjust sliding sync code for ruma bump

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-06-10 17:20:59 -04:00
parent adf0bfd894
commit 8210e8c42e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/client/sync.rs
View file

@ -611,7 +611,7 @@ async fn load_joined_room(
.unwrap_or(0); .unwrap_or(0);
// Recalculate heroes (first 5 members) // Recalculate heroes (first 5 members)
let mut heroes = Vec::new(); let mut heroes: Vec<OwnedUserId> = Vec::with_capacity(5);
if joined_member_count.saturating_add(invited_member_count) <= 5 { if joined_member_count.saturating_add(invited_member_count) <= 5 {
// Go through all PDUs and for each member event, check if the user is still // Go through all PDUs and for each member event, check if the user is still
@ -636,7 +636,7 @@ async fn load_joined_room(
&& (services().rooms.state_cache.is_joined(&user_id, room_id)? && (services().rooms.state_cache.is_joined(&user_id, room_id)?
|| services().rooms.state_cache.is_invited(&user_id, room_id)?) || services().rooms.state_cache.is_invited(&user_id, room_id)?)
{ {
Ok::<_, Error>(Some(state_key.clone())) Ok::<_, Error>(Some(user_id))
} else { } else {
Ok(None) Ok(None)
} }
@ -644,12 +644,11 @@ async fn load_joined_room(
Ok(None) Ok(None)
} }
}) })
// Filter out buggy users
.filter_map(Result::ok) .filter_map(Result::ok)
// Filter for possible heroes // Filter for possible heroes
.flatten() .flatten()
{ {
if heroes.contains(&hero) || hero == sender_user.as_str() { if heroes.contains(&hero) || hero == sender_user {
continue; continue;
} }
@ -1584,6 +1583,7 @@ pub(crate) async fn sync_events_v4_route(
), ),
num_live: None, // Count events in timeline greater than global sync counter num_live: None, // Count events in timeline greater than global sync counter
timestamp: None, timestamp: None,
heroes: None,
}, },
); );
} }