Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into master

Browse source
This commit is contained in:
Alexis Faizeau 2021-12-30 13:18:13 +01:00 • committed by GitHub
commit 68431c5242
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1994 additions and 2067 deletions
Download patch file Download diff file Expand all files Collapse all files

37
messages/protos/messages.proto
View file

@ -71,12 +71,12 @@ message ReportPlayerMessage {
}
message EmotePromptMessage {
string emote = 2;
string emote = 2;
}
message EmoteEventMessage {
int32 actorUserId = 1;
string emote = 2;
int32 actorUserId = 1;
string emote = 2;
}
message QueryJitsiJwtMessage {
@ -84,6 +84,20 @@ message QueryJitsiJwtMessage {
string tag = 2; // FIXME: rather than reading the tag from the query, we should read it from the current map!
}
message FollowRequestMessage {
int32 leader = 1;
}
message FollowConfirmationMessage {
int32 leader = 1;
int32 follower = 2;
}
message FollowAbortMessage {
int32 leader = 1;
int32 follower = 2;
}
message ClientToServerMessage {
oneof message {
UserMovesMessage userMovesMessage = 2;
@ -99,6 +113,9 @@ message ClientToServerMessage {
QueryJitsiJwtMessage queryJitsiJwtMessage = 12;
EmotePromptMessage emotePromptMessage = 13;
VariableMessage variableMessage = 14;
FollowRequestMessage followRequestMessage = 15;
FollowConfirmationMessage followConfirmationMessage = 16;
FollowAbortMessage followAbortMessage = 17;
}
}
@ -243,14 +260,14 @@ message SendUserMessage{
message WorldFullWarningMessage{
}
message WorldFullWarningToRoomMessage{
string roomId = 1;
string roomId = 1;
}
message RefreshRoomPromptMessage{
string roomId = 1;
string roomId = 1;
}
message RefreshRoomMessage{
string roomId = 1;
int32 versionNumber = 2;
string roomId = 1;
int32 versionNumber = 2;
}
message WorldFullMessage{
@ -292,6 +309,9 @@ message ServerToClientMessage {
WorldConnexionMessage worldConnexionMessage = 18;
//EmoteEventMessage emoteEventMessage = 19;
TokenExpiredMessage tokenExpiredMessage = 20;
FollowRequestMessage followRequestMessage = 21;
FollowConfirmationMessage followConfirmationMessage = 22;
FollowAbortMessage followAbortMessage = 23;
}
}
@ -378,6 +398,9 @@ message PusherToBackMessage {
BanUserMessage banUserMessage = 13;
EmotePromptMessage emotePromptMessage = 14;
VariableMessage variableMessage = 15;
FollowRequestMessage followRequestMessage = 16;
FollowConfirmationMessage followConfirmationMessage = 17;
FollowAbortMessage followAbortMessage = 18;
}
}