Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatically share project when creating the room

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-10-04 19:25:48 +02:00
parent 678b013da6
commit fceba6814f
12 changed files with 137 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/collab/src/integration_tests.rs
View file

@ -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();

12
crates/collab/src/rpc.rs
View file

@ -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()

27
crates/collab/src/rpc/store.rs
View file

@ -40,6 +40,7 @@ pub struct Call {
pub caller_user_id: UserId,
pub room_id: RoomId,
pub connection_id: Option<ConnectionId>,
pub initial_project_id: Option<ProjectId>,
}
#[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<ProjectId>,
from_connection_id: ConnectionId,
recipient_id: UserId,
) -> Result<(&proto::Room, Vec<ConnectionId>, 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::<Vec<_>>();
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()),
},
))
}