Merge pull request workadventure#2982 from thecodingmachine/hotfix-emoji-local-storage

Fix emoji local storage issue

Author: moufmouf

play/src/front/Administration/AnalyticsClient.ts

@@ -1,6 +1,6 @@
 import { POSTHOG_API_KEY, POSTHOG_URL } from "../Enum/EnvironmentVariable";
-import type { Emoji } from "../Stores/EmoteStore";
 import type { PostHog } from "posthog-js";
+import { Emoji } from "../Stores/Utils/emojiSchema";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare let window: any;
 

play/src/front/Components/ActionBar/ActionBar.svelte

@@ -48,7 +48,6 @@
         subMenusStore,
         additionnalButtonsMenu,
     } from "../../Stores/MenuStore";
-    import type { Emoji } from "../../Stores/EmoteStore";
     import {
         emoteDataStore,
         emoteDataStoreLoading,
@@ -73,6 +72,7 @@
     import { modalIframeStore, modalVisibilityStore } from "../../Stores/ModalStore";
     import { userHasAccessToBackOfficeStore } from "../../Stores/GameStore";
     import { AddButtonActionBarEvent } from "../../Api/Events/Ui/ButtonActionBarEvent";
+    import { Emoji } from "../../Stores/Utils/emojiSchema";
 
     const menuImg = gameManager.currentStartedRoom?.miniLogo ?? WorkAdventureImg;
 

play/src/front/Connexion/LocalUserStore.ts

@@ -1,7 +1,7 @@
 import type { LocalUser } from "./LocalUser";
 import { areCharacterLayersValid, isUserNameValid } from "./LocalUser";
-import type { Emoji } from "../Stores/EmoteStore";
 import { z } from "zod";
+import { arrayEmoji, Emoji } from "../Stores/Utils/emojiSchema";
 
 const playerNameKey = "playerName";
 const selectedPlayerKey = "selectedPlayer";
@@ -398,19 +398,19 @@ class LocalUserStore {
     getEmojiFavorite(): Map<number, Emoji> | null {
         const value = localStorage.getItem(emojiFavorite);
         if (value == undefined) return null;
-
-        const emojis = JSON.parse(value);
-        if (!Array.isArray(emojis)) {
+        try {
+            const emojis: Emoji[] = JSON.parse(value);
+            arrayEmoji.parse(emojis);
+            const map = new Map<number, Emoji>();
+            emojis.forEach((value, index) => {
+                map.set(index + 1, value);
+            });
+            return map;
+        } catch (e) {
             localStorage.removeItem(emojiFavorite);
+            console.error("The localStorage key 'emojiFavorite' format is incorrect:", e);
             return null;
         }
-
-        const array: Array<Emoji> = JSON.parse(value) as Array<Emoji>;
-        const map: Map<number, Emoji> = new Map<number, Emoji>();
-        array.forEach((value, index) => {
-            map.set(index + 1, value);
-        });
-        return map;
     }
 }
 

play/src/front/Stores/EmoteStore.ts

@@ -1,10 +1,6 @@
 import { get, writable } from "svelte/store";
 import { localUserStore } from "../Connexion/LocalUserStore";
-
-export interface Emoji {
-    emoji: string;
-    name: string;
-}
+import { Emoji } from "./Utils/emojiSchema";
 
 function createEmoteMenuStore() {
     const { subscribe, set } = writable(false);

play/src/front/Stores/Utils/emojiSchema.ts

@@ -0,0 +1,10 @@
+import { z } from "zod";
+
+export const isEmoji = z.object({
+    emoji: z.string(),
+    name: z.string(),
+});
+
+export const arrayEmoji = z.array(isEmoji);
+
+export type Emoji = z.infer<typeof isEmoji>;