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

Make project id optional when following - server only

Browse source
This commit is contained in:
Max Brunsfeld 2023-09-19 15:37:33 -07:00
parent 83455028b0
commit c71566e7f5
10 changed files with 204 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/rpc/proto/zed.proto
View file

@ -274,7 +274,7 @@ message ParticipantProject {
message Follower {
PeerId leader_id = 1;
PeerId follower_id = 2;
uint64 project_id = 3;
optional uint64 project_id = 3;
}
message ParticipantLocation {
@ -1213,8 +1213,9 @@ message UpdateDiagnostics {
}
message Follow {
uint64 project_id = 1;
PeerId leader_id = 2;
uint64 room_id = 1;
optional uint64 project_id = 2;
PeerId leader_id = 3;
}
message FollowResponse {
@ -1223,18 +1224,20 @@ message FollowResponse {
}
message UpdateFollowers {
uint64 project_id = 1;
repeated PeerId follower_ids = 2;
uint64 room_id = 1;
optional uint64 project_id = 2;
repeated PeerId follower_ids = 3;
oneof variant {
UpdateActiveView update_active_view = 3;
View create_view = 4;
UpdateView update_view = 5;
UpdateActiveView update_active_view = 4;
View create_view = 5;
UpdateView update_view = 6;
}
}
message Unfollow {
uint64 project_id = 1;
PeerId leader_id = 2;
uint64 room_id = 1;
optional uint64 project_id = 2;
PeerId leader_id = 3;
}
message GetPrivateUserInfo {}

3
crates/rpc/src/proto.rs
View file

@ -364,7 +364,6 @@ entity_messages!(
CreateProjectEntry,
DeleteProjectEntry,
ExpandProjectEntry,
Follow,
FormatBuffers,
GetCodeActions,
GetCompletions,
@ -392,12 +391,10 @@ entity_messages!(
SearchProject,
StartLanguageServer,
SynchronizeBuffers,
Unfollow,
UnshareProject,
UpdateBuffer,
UpdateBufferFile,
UpdateDiagnosticSummary,
UpdateFollowers,
UpdateLanguageServer,
UpdateProject,
UpdateProjectCollaborator,

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

@ -6,4 +6,4 @@ pub use conn::Connection;
pub use peer::*;
mod macros;
pub const PROTOCOL_VERSION: u32 = 63;
pub const PROTOCOL_VERSION: u32 = 64;