Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop

back/src/Model/GameRoom.ts

@@ -145,7 +145,7 @@ export class GameRoom {
             joinRoomMessage.getIpaddress(),
             position,
             this.positionNotifier,
-            joinRoomMessage.getStatus(),
+            joinRoomMessage.getAvailabilitystatus(),
             socket,
             joinRoomMessage.getTagList(),
             joinRoomMessage.getVisitcardurl(),

back/src/Model/Group.ts

@@ -128,7 +128,7 @@ export class Group implements Movable {
 
         for (const user of this.positionNotifier.getAllUsersInSquareAroundZone(this.currentZone)) {
             //  Todo: Merge two groups with a leader
-            if (user.group || this.isFull()) return; //we ignore users that are already in a group.
+            if (user.silent || user.group || this.isFull()) return; //we ignore users that are already in a group.
             const distance = GameRoom.computeDistanceBetweenPositions(user.getPosition(), this.getPosition());
             if (distance < this.groupRadius) {
                 this.join(user);

back/src/Model/User.ts

@@ -32,7 +32,7 @@ export class User implements Movable {
         public readonly IPAddress: string,
         private position: PointInterface,
         private positionNotifier: PositionNotifier,
-        private status: AvailabilityStatus,
+        private availabilityStatus: AvailabilityStatus,
         public readonly socket: UserSocket,
         public readonly tags: string[],
         public readonly visitCardUrl: string | null,
@@ -90,12 +90,15 @@ export class User implements Movable {
         return this.outlineColor;
     }
 
-    public getStatus(): AvailabilityStatus {
-        return this.status;
+    public getAvailabilityStatus(): AvailabilityStatus {
+        return this.availabilityStatus;
     }
 
     public get silent(): boolean {
-        return this.status === AvailabilityStatus.SILENT || this.status === AvailabilityStatus.JITSI;
+        return (
+            this.availabilityStatus === AvailabilityStatus.SILENT ||
+            this.availabilityStatus === AvailabilityStatus.JITSI
+        );
     }
 
     get following(): User | undefined {
@@ -138,10 +141,10 @@ export class User implements Movable {
         }
         this.voiceIndicatorShown = details.getShowvoiceindicator()?.getValue();
 
-        const status = details.getStatus();
+        const availabilityStatus = details.getAvailabilitystatus();
         let sendStatusUpdate = false;
-        if (status && status !== this.status) {
-            this.status = status;
+        if (availabilityStatus && availabilityStatus !== this.availabilityStatus) {
+            this.availabilityStatus = availabilityStatus;
             sendStatusUpdate = true;
         }
 
@@ -157,7 +160,7 @@ export class User implements Movable {
             playerDetails.setShowvoiceindicator(new BoolValue().setValue(this.voiceIndicatorShown));
         }
         if (sendStatusUpdate) {
-            playerDetails.setStatus(details.getStatus());
+            playerDetails.setAvailabilitystatus(details.getAvailabilitystatus());
         }
 
         this.positionNotifier.updatePlayerDetails(this, playerDetails);

back/src/Services/SocketManager.ts

@@ -323,7 +323,7 @@ export class SocketManager {
             userJoinedZoneMessage.setUserid(thing.id);
             userJoinedZoneMessage.setUseruuid(thing.uuid);
             userJoinedZoneMessage.setName(thing.name);
-            userJoinedZoneMessage.setStatus(thing.getStatus());
+            userJoinedZoneMessage.setAvailabilitystatus(thing.getAvailabilityStatus());
             userJoinedZoneMessage.setCharacterlayersList(ProtobufUtils.toCharacterLayerMessages(thing.characterLayers));
             userJoinedZoneMessage.setPosition(ProtobufUtils.toPositionMessage(thing.getPosition()));
             userJoinedZoneMessage.setFromzone(this.toProtoZone(fromZone));
@@ -651,7 +651,7 @@ export class SocketManager {
                 userJoinedMessage.setUserid(thing.id);
                 userJoinedMessage.setUseruuid(thing.uuid);
                 userJoinedMessage.setName(thing.name);
-                userJoinedMessage.setStatus(thing.getStatus());
+                userJoinedMessage.setAvailabilitystatus(thing.getAvailabilityStatus());
                 userJoinedMessage.setCharacterlayersList(ProtobufUtils.toCharacterLayerMessages(thing.characterLayers));
                 userJoinedMessage.setPosition(ProtobufUtils.toPositionMessage(thing.getPosition()));
                 if (thing.visitCardUrl) {