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

Update contacts as projects/worktrees get registered/unregistered

Browse source
This commit is contained in:
Antonio Scandurra 2021-12-21 10:17:26 +01:00
parent 40da3b233f
commit afec4152f4
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/server/src/rpc.rs
View file

@ -233,8 +233,12 @@ impl Server {
mut self: Arc<Server>, mut self: Arc<Server>,
request: TypedEnvelope<proto::UnregisterProject>, request: TypedEnvelope<proto::UnregisterProject>,
) -> tide::Result<()> { ) -> tide::Result<()> {
self.state_mut() let project = self
.unregister_project(request.payload.project_id, request.sender_id); .state_mut()
.unregister_project(request.payload.project_id, request.sender_id)
.ok_or_else(|| anyhow!("no such project"))?;
self.update_contacts_for_users(project.authorized_user_ids().iter())
.await?;
Ok(()) Ok(())
} }

26
crates/server/src/rpc/store.rs
View file

@ -115,10 +115,8 @@ impl Store {
let mut result = RemovedConnectionState::default(); let mut result = RemovedConnectionState::default();
for project_id in connection.projects.clone() { for project_id in connection.projects.clone() {
if let Some((project, authorized_user_ids)) = if let Some(project) = self.unregister_project(project_id, connection_id) {
self.unregister_project(project_id, connection_id) result.contact_ids.extend(project.authorized_user_ids());
{
result.contact_ids.extend(authorized_user_ids);
result.hosted_projects.insert(project_id, project); result.hosted_projects.insert(project_id, project);
} else if let Some(project) = self.leave_project(connection_id, project_id) { } else if let Some(project) = self.leave_project(connection_id, project_id) {
result result
@ -274,17 +272,25 @@ impl Store {
&mut self, &mut self,
project_id: u64, project_id: u64,
connection_id: ConnectionId, connection_id: ConnectionId,
) -> Option<(Project, Vec<UserId>)> { ) -> Option<Project> {
match self.projects.entry(project_id) { match self.projects.entry(project_id) {
hash_map::Entry::Occupied(e) => { hash_map::Entry::Occupied(e) => {
if e.get().host_connection_id != connection_id { if e.get().host_connection_id == connection_id {
return None; for user_id in e.get().authorized_user_ids() {
if let hash_map::Entry::Occupied(mut projects) =
self.visible_projects_by_user_id.entry(user_id)
{
projects.get_mut().remove(&project_id);
}
}
Some(e.remove())
} else {
None
} }
} }
hash_map::Entry::Vacant(_) => return None, hash_map::Entry::Vacant(_) => None,
} }
todo!()
} }
pub fn unregister_worktree( pub fn unregister_worktree(