From fceba6814ffda8e75647ff9957296b13567f5d8a Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 4 Oct 2022 19:25:48 +0200 Subject: [PATCH] Automatically share project when creating the room Co-Authored-By: Max Brunsfeld --- crates/call/src/call.rs | 19 ++++++- crates/call/src/room.rs | 2 + crates/client/src/incoming_call.rs | 1 + crates/client/src/user.rs | 1 + crates/collab/src/integration_tests.rs | 18 ++++-- crates/collab/src/rpc.rs | 12 +++- crates/collab/src/rpc/store.rs | 27 +++++++-- crates/collab_ui/src/collab_titlebar_item.rs | 3 +- crates/collab_ui/src/collab_ui.rs | 2 +- crates/collab_ui/src/contacts_popover.rs | 29 ++++++++-- .../src/incoming_call_notification.rs | 56 ++++++++++++++----- crates/rpc/proto/zed.proto | 2 + 12 files changed, 137 insertions(+), 35 deletions(-) diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs index 19de06c1c40dd98f98badecdd7cf1fc186eb1b82..a861f94bd0fa05c92442d98f846743ead630724a 100644 --- a/crates/call/src/call.rs +++ b/crates/call/src/call.rs @@ -5,6 +5,7 @@ use anyhow::{anyhow, Result}; use client::{incoming_call::IncomingCall, Client, UserStore}; use gpui::{Entity, ModelContext, ModelHandle, MutableAppContext, Subscription, Task}; pub use participant::ParticipantLocation; +use project::Project; pub use room::Room; use std::sync::Arc; @@ -39,6 +40,7 @@ impl ActiveCall { pub fn invite( &mut self, recipient_user_id: u64, + initial_project: Option>, cx: &mut ModelContext, ) -> Task> { let room = self.room.as_ref().map(|(room, _)| room.clone()); @@ -52,8 +54,21 @@ impl ActiveCall { this.update(&mut cx, |this, cx| this.set_room(Some(room.clone()), cx)); room }; - room.update(&mut cx, |room, cx| room.call(recipient_user_id, cx)) - .await?; + + let initial_project_id = if let Some(initial_project) = initial_project { + let room_id = room.read_with(&cx, |room, _| room.id()); + Some( + initial_project + .update(&mut cx, |project, cx| project.share(room_id, cx)) + .await?, + ) + } else { + None + }; + room.update(&mut cx, |room, cx| { + room.call(recipient_user_id, initial_project_id, cx) + }) + .await?; Ok(()) }) diff --git a/crates/call/src/room.rs b/crates/call/src/room.rs index 4cac210f8b66afe60d37488289ead4dc4f276386..0237972167726bf392620bbf2d424828fb484f02 100644 --- a/crates/call/src/room.rs +++ b/crates/call/src/room.rs @@ -216,6 +216,7 @@ impl Room { pub fn call( &mut self, recipient_user_id: u64, + initial_project_id: Option, cx: &mut ModelContext, ) -> Task> { if self.status.is_offline() { @@ -229,6 +230,7 @@ impl Room { .request(proto::Call { room_id, recipient_user_id, + initial_project_id, }) .await?; Ok(()) diff --git a/crates/client/src/incoming_call.rs b/crates/client/src/incoming_call.rs index 75d8411ec3879af9d5c9d9d6ac666d7cd98e8f6a..80ba014061f97c2f44e5887f883b4dd34335e629 100644 --- a/crates/client/src/incoming_call.rs +++ b/crates/client/src/incoming_call.rs @@ -6,4 +6,5 @@ pub struct IncomingCall { pub room_id: u64, pub caller: Arc, pub participants: Vec>, + pub initial_project_id: Option, } diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs index 0529045c77c4ece62a0cd0fc9729ba86b957c366..2d79b7be84592b9a91932c2dbe6545439f6c4b56 100644 --- a/crates/client/src/user.rs +++ b/crates/client/src/user.rs @@ -212,6 +212,7 @@ impl UserStore { this.get_user(envelope.payload.caller_user_id, cx) }) .await?, + initial_project_id: envelope.payload.initial_project_id, }; this.update(&mut cx, |this, _| { *this.incoming_call.0.borrow_mut() = Some(call); diff --git a/crates/collab/src/integration_tests.rs b/crates/collab/src/integration_tests.rs index 6cadadb4c5fe9e63bc16fde1c0a2772c2c0ce2c7..92f94b662150e1a3bb2ea100fccb08266dc4278b 100644 --- a/crates/collab/src/integration_tests.rs +++ b/crates/collab/src/integration_tests.rs @@ -95,7 +95,9 @@ async fn test_basic_calls( .user_store .update(cx_b, |user, _| user.incoming_call()); room_a - .update(cx_a, |room, cx| room.call(client_b.user_id().unwrap(), cx)) + .update(cx_a, |room, cx| { + room.call(client_b.user_id().unwrap(), None, cx) + }) .await .unwrap(); @@ -147,7 +149,9 @@ async fn test_basic_calls( .user_store .update(cx_c, |user, _| user.incoming_call()); room_b - .update(cx_b, |room, cx| room.call(client_c.user_id().unwrap(), cx)) + .update(cx_b, |room, cx| { + room.call(client_c.user_id().unwrap(), None, cx) + }) .await .unwrap(); @@ -234,7 +238,9 @@ async fn test_leaving_room_on_disconnection( .user_store .update(cx_b, |user, _| user.incoming_call()); room_a - .update(cx_a, |room, cx| room.call(client_b.user_id().unwrap(), cx)) + .update(cx_a, |room, cx| { + room.call(client_b.user_id().unwrap(), None, cx) + }) .await .unwrap(); @@ -4849,7 +4855,7 @@ async fn test_random_collaboration( host_language_registry.add(Arc::new(language)); let host_user_id = host.current_user_id(&host_cx); - room.update(cx, |room, cx| room.call(host_user_id.to_proto(), cx)) + room.update(cx, |room, cx| room.call(host_user_id.to_proto(), None, cx)) .await .unwrap(); deterministic.run_until_parked(); @@ -4941,7 +4947,7 @@ async fn test_random_collaboration( let guest = server.create_client(&mut guest_cx, &guest_username).await; let guest_user_id = guest.current_user_id(&guest_cx); - room.update(cx, |room, cx| room.call(guest_user_id.to_proto(), cx)) + room.update(cx, |room, cx| room.call(guest_user_id.to_proto(), None, cx)) .await .unwrap(); deterministic.run_until_parked(); @@ -5353,7 +5359,7 @@ impl TestServer { for (client_b, cx_b) in right { let user_id_b = client_b.current_user_id(*cx_b).to_proto(); room_a - .update(*cx_a, |room, cx| room.call(user_id_b, cx)) + .update(*cx_a, |room, cx| room.call(user_id_b, None, cx)) .await .unwrap(); diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs index c000400568648692f68651f15e568a981d3113f4..4098e6522aa88df83afbe13a4454f50d727e0ede 100644 --- a/crates/collab/src/rpc.rs +++ b/crates/collab/src/rpc.rs @@ -660,6 +660,10 @@ impl Server { .await .user_id_for_connection(request.sender_id)?; let recipient_user_id = UserId::from_proto(request.payload.recipient_user_id); + let initial_project_id = request + .payload + .initial_project_id + .map(ProjectId::from_proto); if !self .app_state .db @@ -672,8 +676,12 @@ impl Server { let room_id = request.payload.room_id; let mut calls = { let mut store = self.store().await; - let (room, recipient_connection_ids, incoming_call) = - store.call(room_id, request.sender_id, recipient_user_id)?; + let (room, recipient_connection_ids, incoming_call) = store.call( + room_id, + recipient_user_id, + initial_project_id, + request.sender_id, + )?; self.room_updated(room); recipient_connection_ids .into_iter() diff --git a/crates/collab/src/rpc/store.rs b/crates/collab/src/rpc/store.rs index c917309cd21da201e7f6cb06b23857e298cb65ed..da9f242ac5110bf4c5017c3b646849e0f9cc00a6 100644 --- a/crates/collab/src/rpc/store.rs +++ b/crates/collab/src/rpc/store.rs @@ -40,6 +40,7 @@ pub struct Call { pub caller_user_id: UserId, pub room_id: RoomId, pub connection_id: Option, + pub initial_project_id: Option, } #[derive(Serialize)] @@ -175,6 +176,9 @@ impl Store { .iter() .map(|participant| participant.user_id) .collect(), + initial_project_id: active_call + .initial_project_id + .map(|project_id| project_id.to_proto()), }) } } else { @@ -379,6 +383,7 @@ impl Store { caller_user_id: connection.user_id, room_id, connection_id: Some(creator_connection_id), + initial_project_id: None, }); Ok(room_id) } @@ -486,17 +491,18 @@ impl Store { pub fn call( &mut self, room_id: RoomId, + recipient_user_id: UserId, + initial_project_id: Option, from_connection_id: ConnectionId, - recipient_id: UserId, ) -> Result<(&proto::Room, Vec, proto::IncomingCall)> { let caller_user_id = self.user_id_for_connection(from_connection_id)?; let recipient_connection_ids = self - .connection_ids_for_user(recipient_id) + .connection_ids_for_user(recipient_user_id) .collect::>(); let mut recipient = self .connected_users - .get_mut(&recipient_id) + .get_mut(&recipient_user_id) .ok_or_else(|| anyhow!("no such connection"))?; anyhow::ensure!( recipient.active_call.is_none(), @@ -516,14 +522,24 @@ impl Store { anyhow::ensure!( room.pending_user_ids .iter() - .all(|user_id| UserId::from_proto(*user_id) != recipient_id), + .all(|user_id| UserId::from_proto(*user_id) != recipient_user_id), "cannot call the same user more than once" ); - room.pending_user_ids.push(recipient_id.to_proto()); + room.pending_user_ids.push(recipient_user_id.to_proto()); + + if let Some(initial_project_id) = initial_project_id { + let project = self + .projects + .get(&initial_project_id) + .ok_or_else(|| anyhow!("no such project"))?; + anyhow::ensure!(project.room_id == room_id, "no such project"); + } + recipient.active_call = Some(Call { caller_user_id, room_id, connection_id: None, + initial_project_id, }); Ok(( @@ -537,6 +553,7 @@ impl Store { .iter() .map(|participant| participant.user_id) .collect(), + initial_project_id: initial_project_id.map(|project_id| project_id.to_proto()), }, )) } diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 94593d5dc53e154a3c57640da0152993e3639105..8e4b8f9f322b48f441faffd91766f696d0f418a8 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -100,8 +100,9 @@ impl CollabTitlebarItem { Some(_) => {} None => { if let Some(workspace) = self.workspace.upgrade(cx) { + let project = workspace.read(cx).project().clone(); let user_store = workspace.read(cx).user_store().clone(); - let view = cx.add_view(|cx| ContactsPopover::new(user_store, cx)); + let view = cx.add_view(|cx| ContactsPopover::new(project, user_store, cx)); cx.focus(&view); cx.subscribe(&view, |this, _, event, cx| { match event { diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs index ccf17974a4512c2d7778cc73fa119fcf14970160..607c1b50543b886f52efa9dafb02801e38f7d44e 100644 --- a/crates/collab_ui/src/collab_ui.rs +++ b/crates/collab_ui/src/collab_ui.rs @@ -11,6 +11,6 @@ use workspace::AppState; pub fn init(app_state: Arc, cx: &mut MutableAppContext) { contacts_popover::init(cx); collab_titlebar_item::init(cx); - incoming_call_notification::init(app_state.user_store.clone(), cx); + incoming_call_notification::init(app_state.clone(), cx); project_shared_notification::init(app_state, cx); } diff --git a/crates/collab_ui/src/contacts_popover.rs b/crates/collab_ui/src/contacts_popover.rs index 1980d8a14fc4f3174d93f396177f440e969acf58..c4eef3c9d8dcc781c3a343550c618b6bb828a62a 100644 --- a/crates/collab_ui/src/contacts_popover.rs +++ b/crates/collab_ui/src/contacts_popover.rs @@ -10,6 +10,7 @@ use gpui::{ ViewHandle, }; use menu::{Confirm, SelectNext, SelectPrev}; +use project::Project; use settings::Settings; use theme::IconButton; @@ -30,6 +31,7 @@ struct ToggleExpanded(Section); #[derive(Clone, PartialEq)] struct Call { recipient_user_id: u64, + initial_project: Option>, } #[derive(Clone, Copy, PartialEq, Eq, Debug, PartialOrd, Ord)] @@ -83,6 +85,7 @@ pub struct ContactsPopover { entries: Vec, match_candidates: Vec, list_state: ListState, + project: ModelHandle, user_store: ModelHandle, filter_editor: ViewHandle, collapsed_sections: Vec
, @@ -91,7 +94,11 @@ pub struct ContactsPopover { } impl ContactsPopover { - pub fn new(user_store: ModelHandle, cx: &mut ViewContext) -> Self { + pub fn new( + project: ModelHandle, + user_store: ModelHandle, + cx: &mut ViewContext, + ) -> Self { let filter_editor = cx.add_view(|cx| { let mut editor = Editor::single_line( Some(|theme| theme.contacts_panel.user_query_editor.clone()), @@ -149,9 +156,13 @@ impl ContactsPopover { is_selected, cx, ), - ContactEntry::Contact(contact) => { - Self::render_contact(contact, &theme.contacts_panel, is_selected, cx) - } + ContactEntry::Contact(contact) => Self::render_contact( + contact, + &this.project, + &theme.contacts_panel, + is_selected, + cx, + ), } }); @@ -168,6 +179,7 @@ impl ContactsPopover { match_candidates: Default::default(), filter_editor, _subscriptions: subscriptions, + project, user_store, }; this.update_entries(cx); @@ -463,12 +475,18 @@ impl ContactsPopover { fn render_contact( contact: &Contact, + project: &ModelHandle, theme: &theme::ContactsPanel, is_selected: bool, cx: &mut RenderContext, ) -> ElementBox { let online = contact.online; let user_id = contact.user.id; + let initial_project = if ActiveCall::global(cx).read(cx).room().is_none() { + Some(project.clone()) + } else { + None + }; let mut element = MouseEventHandler::::new(contact.user.id as usize, cx, |_, _| { Flex::row() @@ -501,6 +519,7 @@ impl ContactsPopover { if online { cx.dispatch_action(Call { recipient_user_id: user_id, + initial_project: initial_project.clone(), }); } }); @@ -629,7 +648,7 @@ impl ContactsPopover { fn call(&mut self, action: &Call, cx: &mut ViewContext) { ActiveCall::global(cx) .update(cx, |active_call, cx| { - active_call.invite(action.recipient_user_id, cx) + active_call.invite(action.recipient_user_id, action.initial_project.clone(), cx) }) .detach_and_log_err(cx); } diff --git a/crates/collab_ui/src/incoming_call_notification.rs b/crates/collab_ui/src/incoming_call_notification.rs index a239acc7e6faec47c137670c13ef29a626c48182..4630054c5e355bd41eb7dce4729376d5248ceeb7 100644 --- a/crates/collab_ui/src/incoming_call_notification.rs +++ b/crates/collab_ui/src/incoming_call_notification.rs @@ -1,21 +1,25 @@ +use std::sync::Arc; + use call::ActiveCall; -use client::{incoming_call::IncomingCall, UserStore}; +use client::incoming_call::IncomingCall; use futures::StreamExt; use gpui::{ elements::*, geometry::{rect::RectF, vector::vec2f}, - impl_internal_actions, Entity, ModelHandle, MouseButton, MutableAppContext, RenderContext, - View, ViewContext, WindowBounds, WindowKind, WindowOptions, + impl_internal_actions, Entity, MouseButton, MutableAppContext, RenderContext, View, + ViewContext, WindowBounds, WindowKind, WindowOptions, }; +use project::Project; use settings::Settings; use util::ResultExt; +use workspace::{AppState, Workspace}; impl_internal_actions!(incoming_call_notification, [RespondToCall]); -pub fn init(user_store: ModelHandle, cx: &mut MutableAppContext) { +pub fn init(app_state: Arc, cx: &mut MutableAppContext) { cx.add_action(IncomingCallNotification::respond_to_call); - let mut incoming_call = user_store.read(cx).incoming_call(); + let mut incoming_call = app_state.user_store.read(cx).incoming_call(); cx.spawn(|mut cx| async move { let mut notification_window = None; while let Some(incoming_call) = incoming_call.next().await { @@ -32,7 +36,7 @@ pub fn init(user_store: ModelHandle, cx: &mut MutableAppContext) { kind: WindowKind::PopUp, is_movable: false, }, - |_| IncomingCallNotification::new(incoming_call, user_store.clone()), + |_| IncomingCallNotification::new(incoming_call, app_state.clone()), ); notification_window = Some(window_id); } @@ -48,21 +52,47 @@ struct RespondToCall { pub struct IncomingCallNotification { call: IncomingCall, - user_store: ModelHandle, + app_state: Arc, } impl IncomingCallNotification { - pub fn new(call: IncomingCall, user_store: ModelHandle) -> Self { - Self { call, user_store } + pub fn new(call: IncomingCall, app_state: Arc) -> Self { + Self { call, app_state } } fn respond_to_call(&mut self, action: &RespondToCall, cx: &mut ViewContext) { if action.accept { - ActiveCall::global(cx) - .update(cx, |active_call, cx| active_call.join(&self.call, cx)) - .detach_and_log_err(cx); + let app_state = self.app_state.clone(); + let join = ActiveCall::global(cx) + .update(cx, |active_call, cx| active_call.join(&self.call, cx)); + let initial_project_id = self.call.initial_project_id; + cx.spawn_weak(|_, mut cx| async move { + join.await?; + if let Some(initial_project_id) = initial_project_id { + let project = Project::remote( + initial_project_id, + app_state.client.clone(), + app_state.user_store.clone(), + app_state.project_store.clone(), + app_state.languages.clone(), + app_state.fs.clone(), + cx.clone(), + ) + .await?; + + cx.add_window((app_state.build_window_options)(), |cx| { + let mut workspace = + Workspace::new(project, app_state.default_item_factory, cx); + (app_state.initialize_workspace)(&mut workspace, &app_state, cx); + workspace + }); + } + anyhow::Ok(()) + }) + .detach_and_log_err(cx); } else { - self.user_store + self.app_state + .user_store .update(cx, |user_store, _| user_store.decline_call().log_err()); } diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto index ffec915269deb5f5d91e93e20cc772e94238e3d0..6c8ec72e86d30779fbc11d9cbf1c3296f2aaa57d 100644 --- a/crates/rpc/proto/zed.proto +++ b/crates/rpc/proto/zed.proto @@ -179,12 +179,14 @@ message ParticipantLocation { message Call { uint64 room_id = 1; uint64 recipient_user_id = 2; + optional uint64 initial_project_id = 3; } message IncomingCall { uint64 room_id = 1; uint64 caller_user_id = 2; repeated uint64 participant_user_ids = 3; + optional uint64 initial_project_id = 4; } message CancelCall {}