Remove project join requests

crates/rpc/proto/zed.proto

@@ -25,15 +25,12 @@ message Envelope {
         RegisterProject register_project = 15;
         RegisterProjectResponse register_project_response = 16;
         UnregisterProject unregister_project = 17;
-        RequestJoinProject request_join_project = 18;
-        RespondToJoinProjectRequest respond_to_join_project_request = 19;
-        JoinProjectRequestCancelled join_project_request_cancelled = 20;
         JoinProject join_project = 21;
         JoinProjectResponse join_project_response = 22;
         LeaveProject leave_project = 23;
         AddProjectCollaborator add_project_collaborator = 24;
         RemoveProjectCollaborator remove_project_collaborator = 25;
-        ProjectUnshared project_unshared = 26;
+        UnshareProject unshare_project = 26;
 
         GetDefinition get_definition = 27;
         GetDefinitionResponse get_definition_response = 28;
@@ -198,9 +195,7 @@ message RoomUpdated {
     Room room = 1;
 }
 
-message RegisterProject {
-    bool online = 1;
-}
+message RegisterProject {}
 
 message RegisterProjectResponse {
     uint64 project_id = 1;
@@ -213,55 +208,21 @@ message UnregisterProject {
 message UpdateProject {
     uint64 project_id = 1;
     repeated WorktreeMetadata worktrees = 2;
-    bool online = 3;
 }
 
 message RegisterProjectActivity {
     uint64 project_id = 1;
 }
 
-message RequestJoinProject {
-    uint64 requester_id = 1;
-    uint64 project_id = 2;
-}
-
-message RespondToJoinProjectRequest {
-    uint64 requester_id = 1;
-    uint64 project_id = 2;
-    bool allow = 3;
-}
-
-message JoinProjectRequestCancelled {
-    uint64 requester_id = 1;
-    uint64 project_id = 2;
-}
-
 message JoinProject {
     uint64 project_id = 1;
 }
 
 message JoinProjectResponse {
-    oneof variant {
-        Accept accept = 1;
-        Decline decline = 2;
-    }
-
-    message Accept {
-        uint32 replica_id = 1;
-        repeated WorktreeMetadata worktrees = 2;
-        repeated Collaborator collaborators = 3;
-        repeated LanguageServer language_servers = 4;        
-    }
-    
-    message Decline {
-        Reason reason = 1;
-
-        enum Reason {
-            Declined = 0;
-            Closed = 1;
-            WentOffline = 2;
-        }
-    }
+    uint32 replica_id = 1;
+    repeated WorktreeMetadata worktrees = 2;
+    repeated Collaborator collaborators = 3;
+    repeated LanguageServer language_servers = 4;
 }
 
 message LeaveProject {
@@ -324,7 +285,7 @@ message RemoveProjectCollaborator {
     uint32 peer_id = 2;
 }
 
-message ProjectUnshared {
+message UnshareProject {
     uint64 project_id = 1;
 }
 

crates/rpc/src/proto.rs

@@ -126,7 +126,6 @@ messages!(
     (JoinChannelResponse, Foreground),
     (JoinProject, Foreground),
     (JoinProjectResponse, Foreground),
-    (JoinProjectRequestCancelled, Foreground),
     (JoinRoom, Foreground),
     (JoinRoomResponse, Foreground),
     (LeaveChannel, Foreground),
@@ -142,7 +141,6 @@ messages!(
     (PrepareRename, Background),
     (PrepareRenameResponse, Background),
     (ProjectEntryResponse, Foreground),
-    (ProjectUnshared, Foreground),
     (RegisterProjectResponse, Foreground),
     (RemoveContact, Foreground),
     (Ping, Foreground),
@@ -153,9 +151,7 @@ messages!(
     (RemoveProjectCollaborator, Foreground),
     (RenameProjectEntry, Foreground),
     (RequestContact, Foreground),
-    (RequestJoinProject, Foreground),
     (RespondToContactRequest, Foreground),
-    (RespondToJoinProjectRequest, Foreground),
     (RoomUpdated, Foreground),
     (SaveBuffer, Foreground),
     (SearchProject, Background),
@@ -167,6 +163,7 @@ messages!(
     (Test, Foreground),
     (Unfollow, Foreground),
     (UnregisterProject, Foreground),
+    (UnshareProject, Foreground),
     (UpdateBuffer, Foreground),
     (UpdateBufferFile, Foreground),
     (UpdateContacts, Foreground),
@@ -252,24 +249,22 @@ entity_messages!(
     GetReferences,
     GetProjectSymbols,
     JoinProject,
-    JoinProjectRequestCancelled,
     LeaveProject,
     OpenBufferById,
     OpenBufferByPath,
     OpenBufferForSymbol,
     PerformRename,
     PrepareRename,
-    ProjectUnshared,
     RegisterProjectActivity,
     ReloadBuffers,
     RemoveProjectCollaborator,
     RenameProjectEntry,
-    RequestJoinProject,
     SaveBuffer,
     SearchProject,
     StartLanguageServer,
     Unfollow,
     UnregisterProject,
+    UnshareProject,
     UpdateBuffer,
     UpdateBufferFile,
     UpdateDiagnosticSummary,