mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 08:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Unregister project from db when user disconnects or manually does so

Browse source
This commit is contained in:
Antonio Scandurra 2022-06-21 10:37:34 +02:00
parent 7acebc4eb8
commit 95a629d200
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -465,7 +465,7 @@ impl Db for PostgresDb {
"
UPDATE projects
SET unregistered = 't'
WHERE project_id = $1
WHERE id = $1
",
)
.bind(project_id)

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

@ -452,11 +452,14 @@ impl Server {
async fn sign_out(self: &mut Arc<Self>, connection_id: ConnectionId) -> Result<()> {
self.peer.disconnect(connection_id);
let removed_user_id = {
let mut projects_to_unregister = Vec::new();
let removed_user_id;
{
let mut store = self.store_mut().await;
let removed_connection = store.remove_connection(connection_id)?;
for (project_id, project) in removed_connection.hosted_projects {
projects_to_unregister.push(project_id);
broadcast(connection_id, project.guests.keys().copied(), |conn_id| {
self.peer.send(
conn_id,
@ -506,10 +509,18 @@ impl Server {
}
}
removed_connection.user_id
removed_user_id = removed_connection.user_id;
};
self.update_user_contacts(removed_user_id).await?;
self.update_user_contacts(removed_user_id).await.trace_err();
for project_id in projects_to_unregister {
self.app_state
.db
.unregister_project(project_id)
.await
.trace_err();
}
Ok(())
}
@ -594,14 +605,13 @@ impl Server {
request: TypedEnvelope<proto::UnregisterProject>,
response: Response<proto::UnregisterProject>,
) -> Result<()> {
let project_id = ProjectId::from_proto(request.payload.project_id);
let (user_id, project) = {
let mut state = self.store_mut().await;
let project = state.unregister_project(
ProjectId::from_proto(request.payload.project_id),
request.sender_id,
)?;
let project = state.unregister_project(project_id, request.sender_id)?;
(state.user_id_for_connection(request.sender_id)?, project)
};
self.app_state.db.unregister_project(project_id).await?;
broadcast(
request.sender_id,
@ -610,7 +620,7 @@ impl Server {
self.peer.send(
conn_id,
proto::UnregisterProject {
project_id: request.payload.project_id,
project_id: project_id.to_proto(),
},
)
},