Merge branch 'develop' into master

messages/protos/messages.proto

@@ -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;
   }
 }