util updates

allows override of asap key server in token utility

conference.js

@@ -488,10 +488,13 @@ class ConferenceConnector {
  * call in hangup() to resolve when all operations are finished.
  */
 function disconnect() {
-    connection.disconnect();
-    APP.API.notifyConferenceLeft(APP.conference.roomName);
+    const onDisconnected = () => {
+        APP.API.notifyConferenceLeft(APP.conference.roomName);
 
-    return Promise.resolve();
+        return Promise.resolve();
+    };
+
+    return connection.disconnect().then(onDisconnected, onDisconnected);
 }
 
 /**
@@ -789,6 +792,13 @@ export default {
                     this.recorder = new Recorder();
                 }
 
+                if (config.startSilent) {
+                    APP.store.dispatch(showNotification({
+                        descriptionKey: 'notify.startSilentDescription',
+                        titleKey: 'notify.startSilentTitle'
+                    }));
+                }
+
                 // XXX The API will take care of disconnecting from the XMPP
                 // server (and, thus, leaving the room) on unload.
                 return new Promise((resolve, reject) => {
@@ -2603,8 +2613,7 @@ export default {
     leaveRoomAndDisconnect() {
         APP.store.dispatch(conferenceWillLeave(room));
 
-        return room.leave()
-            .then(disconnect, disconnect);
+        return room.leave().then(disconnect, disconnect);
     },
 
     /**

config.js

@@ -90,6 +90,10 @@ var config = {
     // applied locally. FIXME: having these 2 options is confusing.
     // startWithAudioMuted: false,
 
+    // Enabling it (with #params) will disable local audio output of remote
+    // participants and to enable it back a reload is needed.
+    // startSilent: false
+
     // Video
 
     // Sets the preferred resolution (height) for local video. Defaults to 720.

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -44,6 +44,7 @@
 		C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */; };
 		DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; };
+		DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAFA778229EAD520033A7FA /* RNRootView.m */; };
 		DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */; };
 		DEFE535421FB1BF800011A3A /* JitsiMeet.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535321FB1BF800011A3A /* JitsiMeet.m */; };
 		DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535521FB2E8300011A3A /* ReactUtils.m */; };
@@ -96,6 +97,8 @@
 		DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = "<group>"; };
 		DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = "<group>"; };
 		DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetConferenceOptions+Private.h"; sourceTree = "<group>"; };
+		DEAFA777229EAD3B0033A7FA /* RNRootView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNRootView.h; sourceTree = "<group>"; };
+		DEAFA778229EAD520033A7FA /* RNRootView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNRootView.m; sourceTree = "<group>"; };
 		DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocaleDetector.m; sourceTree = "<group>"; };
 		DEFE535321FB1BF800011A3A /* JitsiMeet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeet.m; sourceTree = "<group>"; };
 		DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = "<group>"; };
@@ -173,6 +176,8 @@
 				DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */,
 				0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */,
 				0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */,
+				DEAFA777229EAD3B0033A7FA /* RNRootView.h */,
+				DEAFA778229EAD520033A7FA /* RNRootView.m */,
 				C6F99C13204DB63D0001F710 /* JitsiMeetView+Private.h */,
 				0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */,
 				DEFC743D21B178FA00E4DD96 /* LocaleDetector.m */,
@@ -478,6 +483,7 @@
 			files = (
 				0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */,
 				0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */,
+				DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */,
 				DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */,
 				0B93EF7F1EC9DDCD0030D24D /* RCTBridgeWrapper.m in Sources */,
 				0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */,

ios/sdk/src/JitsiMeet+Private.h

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import <React/RCTBridge.h>
+
 #import "JitsiMeet.h"
 
 @interface JitsiMeet ()

ios/sdk/src/JitsiMeetView.m

@@ -17,12 +17,11 @@
 
 #include <mach/mach_time.h>
 
-#import <React/RCTRootView.h>
-
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
 #import "JitsiMeetView+Private.h"
 #import "ReactUtils.h"
+#import "RNRootView.h"
 
 
 @implementation JitsiMeetView {
@@ -36,7 +35,7 @@
     /**
      * React Native view where the entire content will be rendered.
      */
-    RCTRootView *rootView;
+    RNRootView *rootView;
 }
 
 /**
@@ -145,9 +144,9 @@ static void initializeViewsMap() {
     } else {
         RCTBridge *bridge = [[JitsiMeet sharedInstance] getReactBridge];
         rootView
-            = [[RCTRootView alloc] initWithBridge:bridge
-                                       moduleName:@"App"
-                                initialProperties:props];
+            = [[RNRootView alloc] initWithBridge:bridge
+                                      moduleName:@"App"
+                               initialProperties:props];
         rootView.backgroundColor = self.backgroundColor;
 
         // Add rootView as a subview which completely covers this one.

ios/sdk/src/RNRootView.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <React/RCTRootView.h>
+
+@interface RNRootView : RCTRootView
+@end

ios/sdk/src/RNRootView.m

@@ -0,0 +1,45 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <React/RCTRootContentView.h>
+#import <React/RCTLog.h>
+
+#import "RNRootView.h"
+
+@implementation RNRootView
+
+// Monkey-patch RCTRootView.runApplication to avoid logging initial props.
+- (void)runApplication:(RCTBridge *)bridge
+{
+    NSString *moduleName = [self valueForKey:@"_moduleName"] ?: @"";
+    RCTRootContentView *_contentView = [self valueForKey:@"_contentView"];
+    NSNumber *reactTag = [_contentView valueForKey:@"reactTag"];
+
+    NSDictionary *appParameters = @{
+                                    @"rootTag": reactTag,
+                                    @"initialProps": self.appProperties ?: @{},
+                                    };
+#if DEBUG
+    RCTLogInfo(@"Running application %@ (%@)", moduleName, appParameters);
+#endif
+
+    [bridge enqueueJSCall:@"AppRegistry"
+                   method:@"runApplication"
+                     args:@[moduleName, appParameters]
+               completion:NULL];
+}
+
+@end

lang/languages-oc.json

@@ -1,11 +1,19 @@
 {
     "en": "Anglés",
+    "af": "Afrikaans",
+    "az": "Azèri",
     "bg": "Bulgar",
+    "cs": "Chèc",
     "de": "Aleman",
+    "el": "Grèc",
+    "eo": "Esperanto",
     "es": "Castelhan",
     "fr": "Francés",
     "hy": "Armenian",
     "it": "Italian",
+    "ja": "Japonés",
+    "ko": "Corean",
+    "nb": "Norvegian Bokmål",
     "oc": "Occitan",
     "pl": "Polonés",
     "ptBR": "Portugués (Brasil)",
@@ -14,7 +22,6 @@
     "sl": "Eslovèn",
     "sv": "Suedés",
     "tr": "Turc",
-    "zhCN": "Chinés (China)",
-    "nb": "Norvegian Bokmål",
-    "eo": "Esperanto"
+    "vi": "Vietnamian",
+    "zhCN": "Chinés (China)"
 }

lang/languages-ptBR.json

@@ -1,5 +1,6 @@
 {
     "en": "Inglês",
+    "af": "Africâner",
     "az": "Azerbaijanês",
     "bg": "Búlgaro",
     "cs": "Checo",

lang/languages-vi.json

@@ -1,11 +1,19 @@
 {
     "en": "Tiếng Anh",
+    "af": "Tiếng Afrika",
+    "az": "Tiếng Azecbaizan",
     "bg": "Tiếng Bulgaria",
+    "cs": "Tiếng Séc",
     "de": "Tiếng Đức",
+    "el": "Tiếng Nhật",
+    "eo": "Tiếng Esperanto",
     "es": "Tiếng Tây Ban Nha",
     "fr": "Tiếng Pháp",
     "hy": "Tiếng Acmenia",
     "it": "Tiếng Ý",
+    "ja": "Tiếng Nhật",
+    "ko": "Tiếng Hàn",
+    "nb": "Tiếng Na Uy",
     "oc": "Tiếng Occitan",
     "pl": "Tiếng Ba Lan",
     "ptBR": "Tiếng Bồ Đào Nha (Brazil)",
@@ -14,7 +22,6 @@
     "sl": "Tiếng Slovenia",
     "sv": "Tiếng Thụy Điển",
     "tr": "Tiếng Thổ Nhĩ Kỳ",
-    "zhCN": "Tiếng Hoa (Trung Quốc)",
-    "nb": "Tiếng Na Uy",
-    "eo": "Tiếng Esperanto"
+    "vi": "Tiếng Việt",
+    "zhCN": "Tiếng Hoa (Trung Quốc)"
 }

lang/main.json

@@ -478,6 +478,8 @@
         "mutedTitle": "You're muted!",
         "raisedHand": "__name__ would like to speak.",
         "somebody": "Somebody",
+        "startSilentTitle": "You joined with no audio output!",
+        "startSilentDescription": "Rejoin the meeting to enable audio",
         "suboptimalExperienceDescription": "Eer... we are afraid your experience with __appName__ isn't going to be that great here. We are looking for ways to improve this but, until then, please try using one of the <a href='static/recommendedBrowsers.html' target='_blank'>fully supported browsers</a>.",
         "suboptimalExperienceTitle": "Browser Warning",
         "newDeviceCameraTitle": "New camera detected",

modules/API/API.js

@@ -103,9 +103,9 @@ function initCommands() {
 
             APP.store.dispatch(toggleTileView());
         },
-        'video-hangup': () => {
+        'video-hangup': (showFeedbackDialog = true) => {
             sendAnalytics(createApiEvent('video.hangup'));
-            APP.conference.hangup(true);
+            APP.conference.hangup(showFeedbackDialog);
         },
         'email': email => {
             sendAnalytics(createApiEvent('email.changed'));

modules/UI/UI.js

@@ -258,12 +258,6 @@ UI.addLocalStream = track => {
     }
 };
 
-/**
- * Removed remote stream from UI.
- * @param {JitsiTrack} track stream to remove
- */
-UI.removeRemoteStream = track => VideoLayout.onRemoteStreamRemoved(track);
-
 /**
  * Setup and show Etherpad.
  * @param {string} name etherpad id

modules/UI/videolayout/RemoteVideo.js

@@ -357,6 +357,11 @@ RemoteVideo.prototype.removeRemoteStreamElement = function(stream) {
     logger.info(`${isVideo ? 'Video' : 'Audio'
     } removed ${this.id}`, select);
 
+
+    if (stream === this.videoStream) {
+        this.videoStream = null;
+    }
+
     this.updateView();
 };
 

modules/UI/videolayout/SmallVideo.js

@@ -1,4 +1,4 @@
-/* global $, APP, interfaceConfig */
+/* global $, APP, config, interfaceConfig */
 
 /* eslint-disable no-unused-vars */
 import React from 'react';
@@ -199,6 +199,8 @@ SmallVideo.createStreamElement = function(stream) {
 
     if (isVideo) {
         element.setAttribute('muted', 'true');
+    } else if (config.startSilent) {
+        element.muted = true;
     }
 
     element.autoplay = true;

modules/UI/videolayout/VideoLayout.js

@@ -348,10 +348,6 @@ const VideoLayout = {
             remoteVideo.removeRemoteStreamElement(stream);
         }
 
-        if (stream.isVideoTrack()) {
-            this._updateLargeVideoIfDisplayed(id);
-        }
-
         this.updateMutedForNoTracks(id, stream.getType());
     },
 

package-lock.json

@@ -8927,8 +8927,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#23503b0efd4b97989af7b10696ec9ae790aec7bb",
-      "from": "github:jitsi/lib-jitsi-meet#23503b0efd4b97989af7b10696ec9ae790aec7bb",
+      "version": "github:jitsi/lib-jitsi-meet#0ee30bf12a549d10bb5d559e19bd557c3ed179eb",
+      "from": "github:jitsi/lib-jitsi-meet#0ee30bf12a549d10bb5d559e19bd557c3ed179eb",
       "requires": {
         "@jitsi/sdp-interop": "0.1.14",
         "@jitsi/sdp-simulcast": "0.2.1",

package.json

@@ -52,7 +52,7 @@
     "js-utils": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
     "jsrsasign": "8.0.12",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#23503b0efd4b97989af7b10696ec9ae790aec7bb",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#0ee30bf12a549d10bb5d559e19bd557c3ed179eb",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.11",
     "moment": "2.19.4",

react/features/base/config/functions.any.js

@@ -132,6 +132,7 @@ const WHITELISTED_KEYS = [
     'startAudioMuted',
     'startAudioOnly',
     'startBitrate',
+    'startSilent',
     'startScreenSharing',
     'startVideoMuted',
     'startWithAudioMuted',

react/features/base/settings/reducer.js

@@ -119,12 +119,22 @@ function _initSettings(featureState) {
     let settings = featureState;
 
     // Old Settings.js values
-    // FIXME: Let's remove this after a predefined time (e.g. by July 2018) to
-    // avoid garbage in the source.
-    const displayName = _.escape(window.localStorage.getItem('displayname'));
-    const email = _.escape(window.localStorage.getItem('email'));
+    // FIXME: jibri uses old settings.js local storage values to set its display
+    // name and email. Provide another way for jibri to set these values, update
+    // jibri, and remove the old settings.js values.
+    const savedDisplayName = window.localStorage.getItem('displayname');
+    const savedEmail = window.localStorage.getItem('email');
     let avatarID = _.escape(window.localStorage.getItem('avatarId'));
 
+    // The helper _.escape will convert null to an empty strings. The empty
+    // string will be saved in settings. On app re-load, because an empty string
+    // is a defined value, it will override any value found in local storage.
+    // The workaround is sidestepping _.escape when the value is not set in
+    // local storage.
+    const displayName
+        = savedDisplayName === null ? undefined : _.escape(savedDisplayName);
+    const email = savedEmail === null ? undefined : _.escape(savedEmail);
+
     if (!avatarID) {
         // if there is no avatar id, we generate a unique one and use it forever
         avatarID = randomHexString(32);

react/features/base/tracks/middleware.js

@@ -15,7 +15,6 @@ import UIEvents from '../../../../service/UI/UIEvents';
 import { createLocalTracksA } from './actions';
 import {
     TOGGLE_SCREENSHARING,
-    TRACK_REMOVED,
     TRACK_UPDATED
 } from './actionTypes';
 import { getLocalTrack, setTrackMuted } from './functions';
@@ -92,14 +91,6 @@ MiddlewareRegistry.register(store => next => action => {
         }
         break;
 
-    case TRACK_REMOVED:
-        // TODO Remove this middleware case once all UI interested in tracks
-        // being removed are converted to react and listening for store changes.
-        if (typeof APP !== 'undefined' && !action.track.local) {
-            APP.UI.removeRemoteStream(action.track.jitsiTrack);
-        }
-        break;
-
     case TRACK_UPDATED:
         // TODO Remove the following calls to APP.UI once components interested
         // in track mute changes are moved into React and/or redux.

react/features/settings/functions.js

@@ -2,7 +2,10 @@
 import { toState } from '../base/redux';
 import { parseStandardURIString } from '../base/util';
 import { i18next, DEFAULT_LANGUAGE, LANGUAGES } from '../base/i18n';
-import { getLocalParticipant, PARTICIPANT_ROLE } from '../base/participants';
+import {
+    getLocalParticipant,
+    isLocalParticipantModerator
+} from '../base/participants';
 
 declare var interfaceConfig: Object;
 
@@ -83,14 +86,12 @@ export function getMoreTabProps(stateful: Object | Function) {
     } = state['features/base/conference'];
     const followMeActive = Boolean(state['features/follow-me'].moderator);
     const configuredTabs = interfaceConfig.SETTINGS_SECTIONS || [];
-    const localParticipant = getLocalParticipant(state);
-
 
     // The settings sections to display.
     const showModeratorSettings = Boolean(
         conference
             && configuredTabs.includes('moderator')
-            && localParticipant.role === PARTICIPANT_ROLE.MODERATOR);
+            && isLocalParticipantModerator(state));
 
     return {
         currentLanguage: language,

react/features/video-layout/middleware.web.js

@@ -12,7 +12,7 @@ import {
     getParticipantById
 } from '../base/participants';
 import { MiddlewareRegistry } from '../base/redux';
-import { TRACK_ADDED } from '../base/tracks';
+import { TRACK_ADDED, TRACK_REMOVED } from '../base/tracks';
 import { SET_FILMSTRIP_VISIBLE } from '../filmstrip';
 
 import './middleware.any';
@@ -83,6 +83,12 @@ MiddlewareRegistry.register(store => next => action => {
             VideoLayout.onRemoteStreamAdded(action.track.jitsiTrack);
         }
 
+        break;
+    case TRACK_REMOVED:
+        if (!action.track.local) {
+            VideoLayout.onRemoteStreamRemoved(action.track.jitsiTrack);
+        }
+
         break;
     }
 

react/index.native.js

@@ -16,6 +16,8 @@ import { AppRegistry } from 'react-native';
 import { App } from './features/app';
 import { IncomingCallApp } from './features/mobile/incoming-call';
 
+declare var __DEV__;
+
 /**
  * The type of the React {@code Component} props of {@link Root}.
  */
@@ -49,6 +51,26 @@ class Root extends PureComponent<Props> {
     }
 }
 
+// HORRIBLE HACK ALERT! React Native logs the initial props with `console.log`. Here we are quickly patching it
+// to avoid logging potentially sensitive information.
+if (!__DEV__) {
+    /* eslint-disable */
+
+    const __orig_console_log = console.log;
+    const __orig_appregistry_runapplication = AppRegistry.runApplication;
+
+    AppRegistry.runApplication = (...args) => {
+        // $FlowExpectedError
+        console.log = () => {};
+        __orig_appregistry_runapplication(...args);
+        // $FlowExpectedError
+        console.log = __orig_console_log;
+    };
+
+    /* eslint-enable */
+}
+
+
 // Register the main/root Component of JitsiMeetView.
 AppRegistry.registerComponent('App', () => Root);
 

resources/prosody-plugins/token/util.lib.lua

@@ -100,6 +100,10 @@ function Util.new(module)
     return self
 end
 
+function Util:set_asap_key_server(asapKeyServer)
+    self.asapKeyServer = asapKeyServer
+end
+
 --- Returns the public key by keyID
 -- @param keyId the key ID to request
 -- @return the public key (the content of requested resource) or nil
@@ -239,7 +243,6 @@ end
 -- @param session the current session
 -- @return false and error
 function Util:process_and_verify_token(session)
-
     if session.auth_token == nil then
         if self.allowEmptyToken then
             return true;

resources/prosody-plugins/util.lib.lua

@@ -39,6 +39,25 @@ local function room_jid_match_rewrite(room_jid)
     return room_jid
 end
 
+-- Utility function to check and convert a room JID from real [foo]room1@muc.example.com to virtual room1@muc.foo.example.com
+local function room_jid_match_rewrite_from_internal(room_jid)
+    local node, host, resource = jid.split(room_jid);
+    if host ~= muc_domain or not node then
+        module:log("debug", "No need to rewrite %s (not from the MUC host)", room_jid);
+
+        return room_jid;
+    end
+    local target_subdomain, target_node = node:match("^%[([^%]]+)%](.+)$");
+    if not (target_node and target_subdomain) then
+        module:log("debug", "Not rewriting... unexpected node format: %s", node);
+        return room_jid;
+    end
+    -- Ok, rewrite room_jid address to pretty format
+    local new_node, new_host, new_resource = target_node, muc_domain_prefix..".".. target_subdomain.."."..muc_domain_base, resource;
+    room_jid = jid.join(new_node, new_host, new_resource);
+    module:log("debug", "Rewrote to %s", room_jid);
+    return room_jid
+end
 
 --- Finds and returns room by its jid
 -- @param room_jid the room jid to search in the muc component
@@ -194,5 +213,6 @@ return {
     wrap_async_run = wrap_async_run;
     async_handler_wrapper = async_handler_wrapper;
     room_jid_match_rewrite = room_jid_match_rewrite;
+    room_jid_match_rewrite_from_internal = room_jid_match_rewrite_from_internal
     update_presence_identity = update_presence_identity;
 };