feat: Moves moderator to xmpp.

JitsiConference.js

@@ -860,7 +860,7 @@ JitsiConference.prototype.getAuthLogin = function() {
  * Check if external authentication is enabled for this conference.
  */
 JitsiConference.prototype.isExternalAuthEnabled = function() {
-    return this.room && this.room.moderator.isExternalAuthEnabled();
+    return this.room && this.room.xmpp.moderator.isExternalAuthEnabled();
 };
 
 /**
@@ -877,9 +877,9 @@ JitsiConference.prototype.getExternalAuthUrl = function(urlForPopup) {
             return;
         }
         if (urlForPopup) {
-            this.room.moderator.getPopupLoginUrl(this.room.roomjid, resolve, reject);
+            this.room.xmpp.moderator.getPopupLoginUrl(this.room.roomjid, resolve, reject);
         } else {
-            this.room.moderator.getLoginUrl(this.room.roomjid, resolve, reject);
+            this.room.xmpp.moderator.getLoginUrl(this.room.roomjid, resolve, reject);
         }
     });
 };
@@ -2569,7 +2569,7 @@ JitsiConference.prototype.stopRecording = function(sessionID) {
  * Returns true if the SIP calls are supported and false otherwise
  */
 JitsiConference.prototype.isSIPCallingSupported = function() {
-    return this.room?.moderator?.isSipGatewayEnabled() ?? false;
+    return this.room?.xmpp?.moderator?.isSipGatewayEnabled() ?? false;
 };
 
 /**

authenticateAndUpgradeRole.js

@@ -99,7 +99,7 @@ export default function authenticateAndUpgradeRole({
                     onCreateResource
                 );
 
-                room.moderator.authenticate(room.roomjid)
+                room.xmpp.moderator.authenticate(room.roomjid)
                     .then(() => {
                         xmpp && xmpp.disconnect();
 
@@ -109,7 +109,7 @@ export default function authenticateAndUpgradeRole({
 
                         // At this point we should have the new session ID
                         // stored in the settings. Send a new conference IQ.
-                        this.room.moderator.sendConferenceRequest().finally(resolve);
+                        this.room.xmpp.moderator.sendConferenceRequest().finally(resolve);
                     })
                     .catch(({ error, message }) => {
                         xmpp.disconnect();

modules/xmpp/ChatRoom.js

@@ -19,7 +19,6 @@ import BreakoutRooms from './BreakoutRooms';
 import Lobby from './Lobby';
 import RoomMetadata from './RoomMetadata';
 import XmppConnection from './XmppConnection';
-import Moderator from './moderator';
 
 const logger = getLogger(__filename);
 
@@ -170,9 +169,8 @@ export default class ChatRoom extends Listenable {
         this.focusMucJid = null;
         this.noBridgeAvailable = false;
         this.options = options || {};
-        this.moderator = new Moderator(this.xmpp, xmpp.options);
 
-        this.eventsForwarder = new EventEmitterForwarder(this.moderator, this.eventEmitter);
+        this.eventsForwarder = new EventEmitterForwarder(this.xmpp.moderator, this.eventEmitter);
         this.eventsForwarder.forward(AuthenticationEvents.IDENTITY_UPDATED, AuthenticationEvents.IDENTITY_UPDATED);
         this.eventsForwarder.forward(XMPPEvents.REDIRECTED, XMPPEvents.REDIRECTED);
         this.eventsForwarder.forward(XMPPEvents.AUTHENTICATION_REQUIRED, XMPPEvents.AUTHENTICATION_REQUIRED);
@@ -234,7 +232,7 @@ export default class ChatRoom extends Listenable {
             const preJoin
                 = this.options.disableFocus
                     ? Promise.resolve()
-                    : this.moderator.sendConferenceRequest(this.roomjid);
+                    : this.xmpp.moderator.sendConferenceRequest(this.roomjid);
 
             preJoin.then(() => {
                 this.sendPresence(true);
@@ -279,7 +277,7 @@ export default class ChatRoom extends Listenable {
             }
 
             // send the machineId with the initial presence
-            if (this.moderator.targetUrl) {
+            if (this.xmpp.moderator.targetUrl) {
                 pres.c('billingid').t(Settings.machineId).up();
             }
 
@@ -522,7 +520,7 @@ export default class ChatRoom extends Listenable {
         const jid = mucUserItem && mucUserItem.getAttribute('jid');
 
         member.jid = jid;
-        member.isFocus = this.moderator.isFocusJid(jid);
+        member.isFocus = this.xmpp.moderator.isFocusJid(jid);
         member.isHiddenDomain
             = jid && jid.indexOf('@') > 0
                 && this.options.hiddenDomain

modules/xmpp/ChatRoom.spec.js

@@ -3,6 +3,7 @@ import { $pres } from 'strophe.js';
 import { XMPPEvents } from '../../service/xmpp/XMPPEvents';
 
 import ChatRoom, { parser } from './ChatRoom';
+import Moderator from './moderator';
 
 // This rule makes creating the xml elements take up way more
 // space than necessary.
@@ -138,6 +139,9 @@ describe('ChatRoom', () => {
 
         beforeEach(() => {
             const xmpp = {
+                moderator: new Moderator({
+                    options: {}
+                }),
                 options: {},
                 addListener: () => {} // eslint-disable-line no-empty-function
             };
@@ -350,6 +354,9 @@ describe('ChatRoom', () => {
 
         beforeEach(() => {
             const xmpp = {
+                moderator: new Moderator({
+                    options: {}
+                }),
                 options: {},
                 addListener: () => {} // eslint-disable-line no-empty-function
             };

modules/xmpp/moderator.js

@@ -46,14 +46,13 @@ export default class Moderator extends Listenable {
     /**
      * Constructs moderator.
      * @param xmpp The xmpp.
-     * @param options The options.
      */
-    constructor(xmpp, options) {
+    constructor(xmpp) {
         super();
 
         this.getNextTimeout = createExpBackoffTimer(1000);
         this.getNextErrorTimeout = createExpBackoffTimer(1000);
-        this.options = options;
+        this.options = xmpp.options;
 
         // External authentication stuff
         this.externalAuthEnabled = false;
@@ -82,8 +81,8 @@ export default class Moderator extends Listenable {
         // and responses from conference requests.
         this.focusUserJids = new Set();
 
-        if (options.focusUserJid) {
-            this.focusUserJids.add(options.focusUserJid);
+        if (this.options.focusUserJid) {
+            this.focusUserJids.add(this.options.focusUserJid);
         }
 
         // FIXME: Message listener that talks to POPUP window

modules/xmpp/xmpp.js

@@ -17,6 +17,7 @@ import RandomUtil from '../util/RandomUtil';
 
 import Caps, { parseDiscoInfo } from './Caps';
 import XmppConnection from './XmppConnection';
+import Moderator from './moderator';
 import MucConnectionPlugin from './strophe.emuc';
 import JingleConnectionPlugin from './strophe.jingle';
 import initStropheLogger from './strophe.logger';
@@ -164,6 +165,8 @@ export default class XMPP extends Listenable {
             shard: options.deploymentInfo.shard
         });
 
+        this.moderator = new Moderator(this);
+
         // forwards the shard changed event
         this.connection.on(XmppConnection.Events.CONN_SHARD_CHANGED, () => {
             /* eslint-disable camelcase */