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

Add several proto messages for chat

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-08-05 19:05:58 -07:00
parent 775bf8dd33
commit 0b6376bdda
2 changed files with 62 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/migrations/20210805175147_create_chat_tables.sql
View file

@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS "channel_messages" (
"id" SERIAL PRIMARY KEY, "id" SERIAL PRIMARY KEY,
"channel_id" INTEGER REFERENCES channels (id) NOT NULL, "channel_id" INTEGER REFERENCES channels (id) NOT NULL,
"sender_id" INTEGER REFERENCES users (id) NOT NULL, "sender_id" INTEGER REFERENCES users (id) NOT NULL,
"content" TEXT NOT NULL, "body" TEXT NOT NULL,
"sent_at" TIMESTAMP "sent_at" TIMESTAMP
); );

66
zrpc/proto/zed.proto
View file

@ -22,9 +22,19 @@ message Envelope {
BufferSaved buffer_saved = 17; BufferSaved buffer_saved = 17;
AddPeer add_peer = 18; AddPeer add_peer = 18;
RemovePeer remove_peer = 19; RemovePeer remove_peer = 19;
GetChannels get_channels = 20;
GetChannelsResponse get_channels_response = 21;
JoinChannel join_channel = 22;
JoinChannelResponse join_channel_response = 23;
GetUsers get_users = 24;
GetUsersResponse get_users_response = 25;
SendChannelMessage send_channel_message = 26;
ChannelMessageSent channel_message_sent = 27;
} }
} }
// Messages
message Auth { message Auth {
int32 user_id = 1; int32 user_id = 1;
string access_token = 2; string access_token = 2;
@ -75,11 +85,6 @@ message RemovePeer {
uint32 peer_id = 2; uint32 peer_id = 2;
} }
message Peer {
uint32 peer_id = 1;
uint32 replica_id = 2;
}
message OpenBuffer { message OpenBuffer {
uint64 worktree_id = 1; uint64 worktree_id = 1;
string path = 2; string path = 2;
@ -112,6 +117,45 @@ message BufferSaved {
Timestamp mtime = 4; Timestamp mtime = 4;
} }
message GetChannels {}
message GetChannelsResponse {
repeated Channel channels = 1;
}
message JoinChannel {
uint64 channel_id = 1;
}
message JoinChannelResponse {
repeated ChannelMessage messages = 1;
}
message GetUsers {
repeated uint64 user_ids = 1;
}
message GetUsersResponse {
repeated User users = 1;
}
message SendChannelMessage {
uint64 channel_id = 1;
string body = 2;
}
message ChannelMessageSent {
uint64 channel_id = 1;
ChannelMessage message = 2;
}
// Entities
message Peer {
uint32 peer_id = 1;
uint32 replica_id = 2;
}
message User { message User {
uint64 id = 1; uint64 id = 1;
string github_login = 2; string github_login = 2;
@ -228,3 +272,15 @@ message Range {
uint64 start = 1; uint64 start = 1;
uint64 end = 2; uint64 end = 2;
} }
message Channel {
uint64 id = 1;
string name = 2;
}
message ChannelMessage {
uint64 id = 1;
string body = 2;
uint64 timestamp = 3;
uint64 sender_id = 4;
}