feat: exclude techical socket event listening

Onlineberatung · Sep 15, 2021 · 800a6c1 · 800a6c1
1 parent fc847c9
commit 800a6c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/api/rocketChatSocket.ts b/src/api/rocketChatSocket.ts
@@ -164,8 +164,9 @@ export class rocketChatSocket {
 				response.fields.eventName === params[0];
 			if (changeResponseOnSubscribedEvent) {
 				const newMessage =
-					response.collection === SOCKET_COLLECTION.ROOM_MESSAGES &&
-					!response.fields.args[0].u.username.starsWith(
+					response.collection === SOCKET_COLLECTION.ROOM_MESSAGES;
+				const isTechnicalMessage =
+					response.fields.args[0].u.username.starsWith(
 						'cob-rocket-chat-technical-user'
 					);
 				const roomClosed =
@@ -175,7 +176,7 @@ export class rocketChatSocket {
 					response.fields.args[1].u._id === this.rcUid;
 				const userTyping =
 					response.collection === SOCKET_COLLECTION.NOTIFY_ROOM;
-				if (newMessage && callbackRoom) {
+				if (newMessage && callbackRoom && !isTechnicalMessage) {
 					callbackRoom();
 				} else if (roomClosed && callbackUser) {
 					callbackUser();

diff --git a/src/components/session/SessionView.tsx b/src/components/session/SessionView.tsx
@@ -78,6 +78,7 @@ export const SessionView = (props) => {
 	const [currentlyTypingUsers, setCurrentlyTypingUsers] = useState([]);
 	const [typingStatusSent, setTypingStatusSent] = useState(false);
 	const [isAnonymousEnquiry, setIsAnonymousEnquiry] = useState(false);
+	const isEnquiry = chatItem?.status === 1;
 	const isLiveChatFinished = chatItem?.status === 3;
 	const hasUserInitiatedStopOrLeaveRequest = useRef<boolean>(false);
 
@@ -124,7 +125,7 @@ export const SessionView = (props) => {
 				setLoadedMessages(messagesData);
 				setIsLoading(false);
 
-				if (!isSocketConnected && !isAnonymousEnquiry) {
+				if (!isSocketConnected && !isEnquiry) {
 					setSessionToRead();
 					window['socket'].connect();
 					window['socket'].addSubscription(