Important message
-
{text}
+{message.text}
diff --git a/back/Dockerfile b/back/Dockerfile
index e95145cd..a8ce3c1c 100644
--- a/back/Dockerfile
+++ b/back/Dockerfile
@@ -1,11 +1,11 @@
# protobuf build
-FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder
+FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as builder
WORKDIR /usr/src
COPY messages .
RUN yarn install && yarn proto
# typescript build
-FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder2
+FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d as builder2
WORKDIR /usr/src
COPY back/yarn.lock back/package.json ./
RUN yarn install
@@ -15,7 +15,7 @@ ENV NODE_ENV=production
RUN yarn run tsc
# final production image
-FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76
+FROM node:14.18.2-buster-slim@sha256:20bedf0c09de887379e59a41c04284974f5fb529cf0e13aab613473ce298da3d
WORKDIR /usr/src
COPY back/yarn.lock back/package.json ./
COPY --from=builder2 /usr/src/dist /usr/src/dist
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 5e4cfe00..f9d1c697 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";
@@ -75,14 +75,13 @@