BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(chat): audio alert playing incorrectly

Browse Source
This commit is contained in:
João Victor 2024-03-27 10:22:20 -03:00
parent a768fe9485
commit 9b7fbd9d57
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bigbluebutton-html5/imports/ui/components/chat/chat-graphql/alert/component.tsx
View File

@ -1,4 +1,4 @@
import React, { useCallback, useRef } from 'react'; import React, { useCallback, useEffect, useRef } from 'react';
import { useSubscription } from '@apollo/client'; import { useSubscription } from '@apollo/client';
import { isEqual } from 'radash'; import { isEqual } from 'radash';
import { defineMessages, useIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
@ -87,13 +87,30 @@ const ChatAlertGraphql: React.FC<ChatAlertGraphqlProps> = (props) => {
const prevPrivateUnreadMessages = usePreviousValue(privateUnreadMessages); const prevPrivateUnreadMessages = usePreviousValue(privateUnreadMessages);
const publicMessagesDidChange = !isEqual(prevPublicUnreadMessages, publicUnreadMessages); const publicMessagesDidChange = !isEqual(prevPublicUnreadMessages, publicUnreadMessages);
const privateMessagesDidChange = !isEqual(prevPrivateUnreadMessages, privateUnreadMessages); const privateMessagesDidChange = !isEqual(prevPrivateUnreadMessages, privateUnreadMessages);
const shouldRenderPublicChatAlerts = publicMessagesDidChange && publicUnreadMessages; const shouldRenderPublicChatAlerts = publicMessagesDidChange
const shouldRenderPrivateChatAlerts = privateMessagesDidChange && privateUnreadMessages; && !!publicUnreadMessages
&& publicUnreadMessages.length > 0;
const shouldRenderPrivateChatAlerts = privateMessagesDidChange
&& !!privateUnreadMessages
&& privateUnreadMessages.length > 0;
const shouldPlayAudioAlert = useCallback( const shouldPlayAudioAlert = useCallback(
(m: Message) => m.chatId !== idChatOpen && !history.current.has(m.messageId), (m: Message) => (m.chatId !== idChatOpen || document.hidden) && !history.current.has(m.messageId),
[idChatOpen, history.current], [idChatOpen, history.current],
); );
useEffect(() => {
if (shouldRenderPublicChatAlerts) {
publicUnreadMessages.forEach((m) => {
history.current.add(m.messageId);
});
}
if (shouldRenderPrivateChatAlerts) {
privateUnreadMessages.forEach((m) => {
history.current.add(m.messageId);
});
}
});
let playAudioAlert = false; let playAudioAlert = false;
if (shouldRenderPublicChatAlerts) { if (shouldRenderPublicChatAlerts) {
@ -102,7 +119,6 @@ const ChatAlertGraphql: React.FC<ChatAlertGraphqlProps> = (props) => {
if (shouldRenderPrivateChatAlerts && !playAudioAlert) { if (shouldRenderPrivateChatAlerts && !playAudioAlert) {
playAudioAlert = privateUnreadMessages.some(shouldPlayAudioAlert); playAudioAlert = privateUnreadMessages.some(shouldPlayAudioAlert);
} }
playAudioAlert ||= document.hidden;
if (audioAlertEnabled && playAudioAlert) { if (audioAlertEnabled && playAudioAlert) {
Service.playAlertSound(); Service.playAlertSound();
@ -138,7 +154,6 @@ const ChatAlertGraphql: React.FC<ChatAlertGraphqlProps> = (props) => {
const renderToast = (message: Message) => { const renderToast = (message: Message) => {
if (history.current.has(message.messageId)) return null; if (history.current.has(message.messageId)) return null;
history.current.add(message.messageId);
if (message.chatId === idChatOpen) return null; if (message.chatId === idChatOpen) return null;
const messageChatId = message.chatId === PUBLIC_GROUP_CHAT_ID ? PUBLIC_CHAT_ID : message.chatId; const messageChatId = message.chatId === PUBLIC_GROUP_CHAT_ID ? PUBLIC_CHAT_ID : message.chatId;