feat(visitors): Uses metadata to save participants that were promoted. (#15215)

* feat(visitors): Uses metadata to save participants that were promoted.

* squash: fix comments.

* squash: fix comments.

react/features/base/conference/functions.ts

@@ -85,6 +85,7 @@ export function commonUserJoinedHandling(
 
     if (!user.isHidden()) {
         const isReplacing = user?.isReplacing();
+        const isPromoted = conference?.getMetadataHandler().getMetadata()?.visitors?.promoted?.[id];
 
         // the identity and avatar come from jwt and never change in the presence
         dispatch(participantJoined({
@@ -95,6 +96,7 @@ export function commonUserJoinedHandling(
             name: displayName,
             presence: user.getStatus(),
             role: user.getRole(),
+            isPromoted,
             isReplacing,
             sources: user.getSources()
         }));

react/features/base/participants/reducer.ts

@@ -1,5 +1,6 @@
 import { AnyAction } from 'redux';
 
+import { UPDATE_CONFERENCE_METADATA } from '../conference/actionTypes';
 import { MEDIA_TYPE } from '../media/constants';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { set } from '../redux/functions';
@@ -499,6 +500,34 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
             raisedHandsQueue: action.queue
         };
     }
+    case UPDATE_CONFERENCE_METADATA: {
+        const { metadata } = action;
+
+
+        if (metadata?.visitors?.promoted) {
+            let participantProcessed = false;
+
+            Object.entries(metadata?.visitors?.promoted).forEach(([ key, _ ]) => {
+
+                const p = state.remote.get(key);
+
+                if (p && !p.isPromoted) {
+
+                    state.remote.set(key, {
+                        ...p,
+                        isPromoted: true
+                    });
+                    participantProcessed = true;
+                }
+            });
+
+            if (participantProcessed) {
+                return { ...state };
+            }
+        }
+
+        break;
+    }
     case OVERWRITE_PARTICIPANT_NAME: {
         const { id, name } = action;
 
@@ -585,6 +614,7 @@ function _participantJoined({ participant }: { participant: IParticipant; }) {
         dominantSpeaker,
         email,
         fakeParticipant,
+        isPromoted,
         isReplacing,
         loadableAvatarUrl,
         local,
@@ -616,6 +646,7 @@ function _participantJoined({ participant }: { participant: IParticipant; }) {
         email,
         fakeParticipant,
         id,
+        isPromoted,
         isReplacing,
         loadableAvatarUrl,
         local: local || false,

react/features/base/participants/types.ts

@@ -23,6 +23,7 @@ export interface IParticipant {
     getId?: Function;
     id: string;
     isJigasi?: boolean;
+    isPromoted?: boolean;
     isReplaced?: boolean;
     isReplacing?: number;
     isSilent?: boolean;

resources/prosody-plugins/mod_visitors_component.lua

@@ -214,6 +214,16 @@ function get_visitors_languages(room)
     return count, languages:sort():concat(',');
 end
 
+local function get_visitors_room_metadata(room)
+    if not room.jitsiMetadata then
+        room.jitsiMetadata = {};
+    end
+    if not room.jitsiMetadata.visitors then
+        room.jitsiMetadata.visitors = {};
+    end
+    return room.jitsiMetadata.visitors;
+end
+
 -- listens for iq request for promotion and forward it to moderators in the meeting for approval
 -- or auto-allow it if such the config is set enabling it
 local function stanza_handler(event)
@@ -300,12 +310,8 @@ local function stanza_handler(event)
             module:log('warn', 'Received forged transcription_languages message: %s %s',stanza, inspect(room._connected_vnodes));
             return true; -- stop processing
         end
-        if not room.jitsiMetadata then
-            room.jitsiMetadata = {};
-        end
-        if not room.jitsiMetadata.visitors then
-            room.jitsiMetadata.visitors = {};
-        end
+
+        local metadata = get_visitors_room_metadata(room);
 
         -- we keep the split by languages array to optimize accumulating languages
         from_vnode.langs = split_string(transcription_languages.attr.langs, ',');
@@ -313,13 +319,13 @@ local function stanza_handler(event)
 
         local count, languages = get_visitors_languages(room);
 
-        if room.jitsiMetadata.visitors.transcribingLanguages ~= languages then
-            room.jitsiMetadata.visitors.transcribingLanguages = languages;
+        if metadata.transcribingLanguages ~= languages then
+            metadata.transcribingLanguages = languages;
             processed = true;
         end
 
-        if room.jitsiMetadata.visitors.transcribingCount ~= count then
-            room.jitsiMetadata.visitors.transcribingCount = count;
+        if metadata.transcribingCount ~= count then
+            metadata.transcribingCount = count;
             processed = true;
         end
 
@@ -338,6 +344,11 @@ local function stanza_handler(event)
 end
 
 local function process_promotion_response(room, id, approved)
+    if not approved then
+        module:log('debug', 'promotion not approved %s, %s', room.jid, id);
+        return;
+    end
+
     -- lets reply to participant that requested promotion
     local username = new_id():lower();
     visitors_promotion_map[room.jid][username] = {
@@ -452,10 +463,23 @@ process_host_module(muc_domain_prefix..'.'..muc_domain_base, function(host_modul
         end
 
         if visitors_promotion_map[room.jid] then
+            local in_ignore_list = ignore_list:contains(jid.host(stanza.attr.from));
+
             -- now let's check for jid
             if visitors_promotion_map[room.jid][jid.node(stanza.attr.from)] -- promotion was approved
-                or ignore_list:contains(jid.host(stanza.attr.from)) then -- jibri or other domains to ignore
+                or in_ignore_list then -- jibri or other domains to ignore
                 -- allow join
+                if not in_ignore_list then
+                    -- let's update metadata
+                    local metadata = get_visitors_room_metadata(room);
+                    if not metadata.promoted then
+                        metadata.promoted = {};
+                    end
+                    metadata.promoted[jid.resource(occupant.nick)] = true;
+                    module:context(muc_domain_prefix..'.'..muc_domain_base)
+                        :fire_event('room-metadata-changed', { room = room; });
+                end
+
                 return;
             end
             module:log('error', 'Visitor needs to be allowed by a moderator %s', stanza.attr.from);