ref(lobby chat) sync current lobby chat lib jitsi api

jitsi · Feb 6, 2022 · 1ace000 · 1ace000
1 parent 6d76f2b
commit 1ace000
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/react/features/chat/actions.any.js b/react/features/chat/actions.any.js
@@ -155,7 +155,7 @@ export function onLobbyChatInitialized(lobbyChatInititializedInfo: Object) {
         const state = getState();
         const conference = getCurrentConference(state);
 
-        const lobbyLocalId = conference.getLobbyLocalId();
+        const lobbyLocalId = conference.myLobbyUserId();
 
         if (!lobbyLocalId) {
             return;
@@ -226,7 +226,7 @@ export function handleLobbyChatInitialized(participantId: string) {
         const { knockingParticipants } = state['features/lobby'];
         const { lobbyMessageRecipient } = state['features/chat'];
         const me = getLocalParticipant(state);
-        const lobbyLocalId = conference.getLobbyLocalId();
+        const lobbyLocalId = conference.myLobbyUserId();
 
 
         if (lobbyMessageRecipient && lobbyMessageRecipient.id === participantId) {
@@ -256,7 +256,7 @@ export function handleLobbyChatInitialized(participantId: string) {
             attendee };
 
         // notify attendee privately.
-        conference.sendPrivateLobbyMessage(attendee.id, payload);
+        conference.sendLobbyMessage(payload, attendee.id);
 
         // notify other moderators.
         return conference.sendLobbyMessage(payload);

diff --git a/react/features/chat/middleware.js b/react/features/chat/middleware.js
@@ -147,10 +147,10 @@ MiddlewareRegistry.register(store => next => action => {
                 }
 
                 if (isLobbyChatActive && lobbyMessageRecipient) {
-                    conference.sendPrivateLobbyMessage(lobbyMessageRecipient.id, {
+                    conference.sendLobbyMessage({
                         type: LOBBY_CHAT_MESSAGE,
                         message: action.message
-                    });
+                    }, lobbyMessageRecipient.id);
                     _persistSentPrivateMessage(store, lobbyMessageRecipient.id, action.message, true);
                 } else if (privateMessageRecipient) {
                     conference.sendPrivateTextMessage(privateMessageRecipient.id, action.message);

diff --git a/react/features/lobby/actions.any.js b/react/features/lobby/actions.any.js
@@ -204,7 +204,7 @@ export function startKnocking() {
         sendLocalParticipant(state, membersOnly);
 
         membersOnly.joinLobby(localParticipant.name, localParticipant.email);
-        dispatch(setLobbyChatListener());
+        dispatch(setLobbyMessageListener());
         dispatch(setKnockingState(true));
     };
 }
@@ -265,7 +265,7 @@ export function handleLobbyChatInitialized(payload: Object) {
         const state = getState();
         const conference = getCurrentConference(state);
 
-        const id = conference.getLobbyLocalId();
+        const id = conference.myLobbyUserId();
 
         dispatch({
             type: SET_LOBBY_PARTICIPANT_CHAT_STATE,
@@ -328,7 +328,7 @@ export function maybeSetLobbyChatMessageListener() {
         const lobbyEnabled = getLobbyEnabled(state);
 
         if (lobbyEnabled) {
-            dispatch(setLobbyChatListener());
+            dispatch(setLobbyMessageListener());
         }
     };
 }
@@ -355,10 +355,10 @@ export function updateLobbyParticipantOnModeratorLeave(participantId: string) {
             const participantToNotify = knockingParticipants.find(p => p.chattingWithModerator === participantId);
 
             if (participantToNotify) {
-                conference.sendPrivateLobbyMessage(participantToNotify.id, {
+                conference.sendLobbyMessage({
                     type: MODERATOR_IN_CHAT_WITH_LEFT,
                     moderatorId: participantToNotify.chattingWithModerator
-                });
+                }, participantToNotify.id);
             }
             dispatch({
                 type: REMOVE_LOBBY_CHAT_WITH_MODERATOR,
@@ -373,7 +373,7 @@ export function updateLobbyParticipantOnModeratorLeave(participantId: string) {
  *
  * @returns {Function}
  */
-export function setLobbyChatListener() {
+export function setLobbyMessageListener() {
     return async (dispatch: Dispatch<any>, getState: Function) => {
         const state = getState();
         const conference = getCurrentConference(state);
@@ -383,7 +383,7 @@ export function setLobbyChatListener() {
             return;
         }
 
-        conference.setLobbyMessageListener((message: Object, participantId: string) => {
+        conference.addLobbyMessageListener((message: Object, participantId: string) => {
             if (message.type === LOBBY_CHAT_MESSAGE) {
                 return dispatch(handleLobbyMessageReceived(message.message, participantId));
             }

diff --git a/react/features/lobby/functions.js b/react/features/lobby/functions.js
@@ -58,7 +58,7 @@ export function showLobbyChatButton(
         const { lobbyMessageRecipient, isLobbyChatActive } = state['features/chat'];
         const conference = getCurrentConference(state);
 
-        const lobbyLocalId = conference.getLobbyLocalId();
+        const lobbyLocalId = conference.myLobbyUserId();
 
         if (!enableLobbyChat) {
             return false;

diff --git a/react/features/lobby/middleware.js b/react/features/lobby/middleware.js
@@ -37,7 +37,7 @@ import {
     setLobbyModeEnabled,
     startKnocking,
     setPasswordJoinFailed,
-    setLobbyChatListener
+    setLobbyMessageListener
 } from './actions';
 import { updateLobbyParticipantOnModeratorLeave } from './actions.any';
 import { KNOCKING_PARTICIPANT_SOUND_ID } from './constants';
@@ -82,7 +82,7 @@ StateListenerRegistry.register(
             conference.on(JitsiConferenceEvents.MEMBERS_ONLY_CHANGED, enabled => {
                 dispatch(setLobbyModeEnabled(enabled));
                 if (enabled) {
-                    dispatch(setLobbyChatListener());
+                    dispatch(setLobbyMessageListener());
                 }
             });