Important message
-
{text}
+{message.text}
diff --git a/front/src/Administration/UserMessageManager.ts b/front/src/Administration/UserMessageManager.ts
index 42c31083..09e69137 100644
--- a/front/src/Administration/UserMessageManager.ts
+++ b/front/src/Administration/UserMessageManager.ts
@@ -1,27 +1,22 @@
import { AdminMessageEventTypes, adminMessagesService } from "../Connexion/AdminMessagesService";
-import { textMessageContentStore, textMessageVisibleStore } from "../Stores/TypeMessageStore/TextMessageStore";
+import { textMessageStore } from "../Stores/TypeMessageStore/TextMessageStore";
import { soundPlayingStore } from "../Stores/SoundPlayingStore";
import { UPLOADER_URL } from "../Enum/EnvironmentVariable";
-import { banMessageContentStore, banMessageVisibleStore } from "../Stores/TypeMessageStore/BanMessageStore";
+import { banMessageStore } from "../Stores/TypeMessageStore/BanMessageStore";
class UserMessageManager {
receiveBannedMessageListener!: Function;
constructor() {
adminMessagesService.messageStream.subscribe((event) => {
- textMessageVisibleStore.set(false);
- banMessageVisibleStore.set(false);
if (event.type === AdminMessageEventTypes.admin) {
- textMessageContentStore.set(event.text);
- textMessageVisibleStore.set(true);
+ textMessageStore.addMessage(event.text);
} else if (event.type === AdminMessageEventTypes.audio) {
soundPlayingStore.playSound(UPLOADER_URL + event.text);
} else if (event.type === AdminMessageEventTypes.ban) {
- banMessageContentStore.set(event.text);
- banMessageVisibleStore.set(true);
+ banMessageStore.addMessage(event.text);
} else if (event.type === AdminMessageEventTypes.banned) {
- banMessageContentStore.set(event.text);
- banMessageVisibleStore.set(true);
+ banMessageStore.addMessage(event.text);
this.receiveBannedMessageListener();
}
});
diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte
index 4886cc4e..817b22c1 100644
--- a/front/src/Components/App.svelte
+++ b/front/src/Components/App.svelte
@@ -30,10 +30,10 @@
import EmoteMenu from "./EmoteMenu/EmoteMenu.svelte";
import VideoOverlay from "./Video/VideoOverlay.svelte";
import { gameOverlayVisibilityStore } from "../Stores/GameOverlayStoreVisibility";
- import AdminMessage from "./TypeMessage/BanMessage.svelte";
- import TextMessage from "./TypeMessage/TextMessage.svelte";
- import { banMessageVisibleStore } from "../Stores/TypeMessageStore/BanMessageStore";
- import { textMessageVisibleStore } from "../Stores/TypeMessageStore/TextMessageStore";
+ import BanMessageContainer from "./TypeMessage/BanMessageContainer.svelte";
+ import TextMessageContainer from "./TypeMessage/TextMessageContainer.svelte";
+ import { banMessageStore } from "../Stores/TypeMessageStore/BanMessageStore";
+ import { textMessageStore } from "../Stores/TypeMessageStore/TextMessageStore";
import { warningContainerStore } from "../Stores/MenuStore";
import WarningContainer from "./WarningContainer/WarningContainer.svelte";
import { layoutManagerVisibilityStore } from "../Stores/LayoutManagerStore";
@@ -72,14 +72,13 @@