From 900c53f499132dc6d0582bfc1e761b43c7ceeab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?gr=C3=A9goire=20parant?= <g.parant@thecodingmachine.com>
Date: Wed, 6 Oct 2021 15:36:42 +0200
Subject: [PATCH 1/6] Update icon message and profile (#1504)

- Add new icon profil pixel
 - Add new icon message pixel
 - Migrate message icon in svelt menu

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/dist/resources/objects/talk.png          | Bin 516 -> 389 bytes
 front/src/Components/Menu/MenuIcon.svelte      |  13 ++++++++++++-
 front/src/Components/images/logo-WA-min.png    | Bin 2856 -> 0 bytes
 front/src/Components/images/logo-WA-pixel.png  | Bin 0 -> 1270 bytes
 .../Components/images/logo-message-pixel.png   | Bin 0 -> 389 bytes
 front/src/Phaser/Components/OpenChatIcon.ts    |  17 -----------------
 front/src/Phaser/Game/GameScene.ts             |  13 -------------
 7 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 front/src/Components/images/logo-WA-min.png
 create mode 100644 front/src/Components/images/logo-WA-pixel.png
 create mode 100644 front/src/Components/images/logo-message-pixel.png
 delete mode 100644 front/src/Phaser/Components/OpenChatIcon.ts

diff --git a/front/dist/resources/objects/talk.png b/front/dist/resources/objects/talk.png
index bc06d3b0edc43646c597d26e68bcafa0d13798fe..794a6e9d40a6d203d91131311420613b4e2f5191 100644
GIT binary patch
literal 389
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlR
zPZ!6KiaBp*-{n1IAkZv*gkuBy8^+6r<bagGk=LQ8G<R(&EBSX%z`jstey4`+)@w^$
zHJAQnD#}{Bbm<3!&(GWxm^n-wB1;?0KQBMsTjhNJ`{ti}-nM+<oWRH;wcyY5#8)%F
zf3Q-lWlCXaWYbv9H>38MZI1d9{{|j~3k**sV*h-uaxgF0chC8~|9l2XhXssY<?I#4
z@^eq#`}+3ry|0(m9oPgi8iefFZ_MmIx8&&WJufU(poTr<+u&lISkhhrH7&J*J)&y=
z_U-d3y??QsU|`}6FniB%`kwK-iFS-e4GzpAAmh70_AdP`WAMv-r^YTb2^Wy@Mt^o4
z$bp*T`d{>(FQ+D0!(HPoTNTQ{F5gvNVXrv{WU9rq)Srx3nF5bz%n}m>hAV@otDnm{
Hr-UW|@Ftk?

delta 504
zcmV<U0SEqt1B3)2iBL{Q4GJ0x0000DNk~Le0000X0000X2nGNE09WL~Z;>Gwf3`_P
zK~z|U?Uz5V!B7~+pL<=2lm!ck8hir@R%Rc-W@0B{FOist#AK0JO$M8RLE;0jiA_RC
zECvRNbJI8XG@5ADpQd-{FL~3xJ*THn&-1pY{Q|&XG2d1TfGy&NA9>gB_fve5)oO+7
z^=f!TCP@<eG+wWl{T2PgunUv(e}4+oEM~JAL{ZcnzEY{6+wGbwA{Y!J6bfm!dpsW6
z+BLz^6;Z8LQ7jgfyj(7mkDPoyk5;Sowg}yth{xkNolZ)gNF)>=Ws=Dx!r`#FBGT!!
zD$isxsyv&`zAXTDVctM?bUGaj1_M>YWHN!z=cE1oeoxk1E*HZCACJf9e?;tdJBnN8
z^Epzf6dkG6YS?bK==b}^Zx28q5HQ^L?o!)sw`p--E|<*dbh1b!^6}-qP$=jx<?>9(
zluD(iY<LCDM|81RU_2gUI2=-bI2=fjQ3OGt7n{T3P|mN{>#DP-)2Y54ZnvAoVll&C
zNB5%F>nT$|8jbY&zJ8HMP9cgSJD<-aqS0t*_BZuCv0ksyY&I2p^)PKFxUHMbhDD=M
uYwX~W%jKBM<<e}o|3x{r2#)n40Q>^e4ZcPX;MDQ}0000<MNUMnLSTYx0_q3=

diff --git a/front/src/Components/Menu/MenuIcon.svelte b/front/src/Components/Menu/MenuIcon.svelte
index 92a52ba3..02d6eb53 100644
--- a/front/src/Components/Menu/MenuIcon.svelte
+++ b/front/src/Components/Menu/MenuIcon.svelte
@@ -1,11 +1,16 @@
 <script lang="typescript">
-    import logoWA from "../images/logo-WA-min.png"
+    import logoWA from "../images/logo-WA-pixel.png"
+    import logoTalk from "../images/logo-message-pixel.png"
     import {menuVisiblilityStore} from "../../Stores/MenuStore";
+    import {chatVisibilityStore} from "../../Stores/ChatStore";
     import {get} from "svelte/store";
 
     function showMenu(){
         menuVisiblilityStore.set(!get(menuVisiblilityStore))
     }
+    function showChat(){
+        chatVisibilityStore.set(true);
+    }
 
     function onKeyDown(e: KeyboardEvent) {
         if (e.key === "Tab") {
@@ -18,17 +23,23 @@
 
 <main class="menuIcon">
     <img src={logoWA} alt="open menu" class="nes-pointer" on:click|preventDefault={showMenu}>
+    <img src={logoTalk} alt="open menu" class="nes-pointer" on:click|preventDefault={showChat}>
 </main>
 
 <style lang="scss">
   .menuIcon {
+    display: inline-grid;
     margin: 25px;
     img {
       pointer-events: auto;
       width: 60px;
       padding-top: 0;
+      margin: 3px
     }
   }
+  .menuIcon img:hover{
+    transform: scale(1.2);
+  }
   @media only screen and (max-width: 800px), only screen and (max-height: 800px) {
     .menuIcon {
       margin: 3px;
diff --git a/front/src/Components/images/logo-WA-min.png b/front/src/Components/images/logo-WA-min.png
deleted file mode 100644
index 429d75e5b8b3755411b88bd175701be542506723..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2856
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
GLSTaMxk=vu

diff --git a/front/src/Components/images/logo-WA-pixel.png b/front/src/Components/images/logo-WA-pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..f414fcef97d36fb38f459095e3473ac098d36c77
GIT binary patch
literal 1270
zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XT
z000XT0n*)m`~Uz1s7XXYRCt{2n@emPMHt8ber)`XlQ=bL+K{Ae9JOhsK9EugPT^Li
zClI0>5K>Vq4$uP#siKvTQcgUiwBi7Q1F6(<;8Ibzg##Q25{Rgc5*pWy<G6O6*lrTL
zcAR*<XeRaIM;&{;yY?>jPg;3rcV_mRzrXo*W_DM@aU6C+qtWb~LE&&5r`gFut(qGr
z1x*1IU_)IgiUH;NeCN?oMK>rseS63Ag)yPwJ)kLo0&J)&q(7*-&zGZIOlWuyXbPYJ
z8|q3?3{ZQYFGpcakj(>J{d?(_i_K!fiNgcvb~=jklH>J2HUU0(`xUwsHuS427ce?9
zT$Gm_|6d897IXkU&b8It<&wm7SAP$5Ivw`)bRoDLMeIouHj5ekJ<ow<IoNF$%rE%)
zyc!MQbhPn#<s$KDKCfokJmB+he}HE(fOD^(!fs~=Jw_UQ?xS(^ba&$P%foqjuT9*_
z%UdfNz6<E(s`&l0ufo~chOfW>nYuNe20;?=mI7f+&w29l9vSS*%UdgC6JT)P9{Nif
zm4(~}j}Hyt&%18?_{&sY-ovgwy!GK{HEleh;RiyZJmBWl%NRa-kWUAeBN*J@$EQ7B
zKb#J`m`fD#$MhV|yf-FUeWC=|*hs+_2=Qr_&0uEE&8IV52ENpWI18zpYLI5rbUz+{
zBD%g@L<wMQ(V^XD=F^!>1}w|+X{}aE#{$)|wY5b{`hzRbVOxN3ctu=`3lJ9swR+fW
zHa_{xF3@HxQMf$OsQh;X+3o^T;%IM0<ncO;j0U?p>@@ZiGInhOv+hN~SCwrb6beVm
zt+rK+$!Ngd-Mh$=Jz82A93MJ>79B@7n~8zLZpGQxPT}OSLxSs;O@P(47#-Wo!RF>B
zTC^P95{V=_>=ulUoXoo;Rf_6{!X)T=y<WOMIdup3mqIiS>Gjq1W>v(1T$ZD2nEd??
zJ#u$`5hE|Y0ES_zu1|deMAmTQ_OE=J2q1=rpA9y=0FrkBG8$a)1z<KBq^?>PBo)BG
zFi5A<l23ptfef3iW~1P8l6C<yVoRk`QdU_pu~-Z%k;j6|HGB+EwE%|(dhvX>lb<zK
zgX+csxm<qtO*#)C?tlK$IR2V(S6=ujsuN&OS10aGen%Tk@c4qb_~|$NGX|k3Qh-Eq
z1F?7l%rn+f7`+bj9xs9`+iL~)9z3k-pU<L50ZKKVU^N*4c9T9}kpjg9LE_q_8c&#U
z`*8Z5Pb9lu-8~=}3L}{_cIare<ey&-BbnSjZ#7jv>nnvQ0cP(nqSb1~!2`X5%0*XW
zh$j+s-)=F&!2IWkWGJ15EQWHKG&1ZK7W~_*&kvR!i7~kdQ38xzouJE5H^wgsD!016
zjy9`_?&q!|7eZHpwZK3A5H5akU5u$E5#0r5-Cn$L;fkOa9Eh9e{?l0^k%(Ax1S492
z^>_kPf6wB}>$hmSz14~nL;D5S!!SDN3tm&c`O|OoHxyYFYi3C#3xe5)phsN2c<ER*
z@B0+5Am^_9$VJ0H9Bug7VDnw!npvVyngS@mhPu-HW=L*>lulCs1=vtmn%@rB&J<<R
g6hHws)DHmv0);1%K-c%`{{R3007*qoM6N<$f(7nSzW@LL

literal 0
HcmV?d00001

diff --git a/front/src/Components/images/logo-message-pixel.png b/front/src/Components/images/logo-message-pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..794a6e9d40a6d203d91131311420613b4e2f5191
GIT binary patch
literal 389
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlR
zPZ!6KiaBp*-{n1IAkZv*gkuBy8^+6r<bagGk=LQ8G<R(&EBSX%z`jstey4`+)@w^$
zHJAQnD#}{Bbm<3!&(GWxm^n-wB1;?0KQBMsTjhNJ`{ti}-nM+<oWRH;wcyY5#8)%F
zf3Q-lWlCXaWYbv9H>38MZI1d9{{|j~3k**sV*h-uaxgF0chC8~|9l2XhXssY<?I#4
z@^eq#`}+3ry|0(m9oPgi8iefFZ_MmIx8&&WJufU(poTr<+u&lISkhhrH7&J*J)&y=
z_U-d3y??QsU|`}6FniB%`kwK-iFS-e4GzpAAmh70_AdP`WAMv-r^YTb2^Wy@Mt^o4
z$bp*T`d{>(FQ+D0!(HPoTNTQ{F5gvNVXrv{WU9rq)Srx3nF5bz%n}m>hAV@otDnm{
Hr-UW|@Ftk?

literal 0
HcmV?d00001

diff --git a/front/src/Phaser/Components/OpenChatIcon.ts b/front/src/Phaser/Components/OpenChatIcon.ts
deleted file mode 100644
index 8c648bc1..00000000
--- a/front/src/Phaser/Components/OpenChatIcon.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { DEPTH_INGAME_TEXT_INDEX } from "../Game/DepthIndexes";
-import { chatVisibilityStore } from "../../Stores/ChatStore";
-
-export const openChatIconName = "openChatIcon";
-export class OpenChatIcon extends Phaser.GameObjects.Image {
-    constructor(scene: Phaser.Scene, x: number, y: number) {
-        super(scene, x, y, openChatIconName, 3);
-        scene.add.existing(this);
-        this.setScrollFactor(0, 0);
-        this.setOrigin(0, 1);
-        this.setInteractive();
-        //this.setVisible(false);
-        this.setDepth(DEPTH_INGAME_TEXT_INDEX);
-
-        this.on("pointerup", () => chatVisibilityStore.set(true));
-    }
-}
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 485284f6..ead94544 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -38,7 +38,6 @@ import { HtmlUtils } from "../../WebRtc/HtmlUtils";
 import { mediaManager } from "../../WebRtc/MediaManager";
 import { SimplePeer } from "../../WebRtc/SimplePeer";
 import { addLoader, removeLoader } from "../Components/Loader";
-import { OpenChatIcon, openChatIconName } from "../Components/OpenChatIcon";
 import { lazyLoadPlayerCharacterTextures, loadCustomTexture } from "../Entity/PlayerTexturesLoadingManager";
 import { RemotePlayer } from "../Entity/RemotePlayer";
 import type { ActionableItem } from "../Items/ActionableItem";
@@ -174,7 +173,6 @@ export class GameScene extends DirtyScene {
     private createPromiseResolve!: (value?: void | PromiseLike<void>) => void;
     private iframeSubscriptionList!: Array<Subscription>;
     private peerStoreUnsubscribe!: () => void;
-    private chatVisibilityUnsubscribe!: () => void;
     private emoteUnsubscribe!: () => void;
     private emoteMenuUnsubscribe!: () => void;
     private biggestAvailableAreaStoreUnsubscribe!: () => void;
@@ -197,7 +195,6 @@ export class GameScene extends DirtyScene {
     private outlinedItem: ActionableItem | null = null;
     public userInputManager!: UserInputManager;
     private isReconnecting: boolean | undefined = undefined;
-    private openChatIcon!: OpenChatIcon;
     private playerName!: string;
     private characterLayers!: string[];
     private companion!: string | null;
@@ -245,7 +242,6 @@ export class GameScene extends DirtyScene {
             }
         }
 
-        this.load.image(openChatIconName, "resources/objects/talk.png");
         if (touchScreenManager.supportTouchScreen) {
             this.load.image(joystickBaseKey, joystickBaseImg);
             this.load.image(joystickThumbKey, joystickThumbImg);
@@ -584,8 +580,6 @@ export class GameScene extends DirtyScene {
             this.outlinedItem?.activate();
         });
 
-        this.openChatIcon = new OpenChatIcon(this, 2, this.game.renderer.height - 2);
-
         this.reposition();
 
         // From now, this game scene will be notified of reposition events
@@ -618,10 +612,6 @@ export class GameScene extends DirtyScene {
             oldPeerNumber = newPeerNumber;
         });
 
-        this.chatVisibilityUnsubscribe = chatVisibilityStore.subscribe((v) => {
-            this.openChatIcon.setVisible(!v);
-        });
-
         this.emoteUnsubscribe = emoteStore.subscribe((emoteKey) => {
             if (emoteKey) {
                 this.CurrentPlayer?.playEmote(emoteKey);
@@ -1327,7 +1317,6 @@ ${escapedMessage}
         this.pinchManager?.destroy();
         this.emoteManager.destroy();
         this.peerStoreUnsubscribe();
-        this.chatVisibilityUnsubscribe();
         this.emoteUnsubscribe();
         this.emoteMenuUnsubscribe();
         this.biggestAvailableAreaStoreUnsubscribe();
@@ -1802,8 +1791,6 @@ ${escapedMessage}
         return undefined;
     }
     private reposition(): void {
-        this.openChatIcon.setY(this.game.renderer.height - 2);
-
         // Recompute camera offset if needed
         biggestAvailableAreaStore.recompute();
     }

From 9dd3e8ff85b4485caa9319eea29e5ae87ac6145d Mon Sep 17 00:00:00 2001
From: Kharhamel <oognic@gmail.com>
Date: Wed, 6 Oct 2021 17:59:20 +0200
Subject: [PATCH 2/6] FIX: being in a silent zone new forces mediaConstraints
 to false

---
 front/src/Components/CameraControls.svelte |  3 +++
 front/src/Stores/MediaStore.ts             | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/front/src/Components/CameraControls.svelte b/front/src/Components/CameraControls.svelte
index 6dc2726a..728c84e9 100644
--- a/front/src/Components/CameraControls.svelte
+++ b/front/src/Components/CameraControls.svelte
@@ -15,6 +15,7 @@
     import {onDestroy} from "svelte";
 
     function screenSharingClick(): void {
+        if (isSilent) return;
         if ($requestedScreenSharingState === true) {
             requestedScreenSharingState.disableScreenSharing();
         } else {
@@ -23,6 +24,7 @@
     }
 
     function cameraClick(): void {
+        if (isSilent) return;
         if ($requestedCameraState === true) {
             requestedCameraState.disableWebcam();
         } else {
@@ -31,6 +33,7 @@
     }
 
     function microphoneClick(): void {
+        if (isSilent) return;
         if ($requestedMicrophoneState === true) {
             requestedMicrophoneState.disableMicrophone();
         } else {
diff --git a/front/src/Stores/MediaStore.ts b/front/src/Stores/MediaStore.ts
index c5bfdc83..8a8e39e2 100644
--- a/front/src/Stores/MediaStore.ts
+++ b/front/src/Stores/MediaStore.ts
@@ -177,6 +177,11 @@ function createVideoConstraintStore() {
     };
 }
 
+/**
+ * A store containing if user is silent, so if he is in silent zone. This permit to show et hide camera of user
+ */
+export const isSilentStore = writable(false);
+
 export const videoConstraintStore = createVideoConstraintStore();
 
 /**
@@ -234,6 +239,7 @@ export const mediaStreamConstraintsStore = derived(
         audioConstraintStore,
         privacyShutdownStore,
         cameraEnergySavingStore,
+        isSilentStore,
     ],
     (
         [
@@ -245,6 +251,7 @@ export const mediaStreamConstraintsStore = derived(
             $audioConstraintStore,
             $privacyShutdownStore,
             $cameraEnergySavingStore,
+            $isSilentStore,
         ],
         set
     ) => {
@@ -294,6 +301,11 @@ export const mediaStreamConstraintsStore = derived(
             //currentAudioConstraint = false;
         }
 
+        if ($isSilentStore === true) {
+            currentVideoConstraint = false;
+            currentAudioConstraint = false;
+        }
+
         // Let's make the changes only if the new value is different from the old one.
         if (
             previousComputedVideoConstraint != currentVideoConstraint ||
@@ -607,13 +619,3 @@ localStreamStore.subscribe((streamResult) => {
         }
     }
 });
-
-/**
- * A store containing the real active media is mobile
- */
-export const obtainedMediaConstraintIsMobileStore = writable(false);
-
-/**
- * A store containing if user is silent, so if he is in silent zone. This permit to show et hide camera of user
- */
-export const isSilentStore = writable(false);

From 5255847452fcc521d81193ea8f20c6cae380e4bb Mon Sep 17 00:00:00 2001
From: Kharhamel <oognic@gmail.com>
Date: Thu, 7 Oct 2021 11:04:40 +0200
Subject: [PATCH 3/6] FIX: if a conversion group move to another user, this
 user will be added to the group

---
 back/src/Model/GameRoom.ts                   |  2 +
 back/src/Model/Group.ts                      | 32 ++++++----
 back/src/Model/PositionNotifier.ts           | 32 +++++++++-
 back/src/Services/GaugeManager.ts            |  9 ---
 back/tests/getNearbyDescriptorsMatrixTest.ts | 67 ++++++++++++++++++++
 5 files changed, 117 insertions(+), 25 deletions(-)
 create mode 100644 back/tests/getNearbyDescriptorsMatrixTest.ts

diff --git a/back/src/Model/GameRoom.ts b/back/src/Model/GameRoom.ts
index 5667146a..74849fe0 100644
--- a/back/src/Model/GameRoom.ts
+++ b/back/src/Model/GameRoom.ts
@@ -181,6 +181,7 @@ export class GameRoom {
 
     private updateUserGroup(user: User): void {
         user.group?.updatePosition();
+        user.group?.searchForNearbyUsers();
 
         if (user.silent) {
             return;
@@ -206,6 +207,7 @@ export class GameRoom {
                     const group: Group = new Group(
                         this.roomUrl,
                         [user, closestUser],
+                        this.groupRadius,
                         this.connectCallback,
                         this.disconnectCallback,
                         this.positionNotifier
diff --git a/back/src/Model/Group.ts b/back/src/Model/Group.ts
index 5a0f3be6..931ddda5 100644
--- a/back/src/Model/Group.ts
+++ b/back/src/Model/Group.ts
@@ -1,10 +1,10 @@
-import { ConnectCallback, DisconnectCallback } from "./GameRoom";
+import { ConnectCallback, DisconnectCallback, GameRoom } from "./GameRoom";
 import { User } from "./User";
 import { PositionInterface } from "_Model/PositionInterface";
 import { Movable } from "_Model/Movable";
 import { PositionNotifier } from "_Model/PositionNotifier";
-import { gaugeManager } from "../Services/GaugeManager";
 import { MAX_PER_GROUP } from "../Enum/EnvironmentVariable";
+import type { Zone } from "../Model/Zone";
 
 export class Group implements Movable {
     private static nextId: number = 1;
@@ -13,13 +13,14 @@ export class Group implements Movable {
     private users: Set<User>;
     private x!: number;
     private y!: number;
-    private hasEditedGauge: boolean = false;
     private wasDestroyed: boolean = false;
     private roomId: string;
+    private currentZone: Zone | null = null;
 
     constructor(
         roomId: string,
         users: User[],
+        private groupRadius: number,
         private connectCallback: ConnectCallback,
         private disconnectCallback: DisconnectCallback,
         private positionNotifier: PositionNotifier
@@ -28,13 +29,6 @@ export class Group implements Movable {
         this.users = new Set<User>();
         this.id = Group.nextId;
         Group.nextId++;
-        //we only send a event for prometheus metrics if the group lives more than 5 seconds
-        setTimeout(() => {
-            if (!this.wasDestroyed) {
-                this.hasEditedGauge = true;
-                gaugeManager.incNbGroupsPerRoomGauge(roomId);
-            }
-        }, 5000);
 
         users.forEach((user: User) => {
             this.join(user);
@@ -85,9 +79,22 @@ export class Group implements Movable {
         this.y = y;
 
         if (oldX === undefined) {
-            this.positionNotifier.enter(this);
+            this.currentZone = this.positionNotifier.enter(this);
         } else {
-            this.positionNotifier.updatePosition(this, { x, y }, { x: oldX, y: oldY });
+            this.currentZone = this.positionNotifier.updatePosition(this, { x, y }, { x: oldX, y: oldY });
+        }
+    }
+
+    searchForNearbyUsers(): void {
+        if (!this.currentZone) return;
+
+        for (const user of this.positionNotifier.getAllUsersInSquareAroundZone(this.currentZone)) {
+            if (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);
+                this.updatePosition();
+            }
         }
     }
 
@@ -126,7 +133,6 @@ export class Group implements Movable {
      * Usually used when there is only one user left.
      */
     destroy(): void {
-        if (this.hasEditedGauge) gaugeManager.decNbGroupsPerRoomGauge(this.roomId);
         for (const user of this.users) {
             this.leave(user);
         }
diff --git a/back/src/Model/PositionNotifier.ts b/back/src/Model/PositionNotifier.ts
index 4f911637..2052f229 100644
--- a/back/src/Model/PositionNotifier.ts
+++ b/back/src/Model/PositionNotifier.ts
@@ -12,7 +12,7 @@ import { EmoteCallback, EntersCallback, LeavesCallback, MovesCallback, Zone } fr
 import { Movable } from "_Model/Movable";
 import { PositionInterface } from "_Model/PositionInterface";
 import { ZoneSocket } from "../RoomManager";
-import { User } from "_Model/User";
+import { User } from "../Model/User";
 import { EmoteEventMessage } from "../Messages/generated/messages_pb";
 
 interface ZoneDescriptor {
@@ -20,6 +20,17 @@ interface ZoneDescriptor {
     j: number;
 }
 
+export function* getNearbyDescriptorsMatrix(middleZoneDescriptor: ZoneDescriptor): Generator<ZoneDescriptor> {
+    for (let n = 0; n < 9; n++) {
+        const i = middleZoneDescriptor.i + ((n % 3) - 1);
+        const j = middleZoneDescriptor.j + (Math.floor(n / 3) - 1);
+
+        if (i >= 0 && j >= 0) {
+            yield { i, j };
+        }
+    }
+}
+
 export class PositionNotifier {
     // TODO: we need a way to clean the zones if no one is in the zone and no one listening (to free memory!)
 
@@ -41,14 +52,15 @@ export class PositionNotifier {
         };
     }
 
-    public enter(thing: Movable): void {
+    public enter(thing: Movable): Zone {
         const position = thing.getPosition();
         const zoneDesc = this.getZoneDescriptorFromCoordinates(position.x, position.y);
         const zone = this.getZone(zoneDesc.i, zoneDesc.j);
         zone.enter(thing, null, position);
+        return zone;
     }
 
-    public updatePosition(thing: Movable, newPosition: PositionInterface, oldPosition: PositionInterface): void {
+    public updatePosition(thing: Movable, newPosition: PositionInterface, oldPosition: PositionInterface): Zone {
         // Did we change zone?
         const oldZoneDesc = this.getZoneDescriptorFromCoordinates(oldPosition.x, oldPosition.y);
         const newZoneDesc = this.getZoneDescriptorFromCoordinates(newPosition.x, newPosition.y);
@@ -62,9 +74,11 @@ export class PositionNotifier {
 
             // Enter new zone
             newZone.enter(thing, oldZone, newPosition);
+            return newZone;
         } else {
             const zone = this.getZone(oldZoneDesc.i, oldZoneDesc.j);
             zone.move(thing, newPosition);
+            return zone;
         }
     }
 
@@ -106,4 +120,16 @@ export class PositionNotifier {
         const zone = this.getZone(zoneDesc.i, zoneDesc.j);
         zone.emitEmoteEvent(emoteEventMessage);
     }
+
+    public *getAllUsersInSquareAroundZone(zone: Zone): Generator<User> {
+        const zoneDescriptor = this.getZoneDescriptorFromCoordinates(zone.x, zone.y);
+        for (const d of getNearbyDescriptorsMatrix(zoneDescriptor)) {
+            const zone = this.getZone(d.i, d.j);
+            for (const thing of zone.getThings()) {
+                if (thing instanceof User) {
+                    yield thing;
+                }
+            }
+        }
+    }
 }
diff --git a/back/src/Services/GaugeManager.ts b/back/src/Services/GaugeManager.ts
index 6d2183d8..740692a8 100644
--- a/back/src/Services/GaugeManager.ts
+++ b/back/src/Services/GaugeManager.ts
@@ -52,15 +52,6 @@ class GaugeManager {
         this.nbClientsGauge.dec();
         this.nbClientsPerRoomGauge.dec({ room: roomId });
     }
-
-    incNbGroupsPerRoomGauge(roomId: string): void {
-        this.nbGroupsPerRoomCounter.inc({ room: roomId });
-        this.nbGroupsPerRoomGauge.inc({ room: roomId });
-    }
-
-    decNbGroupsPerRoomGauge(roomId: string): void {
-        this.nbGroupsPerRoomGauge.dec({ room: roomId });
-    }
 }
 
 export const gaugeManager = new GaugeManager();
diff --git a/back/tests/getNearbyDescriptorsMatrixTest.ts b/back/tests/getNearbyDescriptorsMatrixTest.ts
new file mode 100644
index 00000000..6c81db76
--- /dev/null
+++ b/back/tests/getNearbyDescriptorsMatrixTest.ts
@@ -0,0 +1,67 @@
+import "jasmine";
+import { getNearbyDescriptorsMatrix } from "../src/Model/PositionNotifier";
+
+describe("getNearbyDescriptorsMatrix", () => {
+    it("should create a matrix of coordinates in a square around the parameter", () => {
+        const matrix = [];
+        for (const d of getNearbyDescriptorsMatrix({ i: 1, j: 1 })) {
+            matrix.push(d);
+        }
+
+        expect(matrix).toEqual([
+            { i: 0, j: 0 },
+            { i: 1, j: 0 },
+            { i: 2, j: 0 },
+            { i: 0, j: 1 },
+            { i: 1, j: 1 },
+            { i: 2, j: 1 },
+            { i: 0, j: 2 },
+            { i: 1, j: 2 },
+            { i: 2, j: 2 },
+        ]);
+    });
+
+    it("should create a matrix of coordinates in a square around the parameter bis", () => {
+        const matrix = [];
+        for (const d of getNearbyDescriptorsMatrix({ i: 8, j: 3 })) {
+            matrix.push(d);
+        }
+
+        expect(matrix).toEqual([
+            { i: 7, j: 2 },
+            { i: 8, j: 2 },
+            { i: 9, j: 2 },
+            { i: 7, j: 3 },
+            { i: 8, j: 3 },
+            { i: 9, j: 3 },
+            { i: 7, j: 4 },
+            { i: 8, j: 4 },
+            { i: 9, j: 4 },
+        ]);
+    });
+
+    it("should not create a matrix with negative coordinates", () => {
+        const matrix = [];
+        for (const d of getNearbyDescriptorsMatrix({ i: 0, j: 0 })) {
+            matrix.push(d);
+        }
+
+        expect(matrix).toEqual([
+            { i: 0, j: 0 },
+            { i: 1, j: 0 },
+            { i: 0, j: 1 },
+            { i: 1, j: 1 },
+        ]);
+    });
+
+    /*it("should not create a matrix with coordinates bigger than its dimmensions", () => {
+        const matrix = getNearbyDescriptorsMatrix({i: 4, j: 4}, 5, 5);
+
+        expect(matrix).toEqual([
+            {i: 3,j: 3},
+            {i: 4,j: 3},
+            {i: 3,j: 4},
+            {i: 4,j: 4},
+        ])
+    });*/
+});

From 59fa68e0639b3aa8e6a0db7e4421d51a9c9d0c94 Mon Sep 17 00:00:00 2001
From: Kharhamel <oognic@gmail.com>
Date: Fri, 8 Oct 2021 11:53:45 +0200
Subject: [PATCH 4/6] FIX: updated posthog client version and fixed a bug with
 its toolbar

---
 front/package.json                          | 2 +-
 front/src/Administration/AnalyticsClient.ts | 4 ++++
 front/yarn.lock                             | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/front/package.json b/front/package.json
index 8fd4f4c3..ec81d8a7 100644
--- a/front/package.json
+++ b/front/package.json
@@ -50,7 +50,7 @@
     "phaser": "^3.54.0",
     "phaser-animated-tiles": "workadventure/phaser-animated-tiles#da68bbededd605925621dd4f03bd27e69284b254",
     "phaser3-rex-plugins": "^1.1.42",
-    "posthog-js": "^1.13.12",
+    "posthog-js": "^1.14.1",
     "queue-typescript": "^1.0.1",
     "quill": "1.3.6",
     "quill-delta-to-html": "^0.12.0",
diff --git a/front/src/Administration/AnalyticsClient.ts b/front/src/Administration/AnalyticsClient.ts
index f73a1981..c8f13e3c 100644
--- a/front/src/Administration/AnalyticsClient.ts
+++ b/front/src/Administration/AnalyticsClient.ts
@@ -1,4 +1,6 @@
 import { POSTHOG_API_KEY, POSTHOG_URL } from "../Enum/EnvironmentVariable";
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+declare let window: any;
 
 class AnalyticsClient {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -8,6 +10,8 @@ class AnalyticsClient {
         if (POSTHOG_API_KEY && POSTHOG_URL) {
             this.posthogPromise = import("posthog-js").then(({ default: posthog }) => {
                 posthog.init(POSTHOG_API_KEY, { api_host: POSTHOG_URL, disable_cookie: true });
+                //the posthog toolbar need a reference in window to be able to work
+                window.posthog = posthog;
                 return posthog;
             });
         } else {
diff --git a/front/yarn.lock b/front/yarn.lock
index b2c0f785..f94e659f 100644
--- a/front/yarn.lock
+++ b/front/yarn.lock
@@ -4494,10 +4494,10 @@ postcss@^8.2.10:
     nanoid "^3.1.23"
     source-map "^0.6.1"
 
-posthog-js@^1.13.12:
-  version "1.13.12"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.13.12.tgz#b54efcb92de43724c889048135ccaae3dc4b874c"
-  integrity sha512-MU1I0zSVhdCcnWI8jAZLtbNJmjfg9AnhUDq5dUzNkb0qPXtNz17BekalnNwDMKs0Zlek3UCOVsIpyc85M+VRNA==
+posthog-js@^1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.14.1.tgz#68553b9074c686784b994b3f433ad035b241deaa"
+  integrity sha512-gVFk6fsTxG9T+5oqZghffYovENSrs05v3hQMiRQENtGlsHGpt1fnoQ52En8Vg5brMxqLv1XZO4lMgm12/ubH0Q==
   dependencies:
     "@sentry/types" "^6.11.0"
     fflate "^0.4.1"

From 57bfc1001fece5cf644cbac84c4e08e6be9264e4 Mon Sep 17 00:00:00 2001
From: Kharhamel <oognic@gmail.com>
Date: Mon, 11 Oct 2021 11:34:10 +0200
Subject: [PATCH 5/6] FIX: edited changelog

---
 CHANGELOG.md                |  5 +++++
 front/src/Connexion/Room.ts | 19 -------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4e7db82..18f26012 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Version develop
 
+### Bugfix
+- Moving a discussion over a user will now add this user to the discussion
+- Being in a silent zone new forces mediaConstraints to false (#1508)
+- Fixes for the emote menu (#1501)
+
 ## Version 1.5.0
 ### Updates
 - Added support for login with OpenID Connect
diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts
index 06706f6a..9161b7d8 100644
--- a/front/src/Connexion/Room.ts
+++ b/front/src/Connexion/Room.ts
@@ -133,25 +133,6 @@ export class Room {
         }
     }
 
-    /**
-     * @deprecated
-     */
-    private parsePrivateUrl(url: string): { organizationSlug: string; worldSlug: string; roomSlug?: string } {
-        const regex = /@\/([^/]+)\/([^/]+)(?:\/([^/]*))?/gm;
-        const match = regex.exec(url);
-        if (!match) {
-            throw new Error("Invalid URL " + url);
-        }
-        const results: { organizationSlug: string; worldSlug: string; roomSlug?: string } = {
-            organizationSlug: match[1],
-            worldSlug: match[2],
-        };
-        if (match[3] !== undefined) {
-            results.roomSlug = match[3];
-        }
-        return results;
-    }
-
     public isDisconnected(): boolean {
         const alone = this._search.get("alone");
         if (alone && alone !== "0" && alone.toLowerCase() !== "false") {

From 726f52976d407371035fe372cd6cc2a66dad39e8 Mon Sep 17 00:00:00 2001
From: Kharhamel <oognic@gmail.com>
Date: Thu, 30 Sep 2021 16:14:55 +0200
Subject: [PATCH 6/6] FEATURE: analytics client now scrape user email and room
 group

---
 front/src/Administration/AnalyticsClient.ts     | 8 ++++----
 front/src/Connexion/ConnectionManager.ts        | 4 ++--
 front/src/Connexion/LocalUser.ts                | 6 +++++-
 front/src/Connexion/Room.ts                     | 6 ++++++
 front/src/Phaser/Game/GameScene.ts              | 2 +-
 pusher/src/Controller/AuthenticateController.ts | 1 +
 pusher/src/Controller/MapController.ts          | 1 +
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/front/src/Administration/AnalyticsClient.ts b/front/src/Administration/AnalyticsClient.ts
index c8f13e3c..64548515 100644
--- a/front/src/Administration/AnalyticsClient.ts
+++ b/front/src/Administration/AnalyticsClient.ts
@@ -19,10 +19,10 @@ class AnalyticsClient {
         }
     }
 
-    identifyUser(uuid: string) {
+    identifyUser(uuid: string, email: string | null) {
         this.posthogPromise
             .then((posthog) => {
-                posthog.identify(uuid, { uuid, wa: true });
+                posthog.identify(uuid, { uuid, email, wa: true });
             })
             .catch();
     }
@@ -43,10 +43,10 @@ class AnalyticsClient {
             .catch();
     }
 
-    enteredRoom(roomId: string) {
+    enteredRoom(roomId: string, roomGroup: string | null) {
         this.posthogPromise
             .then((posthog) => {
-                posthog.capture("$pageView", { roomId });
+                posthog.capture("$pageView", { roomId, roomGroup });
             })
             .catch();
     }
diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 87efc804..b346f450 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -112,7 +112,7 @@ class ConnectionManager {
             const data = await Axios.post(`${PUSHER_URL}/register`, { organizationMemberToken }).then(
                 (res) => res.data
             );
-            this.localUser = new LocalUser(data.userUuid, data.textures);
+            this.localUser = new LocalUser(data.userUuid, data.textures, data.email);
             this.authToken = data.authToken;
             localUserStore.saveUser(this.localUser);
             localUserStore.setAuthToken(this.authToken);
@@ -196,7 +196,7 @@ class ConnectionManager {
             return Promise.reject(new Error("Invalid URL"));
         }
         if (this.localUser) {
-            analyticsClient.identifyUser(this.localUser.uuid);
+            analyticsClient.identifyUser(this.localUser.uuid, this.localUser.email);
         }
 
         this.serviceWorker = new _ServiceWorker();
diff --git a/front/src/Connexion/LocalUser.ts b/front/src/Connexion/LocalUser.ts
index 42b4bbf8..d4498883 100644
--- a/front/src/Connexion/LocalUser.ts
+++ b/front/src/Connexion/LocalUser.ts
@@ -24,5 +24,9 @@ export function areCharacterLayersValid(value: string[] | null): boolean {
 }
 
 export class LocalUser {
-    constructor(public readonly uuid: string, public textures: CharacterTexture[]) {}
+    constructor(
+        public readonly uuid: string,
+        public textures: CharacterTexture[],
+        public email: string | null = null
+    ) {}
 }
diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts
index 9161b7d8..860223c6 100644
--- a/front/src/Connexion/Room.ts
+++ b/front/src/Connexion/Room.ts
@@ -21,6 +21,7 @@ export class Room {
     private instance: string | undefined;
     private readonly _search: URLSearchParams;
     private _contactPage: string | undefined;
+    private _group: string | null = null;
 
     private constructor(private roomUrl: URL) {
         this.id = roomUrl.pathname;
@@ -104,6 +105,7 @@ export class Room {
         console.log("Map ", this.id, " resolves to URL ", data.mapUrl);
         this._mapUrl = data.mapUrl;
         this._textures = data.textures;
+        this._group = data.group;
         this._authenticationMandatory = data.authenticationMandatory || false;
         this._iframeAuthentication = data.iframeAuthentication;
         this._contactPage = data.contactPage || CONTACT_URL;
@@ -185,4 +187,8 @@ export class Room {
     get contactPage(): string | undefined {
         return this._contactPage;
     }
+
+    get group(): string | null {
+        return this._group;
+    }
 }
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index ead94544..057f9fb1 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -428,7 +428,7 @@ export class GameScene extends DirtyScene {
 
         gameManager.gameSceneIsCreated(this);
         urlManager.pushRoomIdToUrl(this.room);
-        analyticsClient.enteredRoom(this.room.id);
+        analyticsClient.enteredRoom(this.room.id, this.room.group);
         contactPageStore.set(this.room.contactPage);
 
         if (touchScreenManager.supportTouchScreen) {
diff --git a/pusher/src/Controller/AuthenticateController.ts b/pusher/src/Controller/AuthenticateController.ts
index ce217439..972cc102 100644
--- a/pusher/src/Controller/AuthenticateController.ts
+++ b/pusher/src/Controller/AuthenticateController.ts
@@ -148,6 +148,7 @@ export class AuthenticateController extends BaseController {
                         JSON.stringify({
                             authToken,
                             userUuid,
+                            email,
                             roomUrl,
                             mapUrlStart,
                             organizationMemberToken,
diff --git a/pusher/src/Controller/MapController.ts b/pusher/src/Controller/MapController.ts
index ae8135a3..f775b50c 100644
--- a/pusher/src/Controller/MapController.ts
+++ b/pusher/src/Controller/MapController.ts
@@ -60,6 +60,7 @@ export class MapController extends BaseController {
                         mapUrl,
                         policy_type: GameRoomPolicyTypes.ANONYMOUS_POLICY,
                         roomSlug: "", // Deprecated
+                        group: null,
                         tags: [],
                         textures: [],
                         contactPage: undefined,