fix(reactions) Updated list of reactions & disabled incoming message sound (#9550)

* Changed reactions

* Disable incoming message sound on reactions
This commit is contained in:
robertpin 2021-07-15 10:26:27 +03:00 committed by GitHub
parent 25b4887f74
commit 1223c63f69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 21 deletions

View File

@ -805,6 +805,7 @@
"accessibilityLabel": {
"audioOnly": "Toggle audio only",
"audioRoute": "Select the sound device",
"boo": "Boo",
"callQuality": "Manage video quality",
"cc": "Toggle subtitles",
"chat": "Open / Close chat",
@ -818,7 +819,7 @@
"hangup": "Leave the meeting",
"help": "Help",
"invite": "Invite people",
"joy": "Laughing Crying",
"joy": "Laugh",
"kick": "Kick participant",
"like": "Thumbs Up",
"lobbyButton": "Enable/disable lobby mode",
@ -850,7 +851,6 @@
"shareYourScreen": "Start / Stop sharing your screen",
"shortcuts": "Toggle shortcuts",
"show": "Show on stage",
"smile": "Smile",
"speakerStats": "Toggle speaker statistics",
"surprised": "Surprised",
"tileView": "Toggle tile view",
@ -869,6 +869,7 @@
"audioOnlyOn": "Enable low bandwidth mode",
"audioRoute": "Select the sound device",
"authenticate": "Authenticate",
"boo": "Boo",
"callQuality": "Manage video quality",
"chat": "Open / Close chat",
"clap": "Clap",
@ -887,7 +888,7 @@
"hangup": "Leave the meeting",
"help": "Help",
"invite": "Invite people",
"joy": "Joy",
"joy": "Laugh",
"like": "Thumbs Up",
"lobbyButtonDisable": "Disable lobby mode",
"lobbyButtonEnable": "Enable lobby mode",
@ -915,11 +916,11 @@
"profile": "Edit your profile",
"raiseHand": "Raise / Lower your hand",
"raiseYourHand": "Raise your hand",
"reactionBoo": "Send boo reaction",
"reactionClap": "Send clap reaction",
"reactionJoy": "Send joy reaction",
"reactionJoy": "Send laugh reaction",
"reactionLike": "Send thumbs up reaction",
"reactionParty": "Send party popper reaction",
"reactionSmile": "Send smile reaction",
"reactionSurprised": "Send surprised reaction",
"security": "Security options",
"Settings": "Settings",
@ -927,7 +928,6 @@
"sharedvideo": "Share video",
"shareRoom": "Invite someone",
"shortcuts": "View shortcuts",
"smile": "Smile",
"speakerStats": "Speaker stats",
"startScreenSharing": "Start screen sharing",
"startSubtitles": "Start subtitles",

View File

@ -164,7 +164,7 @@ MiddlewareRegistry.register(store => next => action => {
message: action.message,
privateMessage: false,
timestamp: Date.now()
});
}, false);
}
}
@ -273,7 +273,7 @@ function _addChatMsgListener(conference, store) {
message: reactions[_id].message,
privateMessage: false,
timestamp: eventData.timestamp
});
}, false);
delete reactions[_id];
}, 500);
}
@ -308,14 +308,18 @@ function _handleChatError({ dispatch }, error) {
*
* @param {Store} store - The Redux store.
* @param {Object} message - The message object.
* @param {boolean} shouldPlaySound - Whether or not to play the incoming message sound.
* @returns {void}
*/
function _handleReceivedMessage({ dispatch, getState }, { id, message, privateMessage, timestamp }) {
function _handleReceivedMessage({ dispatch, getState },
{ id, message, privateMessage, timestamp },
shouldPlaySound = true
) {
// Logic for all platforms:
const state = getState();
const { isOpen: isChatOpen } = state['features/chat'];
if (!isChatOpen) {
if (shouldPlaySound && !isChatOpen) {
dispatch(playSound(INCOMING_MSG_SOUND_ID));
}

View File

@ -1,24 +1,19 @@
// @flow
export const REACTIONS = {
clap: {
message: ':clap:',
emoji: '👏',
shortcutChar: 'C'
},
like: {
message: ':thumbs_up:',
emoji: '👍',
shortcutChar: 'T'
},
smile: {
message: ':smile:',
emoji: '😀',
shortcutChar: 'S'
clap: {
message: ':clap:',
emoji: '👏',
shortcutChar: 'C'
},
joy: {
message: ':joy:',
emoji: '😂',
message: ':grinning_face:',
emoji: '😀',
shortcutChar: 'L'
},
surprised: {
@ -26,6 +21,11 @@ export const REACTIONS = {
emoji: '😮',
shortcutChar: 'O'
},
boo: {
message: ':slightly_frowning_face:',
emoji: '🙁',
shortcutChar: 'B'
},
party: {
message: ':party_popper:',
emoji: '🎉',