haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Simplify AV moderation participant approve/remove message and fix array usage. (#10062) 

* feat: Simplify av moderation participant approve/remove message.

There is no point of having messages like:
{
  "room": "myroom@conference.mydomain.com",
  "type": "av_moderation",
  "mediaType": "audio",
  "removed": true,
  "approved": true
}

* fix: Fixes array in json.

fix: Fixes array in json.
This commit is contained in:
Дамян Минков 2021-09-30 13:35:55 -05:00 committed by GitHub
parent 9e5a9599ca
commit 31a7fbfa82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/prosody-plugins/mod_av_moderation_component.lua
View File

@ -2,6 +2,7 @@ local get_room_by_name_and_subdomain = module:require 'util'.get_room_by_name_an
local is_healthcheck_room = module:require 'util'.is_healthcheck_room; local is_healthcheck_room = module:require 'util'.is_healthcheck_room;
local internal_room_jid_match_rewrite = module:require "util".internal_room_jid_match_rewrite; local internal_room_jid_match_rewrite = module:require "util".internal_room_jid_match_rewrite;
local room_jid_match_rewrite = module:require "util".room_jid_match_rewrite; local room_jid_match_rewrite = module:require "util".room_jid_match_rewrite;
local array = require "util.array";
local json = require 'util.json'; local json = require 'util.json';
local st = require 'util.stanza'; local st = require 'util.stanza';
@ -68,11 +69,15 @@ function notify_whitelist_change(jid, moderators, room, mediaType, removed)
body_json.type = 'av_moderation'; body_json.type = 'av_moderation';
body_json.room = internal_room_jid_match_rewrite(room.jid); body_json.room = internal_room_jid_match_rewrite(room.jid);
body_json.whitelists = room.av_moderation; body_json.whitelists = room.av_moderation;
body_json.removed = removed; if removed then
body_json.removed = true;
end
body_json.mediaType = mediaType; body_json.mediaType = mediaType;
local moderators_body_json_str = json.encode(body_json); local moderators_body_json_str = json.encode(body_json);
body_json.whitelists = nil; body_json.whitelists = nil;
if not removed then
body_json.approved = true; -- we want to send to participants only that they were approved to unmute body_json.approved = true; -- we want to send to participants only that they were approved to unmute
end
local participant_body_json_str = json.encode(body_json); local participant_body_json_str = json.encode(body_json);
for _, occupant in room:each_occupant() do for _, occupant in room:each_occupant() do
@ -167,7 +172,7 @@ function on_message(event)
room.av_moderation = {}; room.av_moderation = {};
room.av_moderation_actors = {}; room.av_moderation_actors = {};
end end
room.av_moderation[mediaType] = {}; room.av_moderation[mediaType] = array{};
room.av_moderation_actors[mediaType] = occupant.nick; room.av_moderation_actors[mediaType] = occupant.nick;
end end
else else
@ -208,10 +213,10 @@ function on_message(event)
if room.av_moderation then if room.av_moderation then
local whitelist = room.av_moderation[mediaType]; local whitelist = room.av_moderation[mediaType];
if not whitelist then if not whitelist then
whitelist = {}; whitelist = array{};
room.av_moderation[mediaType] = whitelist; room.av_moderation[mediaType] = whitelist;
end end
table.insert(whitelist, occupant_jid); whitelist:push(occupant_jid);
notify_whitelist_change(occupant_to_add.jid, true, room, mediaType, false); notify_whitelist_change(occupant_to_add.jid, true, room, mediaType, false);
@ -236,7 +241,7 @@ function on_message(event)
if whitelist then if whitelist then
local index = get_index_in_table(whitelist, occupant_jid) local index = get_index_in_table(whitelist, occupant_jid)
if(index) then if(index) then
table.remove(whitelist, index); whitelist:pop(index);
notify_whitelist_change(occupant_to_remove.jid, true, room, mediaType, true); notify_whitelist_change(occupant_to_remove.jid, true, room, mediaType, true);
end end
end end