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

Tidy up branch

Browse source
This commit is contained in:
Conrad Irwin 2024-01-04 11:55:14 -07:00
parent fcf7007e0b
commit d2afc97b53
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/db/queries/rooms.rs
View file

@ -156,8 +156,6 @@ impl Database {
initial_project_id: Option<ProjectId>,
) -> Result<RoomGuard<(proto::Room, proto::IncomingCall)>> {
self.room_transaction(room_id, |tx| async move {
let room = self.get_room(room_id, &tx).await?;
let caller = room_participant::Entity::find()
.filter(
room_participant::Column::UserId
@ -196,6 +194,7 @@ impl Database {
.insert(&*tx)
.await?;
let room = self.get_room(room_id, &tx).await?;
let incoming_call = Self::build_incoming_call(&room, called_user_id)
.ok_or_else(|| anyhow!("failed to build incoming call"))?;
Ok((room, incoming_call))
@ -1172,7 +1171,6 @@ impl Database {
}
}
drop(db_participants);
dbg!(&participants);
let mut db_projects = db_room
.find_related(project::Entity)

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

@ -1504,7 +1504,7 @@ async fn join_project(
// First, we send the metadata associated with each worktree.
response.send(proto::JoinProjectResponse {
worktrees: worktrees.clone(),
replica_id: Some(replica_id.0 as u32),
replica_id: replica_id.0 as u32,
collaborators: collaborators.clone(),
language_servers: project.language_servers.clone(),
})?;