Make jwt accept boolean values for features

When trying to auto pin screenshare, always select the endpoint even though it happens to be the large video participant in redux. The auto pin screenshare logic kicks in after the track is added.  If the screenshare endpoint is not among the forwarded endpoints from the bridge, it needs to be selected again.

config.js

@@ -393,6 +393,9 @@ var config = {
     // Document should be focused for this option to work
     // enableAutomaticUrlCopy: false,
 
+    // Base URL for a Gravatar-compatible service. Defaults to libravatar.
+    // gravatarBaseURL: 'https://seccdn.libravatar.org/avatar/';
+
     // Stats
     //
 

lang/languages.json

@@ -28,6 +28,7 @@
     "kab": "Kabyle",
     "ko": "Korean",
     "lt": "Lithuanian",
+    "lv": "Latvian",
     "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",

modules/UI/UI.js

@@ -597,6 +597,16 @@ UI.onUserFeaturesChanged = user => VideoLayout.onUserFeaturesChanged(user);
  */
 UI.getRemoteVideosCount = () => VideoLayout.getRemoteVideosCount();
 
+/**
+ * Returns the video type of the remote participant's video.
+ * This is needed for the torture clients to determine the video type of the
+ * remote participants.
+ *
+ * @param {string} participantID - The id of the remote participant.
+ * @returns {string} The video type "camera" or "desktop".
+ */
+UI.getRemoteVideoType = participantID => VideoLayout.getRemoteVideoType(participantID);
+
 /**
  * Sets the remote control active status for a remote participant.
  *

package-lock.json

@@ -3302,9 +3302,9 @@
       }
     },
     "@jitsi/js-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-1.0.2.tgz",
-      "integrity": "sha512-ls+X9tn9EemUQwPEBr7Z0UD4sjRtwcu1Bh4MUo0Hv4arp0KVzcCYCW+mofsvuZvHg8xJX12LLNVgUKi1X5XTGg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-1.0.3.tgz",
+      "integrity": "sha512-m6mZz7R716mHP21lTKQffyM0nNFu3Fe/EHCaOVLFY/vdPsaUl9DhypJqtPIYzRUfPnmnugdaxcxrUeSZQXQzVA==",
       "requires": {
         "bowser": "2.7.0",
         "js-md5": "0.7.3"
@@ -10792,6 +10792,20 @@
         "webrtc-adapter": "7.5.0"
       },
       "dependencies": {
+        "@jitsi/js-utils": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-1.0.2.tgz",
+          "integrity": "sha512-ls+X9tn9EemUQwPEBr7Z0UD4sjRtwcu1Bh4MUo0Hv4arp0KVzcCYCW+mofsvuZvHg8xJX12LLNVgUKi1X5XTGg==",
+          "requires": {
+            "bowser": "2.7.0",
+            "js-md5": "0.7.3"
+          }
+        },
+        "js-md5": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+          "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
+        },
         "uuid": {
           "version": "8.1.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",

package.json

@@ -32,7 +32,7 @@
     "@atlaskit/theme": "7.0.2",
     "@atlaskit/toggle": "5.0.14",
     "@atlaskit/tooltip": "12.1.13",
-    "@jitsi/js-utils": "1.0.2",
+    "@jitsi/js-utils": "1.0.3",
     "@microsoft/microsoft-graph-client": "1.1.0",
     "@react-native-community/async-storage": "1.3.4",
     "@react-native-community/google-signin": "3.0.1",

react/features/base/connection/functions.js

@@ -59,7 +59,7 @@ export function getInviteURL(stateOrGetState: Function | Object): string {
 
     if (inviteDomain) {
         const meetingId
-            = state['features/base/config'].brandingRoomAlias || urlWithoutParams.pathname.replace('/', '');
+            = state['features/base/config'].brandingRoomAlias || urlWithoutParams.pathname.replace(/\//, '');
 
         return `${inviteDomain}/${meetingId}`;
     }

react/features/base/lastn/middleware.js

@@ -68,14 +68,13 @@ function _updateLastN({ getState }) {
         return;
     }
 
-    const defaultLastN = typeof config.channelLastN === 'undefined' ? -1 : config.channelLastN;
-    let lastN = defaultLastN;
+    let lastN = typeof config.channelLastN === 'undefined' ? -1 : config.channelLastN;
 
-    // Apply last N limit based on the # of participants
+    // Apply last N limit based on the # of participants and channelLastN settings.
     const limitedLastN = limitLastN(participantCount, lastNLimits);
 
     if (limitedLastN !== undefined) {
-        lastN = limitedLastN;
+        lastN = lastN === -1 ? limitedLastN : Math.min(limitedLastN, lastN);
     }
 
     if (typeof appState !== 'undefined' && appState !== 'active') {

react/features/base/participants/functions.js

@@ -1,6 +1,7 @@
 // @flow
 
 import { getGravatarURL } from '@jitsi/js-utils/avatar';
+import type { Store } from 'redux';
 
 import { JitsiParticipantConnectionStatus } from '../lib-jitsi-meet';
 import { MEDIA_TYPE, shouldRenderVideoTrack } from '../media';
@@ -23,30 +24,35 @@ declare var interfaceConfig: Object;
  */
 const AVATAR_QUEUE = [];
 const AVATAR_CHECKED_URLS = new Map();
-/* eslint-disable arrow-body-style */
+/* eslint-disable arrow-body-style, no-unused-vars */
 const AVATAR_CHECKER_FUNCTIONS = [
-    participant => {
+    (participant, _) => {
         return participant && participant.isJigasi ? JIGASI_PARTICIPANT_ICON : null;
     },
-    participant => {
+    (participant, _) => {
         return participant && participant.avatarURL ? participant.avatarURL : null;
     },
-    participant => {
-        return participant && participant.email ? getGravatarURL(participant.email) : null;
+    (participant, store) => {
+        if (participant && participant.email) {
+            return getGravatarURL(participant.email, store.getState()['features/base/config'].gravatarBaseURL);
+        }
+
+        return null;
     }
 ];
-/* eslint-enable arrow-body-style */
+/* eslint-enable arrow-body-style, no-unused-vars */
 
 /**
  * Resolves the first loadable avatar URL for a participant.
  *
  * @param {Object} participant - The participant to resolve avatars for.
+ * @param {Store} store - Redux store.
  * @returns {Promise}
  */
-export function getFirstLoadableAvatarUrl(participant: Object) {
+export function getFirstLoadableAvatarUrl(participant: Object, store: Store<any, any>) {
     const deferred = createDeferred();
     const fullPromise = deferred.promise
-        .then(() => _getFirstLoadableAvatarUrl(participant))
+        .then(() => _getFirstLoadableAvatarUrl(participant, store))
         .then(src => {
 
             if (AVATAR_QUEUE.length) {
@@ -402,11 +408,12 @@ export function figureOutMutedWhileDisconnectedStatus(
  * Resolves the first loadable avatar URL for a participant.
  *
  * @param {Object} participant - The participant to resolve avatars for.
+ * @param {Store} store - Redux store.
  * @returns {?string}
  */
-async function _getFirstLoadableAvatarUrl(participant) {
+async function _getFirstLoadableAvatarUrl(participant, store) {
     for (let i = 0; i < AVATAR_CHECKER_FUNCTIONS.length; i++) {
-        const url = AVATAR_CHECKER_FUNCTIONS[i](participant);
+        const url = AVATAR_CHECKER_FUNCTIONS[i](participant, store);
 
         if (url) {
             if (AVATAR_CHECKED_URLS.has(url)) {

react/features/base/participants/middleware.js

@@ -365,7 +365,8 @@ function _maybePlaySounds({ getState, dispatch }, action) {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _participantJoinedOrUpdated({ dispatch, getState }, next, action) {
+function _participantJoinedOrUpdated(store, next, action) {
+    const { dispatch, getState } = store;
     const { participant: { avatarURL, e2eeEnabled, email, id, local, name, raisedHand } } = action;
 
     // Send an external update of the local participant's raised hand state
@@ -401,7 +402,7 @@ function _participantJoinedOrUpdated({ dispatch, getState }, next, action) {
         const participantId = !id && local ? getLocalParticipant(getState()).id : id;
         const updatedParticipant = getParticipantById(getState(), participantId);
 
-        getFirstLoadableAvatarUrl(updatedParticipant)
+        getFirstLoadableAvatarUrl(updatedParticipant, store)
             .then(url => {
                 dispatch(setLoadableAvatarUrl(participantId, url));
             });

react/features/large-video/actions.any.js

@@ -61,8 +61,20 @@ export function selectParticipantInLargeVideo(participant: ?string) {
         const state = getState();
         const participantId = participant ?? _electParticipantInLargeVideo(state);
         const largeVideo = state['features/large-video'];
+        const screenShares = state['features/video-layout'].screenShares;
+        let latestScreenshareParticipantId;
 
-        if (participantId !== largeVideo.participantId) {
+        if (screenShares && screenShares.length) {
+            latestScreenshareParticipantId = screenShares[screenShares.length - 1];
+        }
+
+        // When trying to auto pin screenshare, always select the endpoint even though it happens to be
+        // the large video participant in redux (for the reasons listed above in the large video selection
+        // logic above). The auto pin screenshare logic kicks in after the track is added
+        // (which updates the large video participant and selects all endpoints because of the auto tile
+        // view mode). If the screenshare endpoint is not among the forwarded endpoints from the bridge,
+        // it needs to be selected again at this point.
+        if (participantId !== largeVideo.participantId || participantId === latestScreenshareParticipantId) {
             dispatch({
                 type: SELECT_LARGE_VIDEO_PARTICIPANT,
                 participantId

react/features/lobby/middleware.js

@@ -144,12 +144,13 @@ function _conferenceJoined({ dispatch }, next, action) {
  * @param {Object} participant - The knocking participant.
  * @returns {void}
  */
-function _findLoadableAvatarForKnockingParticipant({ dispatch, getState }, { id }) {
+function _findLoadableAvatarForKnockingParticipant(store, { id }) {
+    const { dispatch, getState } = store;
     const updatedParticipant = getState()['features/lobby'].knockingParticipants.find(p => p.id === id);
     const { disableThirdPartyRequests } = getState()['features/base/config'];
 
     if (!disableThirdPartyRequests && updatedParticipant && !updatedParticipant.loadableAvatarUrl) {
-        getFirstLoadableAvatarUrl(updatedParticipant).then(loadableAvatarUrl => {
+        getFirstLoadableAvatarUrl(updatedParticipant, store).then(loadableAvatarUrl => {
             if (loadableAvatarUrl) {
                 dispatch(participantIsKnockingOrUpdated({
                     loadableAvatarUrl,

resources/prosody-plugins/util.lib.lua

@@ -227,7 +227,7 @@ end
 -- everything.
 function is_feature_allowed(session, feature)
     if (session.jitsi_meet_context_features == nil
-        or session.jitsi_meet_context_features[feature] == "true") then
+        or session.jitsi_meet_context_features[feature] == "true" or session.jitsi_meet_context_features[feature] == true) then
         return true;
     else
         return false;

static/404.html

@@ -7,7 +7,7 @@
 <body>
     <div class="error_page">
         <h2>404 Not Found</h2>
-        <p class="error_page__message">You can create new conversation <a class="link" href="/">here</a></p>
+        <p class="error_page__message">You can create a new conversation <a class="link" onclick="window.location = window.location.protocol + '//' + window.location.hostname">here</a></p>
     </div>
 </body>
 </html>