mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Abuse a closure instead of abusing options/iterators quite so much

Browse source
This commit is contained in:
Julia 2023-02-04 01:30:24 -05:00
parent 58c41778e7
commit 33c265d3cf
2 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/call/src/room.rs
View file

@ -459,10 +459,10 @@ impl Room {
self.participant_user_ids.contains(&user_id)
}
pub fn follows(&self, leader_id: PeerId) -> &[PeerId] {
pub fn follows(&self, leader_id: PeerId) -> Option<&[PeerId]> {
self.follows_by_leader_id
.get(&leader_id)
.map_or(&[], |v| v.as_slice())
.map(|v| v.as_slice())
}
async fn handle_room_updated(

45
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -569,11 +569,6 @@ impl CollabTitlebarItem {
workspace.read(cx).is_following(peer_id)
});
let room = ActiveCall::global(cx).read(cx).room();
let get_followers = |leader_id: PeerId| -> &[PeerId] {
room.map_or(&[], |room| room.read(cx).follows(leader_id))
};
let mut avatar_style;
if let Some((_, location)) = peer_id_and_location {
if let ParticipantLocation::SharedProject { project_id } = location {
@ -603,31 +598,21 @@ impl CollabTitlebarItem {
Flex::row()
.with_child(Self::render_face(avatar.clone(), avatar_style, theme))
.with_children(
peer_id_and_location
.map(|(peer_id, _)| {
get_followers(peer_id)
.into_iter()
.map(|&follower| {
room.map(|room| {
room.read(cx)
.remote_participant_for_peer_id(follower)
.map(|participant| {
participant.user.avatar.as_ref().map(|avatar| {
Self::render_face(
avatar.clone(),
avatar_style,
theme,
)
})
})
.flatten()
})
.flatten()
})
.flatten()
})
.into_iter()
.flatten(),
(|| {
let peer_id_and_location = peer_id_and_location?;
let peer_id = peer_id_and_location.0;
let room = ActiveCall::global(cx).read(cx).room()?.read(cx);
let followers = room.follows(peer_id)?;
Some(followers.into_iter().flat_map(|&follower| {
let participant = room.remote_participant_for_peer_id(follower)?;
let avatar = participant.user.avatar.as_ref()?;
Some(Self::render_face(avatar.clone(), avatar_style, theme))
}))
})()
.into_iter()
.flatten(),
)
.with_reversed_paint_order()
.boxed()