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

Wait for acknowledgment before sending the next project update

Browse source
This commit is contained in:
Antonio Scandurra 2022-11-14 15:32:49 +01:00
parent 65c5adff05
commit 40073f6100
11 changed files with 94 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/collab/src/db.rs
View file

@ -1145,8 +1145,8 @@ where
FROM projects, project_collaborators
WHERE
projects.room_id = $1 AND
projects.host_connection_id = $2 AND
projects.id = project_collaborators.project_id
projects.id = project_collaborators.project_id AND
project_collaborators.connection_id = $2
",
)
.bind(room_id)
@ -1370,9 +1370,9 @@ where
pub async fn share_project(
&self,
room_id: RoomId,
user_id: UserId,
connection_id: ConnectionId,
room_id: RoomId,
worktrees: &[proto::WorktreeMetadata],
) -> Result<(ProjectId, proto::Room)> {
test_support!(self, {
@ -1426,11 +1426,19 @@ where
.await?;
let room = self.commit_room_transaction(room_id, tx).await?;
dbg!(&room);
Ok((project_id, room))
})
}
// pub async fn join_project(
// &self,
// user_id: UserId,
// connection_id: ConnectionId,
// project_id: ProjectId,
// ) -> Result<(Project, ReplicaId)> {
// todo!()
// }
pub async fn unshare_project(&self, project_id: ProjectId) -> Result<()> {
todo!()
// test_support!(self, {