rebased and fixed conflicts

Author: naman9271

JitsiConference.ts

@@ -4480,9 +4480,9 @@ export default class JitsiConference extends Listenable {
      *
      * @returns {Function} Handler returned to be able to remove it later.
      */
-    public addLobbyMessageListener(listener: (message: object) => void): Optional<EventListener> {
+    public addLobbyMessageListener(listener: (message: string, participantId: string) => void): Optional<(participantId: string, message: string) => void> {
         if (this.room) {
-            return this.room.getLobby().addMessageListener(listener) as Optional<EventListener>;
+            return this.room.getLobby().addMessageListener(listener);
         }
     }
 

modules/xmpp/Lobby.ts

@@ -2,8 +2,9 @@ import { getLogger } from '@jitsi/logger';
 import { $msg, Strophe } from 'strophe.js';
 
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
-import XMPP from './xmpp';
+
 import ChatRoom from './ChatRoom';
+import XMPP from './xmpp';
 
 const logger = getLogger('xmpp:Lobby');
 
@@ -151,9 +152,9 @@ export default class Lobby {
      * Gets the local id for a participant in a lobby room.
      * This is used for lobby room private chat messages.
      *
-     * @returns {string|undefined}
+     * @returns {Optional<string>}
      */
-    getLocalId(): string | undefined {
+    getLocalId(): Optional<string> {
         if (this.lobbyRoom) {
             return Strophe.getResourceFromJid(this.lobbyRoom.myroomjid);
         }
@@ -166,7 +167,7 @@ export default class Lobby {
      *
      * @returns {Function|undefined} Handler returned to be able to remove it later.
      */
-    addMessageListener(listener: (message: string, participantId: string) => void): ((participantId: string, message: any) => void) | undefined {
+    addMessageListener(listener: (message: string, participantId: string) => void): Optional<((participantId: string, message: any) => void) > {
         if (this.lobbyRoom) {
             const handler = (participantId: string, message: string) => {
                 listener(message, Strophe.getResourceFromJid(participantId));

modules/xmpp/xmpp.ts

@@ -59,6 +59,9 @@ interface IConnectionCredentials {
  */
 interface IRoomCreationOptions {
     customDomain?: string;
+    disableDiscoInfo?: boolean;
+    disableFocus?: boolean;
+    enableLobby?: boolean;
     statsId?: string;
 }
 
@@ -1109,7 +1112,7 @@ export default class XMPP extends Listenable {
      * is to be added to the jid.
      * @returns {ChatRoom} Resolves with an instance of a strophe muc.
      */
-    public createRoom(roomName: string, options: IRoomCreationOptions, onCreateResource: (jid: string, user: any) => string): ChatRoom {
+    public createRoom(roomName: string, options: IRoomCreationOptions, onCreateResource?: (jid: string, user: any) => string): ChatRoom {
         // Support passing the domain in a String object as part of the room name.
         const domain = (roomName as { domain?: string; }).domain || options.customDomain;