* feat(visitors): Remove duplicate check.

* feat(visitors): Remove duplicate check.

Any service can be added to ignore list.

* squash: drop list usage.

* squash: Drops unused util.

Author: damencho

resources/prosody-plugins/mod_speakerstats_component.lua

@@ -5,7 +5,7 @@ local room_jid_match_rewrite = util.room_jid_match_rewrite;
 local is_jibri = util.is_jibri;
 local is_healthcheck_room = util.is_healthcheck_room;
 local process_host_module = util.process_host_module;
-local is_transcriber_jigasi = util.is_transcriber_jigasi;
+local is_transcriber = util.is_transcriber;
 local jid_resource = require "util.jid".resource;
 local st = require "util.stanza";
 local socket = require "socket";
@@ -226,7 +226,7 @@ function occupant_joined(event)
 
     if is_healthcheck_room(room.jid)
         or is_admin(occupant.bare_jid)
-        or is_transcriber_jigasi(stanza)
+        or is_transcriber(occupant.jid)
         or is_jibri(occupant) then
         return;
     end

resources/prosody-plugins/mod_visitors.lua

@@ -16,7 +16,7 @@ local filter_identity_from_presence = util.filter_identity_from_presence;
 local is_admin = util.is_admin;
 local presence_check_status = util.presence_check_status;
 local process_host_module = util.process_host_module;
-local is_transcriber_jigasi = util.is_transcriber_jigasi;
+local is_jibri = util.is_jibri;
 local room_jid_match_rewrite = util.room_jid_match_rewrite;
 local json = require 'cjson.safe';
 
@@ -34,10 +34,6 @@ if main_muc_component_config == nil then
     return ;
 end
 
--- A list of domains which to be ignored for visitors. For occupants using those domain we do not propagate them
--- to visitor nodes and we do not update them with presence changes
-local ignore_list = module:get_option_set('visitors_ignore_list', {});
-
 -- Advertise the component for discovery via disco#items
 module:add_identity('component', 'visitors', 'visitors.'..module.host);
 
@@ -270,9 +266,8 @@ process_host_module(main_muc_component_config, function(host_module, host)
         local room, stanzaEv, occupant = event.room, event.stanza, event.dest_occupant;
         local stanza = filter_stanza_nick_if_needed(stanzaEv, room);
 
-        -- filter focus and configured domains (used for jibri and transcribers)
-        if is_admin(stanza.attr.from) or visitors_nodes[room.jid] == nil
-            or (ignore_list:contains(jid.host(occupant.bare_jid)) and not is_transcriber_jigasi(stanza)) then
+        -- filter focus and jibri
+        if is_admin(stanza.attr.from) or visitors_nodes[room.jid] == nil or is_jibri(occupant.jid) then
             return;
         end
 
@@ -292,9 +287,9 @@ process_host_module(main_muc_component_config, function(host_module, host)
         local room, stanzaEv, occupant = event.room, event.stanza, event.occupant;
         local stanza = filter_stanza_nick_if_needed(stanzaEv, room);
 
-        -- ignore configured domains (jibri and transcribers)
+        -- ignore jicofo and jibri
         if is_admin(occupant.bare_jid) or visitors_nodes[room.jid] == nil or visitors_nodes[room.jid].nodes == nil
-            or (ignore_list:contains(jid.host(occupant.bare_jid)) and not is_transcriber_jigasi(stanza)) then
+            or is_jibri(occupant.jid) then
             return;
         end
 
@@ -336,9 +331,8 @@ process_host_module(main_muc_component_config, function(host_module, host)
         local room, stanzaEv, occupant = event.room, event.stanza, event.occupant;
         local stanza = filter_stanza_nick_if_needed(stanzaEv, room);
 
-        -- filter focus, ignore configured domains (jibri and transcribers)
-        if is_admin(stanza.attr.from) or visitors_nodes[room.jid] == nil
-            or (ignore_list:contains(jid.host(occupant.bare_jid)) and not is_transcriber_jigasi(stanza)) then
+        -- filter focus, ignore jibri
+        if is_admin(stanza.attr.from) or visitors_nodes[room.jid] == nil or is_jibri(occupant.jid) then
             return;
         end
 

resources/prosody-plugins/mod_visitors_component.lua

@@ -512,8 +512,6 @@ process_host_module(muc_domain_prefix..'.'..muc_domain_base, function(host_modul
         -- we skip any checks when auto-allow is enabled and room is live
         if (auto_allow_promotion or get_visitors_room_metadata(room).autoPromote and (is_live or is_live == nil))
             or ignore_list:contains(jid.host(stanza.attr.from)) -- jibri or other domains to ignore
-            or is_sip_jigasi(stanza)
-            or is_sip_jibri_join(stanza)
             or table_find(room._data.moderators, session.jitsi_meet_context_user and session.jitsi_meet_context_user.id)
             or table_find(room._data.participants, session.jitsi_meet_context_user and session.jitsi_meet_context_user.id) then
             if DEBUG then

resources/prosody-plugins/util.lib.lua

@@ -503,27 +503,6 @@ function is_sip_jigasi(stanza)
     return stanza:get_child('initiator', 'http://jitsi.org/protocol/jigasi');
 end
 
--- This requires presence stanza being passed
-function is_transcriber_jigasi(stanza)
-    if not stanza then
-        return false;
-    end
-
-    local features = stanza:get_child('features');
-    if not features then
-        return false;
-    end
-
-    for i = 1, #features do
-        local feature = features[i];
-        if feature.attr and feature.attr.var and feature.attr.var == 'http://jitsi.org/protocol/transcriber' then
-            return true;
-        end
-    end
-
-    return false;
-end
-
 function is_transcriber(jid)
     return starts_with_one_of(jid, TRANSCRIBER_PREFIXES);
 end
@@ -738,7 +717,6 @@ return {
     is_sip_jibri_join = is_sip_jibri_join;
     is_sip_jigasi = is_sip_jigasi;
     is_transcriber = is_transcriber;
-    is_transcriber_jigasi = is_transcriber_jigasi;
     is_vpaas = is_vpaas;
     get_focus_occupant = get_focus_occupant;
     get_ip = get_ip;