Emoji only mode WIP:

* refactoring + optimization
* migration

prosody-modules/mod_http_peertubelivechat_manage_rooms/mod_http_peertubelivechat_manage_rooms.lua

@@ -18,7 +18,7 @@ local mod_muc_peertubelivechat_terms = module:depends"muc_peertubelivechat_terms
 local set_muc_terms = rawget(mod_muc_peertubelivechat_terms, "set_muc_terms");
 local mod_muc_peertubelivechat_restrict_message = module:depends"muc_peertubelivechat_restrict_message";
 local set_peertubelivechat_emoji_only_mode = rawget(mod_muc_peertubelivechat_restrict_message, "set_peertubelivechat_emoji_only_mode");
-local set_peertubelivechat_emoji_only_regexp = rawget(mod_muc_peertubelivechat_restrict_message, "set_peertubelivechat_emoji_only_regexp");
+local set_peertubelivechat_custom_emoji_regexp = rawget(mod_muc_peertubelivechat_restrict_message, "set_peertubelivechat_custom_emoji_regexp");
 
 function check_auth(routes)
   local function check_request_auth(event)
@@ -110,9 +110,9 @@ local function update_room(event)
       set_peertubelivechat_emoji_only_mode(room, config.livechat_emoji_only)
     end
   end
-  if type(config.livechat_emoji_only_regexp) == "string" then
-    if set_peertubelivechat_emoji_only_mode then
-      set_peertubelivechat_emoji_only_regexp(room, config.livechat_emoji_only_regexp)
+  if type(config.livechat_custom_emoji_regexp) == "string" then
+    if set_peertubelivechat_custom_emoji_regexp then
+      set_peertubelivechat_custom_emoji_regexp(room, config.livechat_custom_emoji_regexp)
     end
   end
   if (type(config.livechat_muc_terms) == "string") then

prosody-modules/mod_muc_http_defaults/mod_muc_http_defaults.lua

@@ -10,7 +10,7 @@
 -- * "moderation_delay"
 -- * "anonymize_moderation_actions"
 -- * "livechat_emoji_only"
--- * "livechat_emoji_only_regexp"
+-- * "livechat_custom_emoji_regexp"
 -- * "livechat_muc_terms"
 -- These options are introduced in the Peertube livechat plugin.
 --
@@ -134,8 +134,8 @@ local function apply_config(room, settings)
 		if (type(config.livechat_emoji_only) == "boolean") then
 			room._data.x_peertubelivechat_emoji_only_mode = config.livechat_emoji_only;
 		end
-		if (type(config.livechat_emoji_only_regexp) == "string" and config.livechat_emoji_only_regexp ~= "") then
-			room._data.x_peertubelivechat_emoji_only_regexp = config.livechat_emoji_only_regexp;
+		if (type(config.livechat_custom_emoji_regexp) == "string" and config.livechat_custom_emoji_regexp ~= "") then
+			room._data.x_peertubelivechat_custom_emoji_regexp = config.livechat_custom_emoji_regexp;
 		end
 		if (type(config.livechat_muc_terms) == "string") then
 			-- we don't need to use set_muc_terms here, as this is called for a newly created room

prosody-modules/mod_muc_peertubelivechat_restrict_message/mod_muc_peertubelivechat_restrict_message.lua

@@ -19,6 +19,7 @@ local mod_muc = module:depends "muc";
 local muc_util = module:require "muc/util";
 local valid_roles = muc_util.valid_roles;
 
+local common_emoji_regexp = assert(module:get_option_string('peertubelivechat_restrict_message_common_emoji_regexp'), 'Common emoji regexp is mandatory');
 
 function get_peertubelivechat_emoji_only_mode(room)
   return room._data.x_peertubelivechat_emoji_only_mode;
@@ -31,17 +32,17 @@ function set_peertubelivechat_emoji_only_mode(room, emoji_only)
   return true;
 end
 
-function get_peertubelivechat_emoji_only_regexp(room)
-  return room._data.x_peertubelivechat_emoji_only_regexp;
+function get_peertubelivechat_custom_emoji_regexp(room)
+  return room._data.x_peertubelivechat_custom_emoji_regexp;
 end
 
-function set_peertubelivechat_emoji_only_regexp(room, emoji_only_regexp)
+function set_peertubelivechat_custom_emoji_regexp(room, emoji_only_regexp)
   if (emoji_only_regexp ~= nil and type(emoji_only_regexp) ~= "string") then
     return false;
   end
   if emoji_only_regexp == "" then emoji_only_regexp = nil; end
-  if get_peertubelivechat_emoji_only_regexp(room) == emoji_only_regexp then return false; end
-  room._data.x_peertubelivechat_emoji_only_regexp = emoji_only_regexp;
+  if get_peertubelivechat_custom_emoji_regexp(room) == emoji_only_regexp then return false; end
+  room._data.x_peertubelivechat_custom_emoji_regexp = emoji_only_regexp;
 
   -- and we must decache the compile regexp
   room.x_peertubelivechat_emoji_only_compiled_regexp = nil;
@@ -49,25 +50,23 @@ function set_peertubelivechat_emoji_only_regexp(room, emoji_only_regexp)
 end
 
 module:hook("muc-disco#info", function(event)
-  if get_peertubelivechat_emoji_only_mode(event.room) and get_peertubelivechat_emoji_only_regexp(event.room) ~= nil then
+  if get_peertubelivechat_emoji_only_mode(event.room) then
     event.reply:tag("feature", {var = "x_peertubelivechat_emoji_only_mode"}):up();
   end
 end);
 
 module:hook("muc-config-form", function(event)
-  if (get_peertubelivechat_emoji_only_regexp(event.room) ~= nil) then
-    table.insert(event.form, {
-      name = "muc#roomconfig_x_peertubelivechat_emoji_only_mode";
-      type = "boolean";
-      label = "Emoji only mode";
-      desc = "Occupants will only be able to send emoji. This does not affect moderators.";
-      value = get_peertubelivechat_emoji_only_mode(event.room);
-    });
-  end
-end, 121);
+  table.insert(event.form, {
+    name = "muc#roomconfig_x_peertubelivechat_emoji_only_mode";
+    type = "boolean";
+    label = "Emoji only mode";
+    desc = "Occupants will only be able to send emoji. This does not affect moderators.";
+    value = get_peertubelivechat_emoji_only_mode(event.room);
+  });
+end, 122);
 
 module:hook("muc-config-submitted/muc#roomconfig_x_peertubelivechat_emoji_only_mode", function(event)
-  if get_peertubelivechat_emoji_only_regexp(event.room) ~= nil and set_peertubelivechat_emoji_only_mode(event.room, event.value) then
+  if set_peertubelivechat_emoji_only_mode(event.room, event.value) then
     event.status_codes["104"] = true;
   end
 end);
@@ -84,10 +83,14 @@ function handle_groupchat(event)
 
   if not room.x_peertubelivechat_emoji_only_compiled_regexp then
     -- compute the regexp on first access
-    local r = get_peertubelivechat_emoji_only_regexp(room);
-    if (r == nil) then
-      return;
+    local r = get_peertubelivechat_custom_emoji_regexp(room);
+    if (r == nil or r == "") then
+      r = common_emoji_regexp;
+    else
+      r = r .. "|" .. common_emoji_regexp;
     end
+    r = "^\\s*(?:(?:" .. r .. ")\\s*)+\\s*$"
+
     room.x_peertubelivechat_emoji_only_compiled_regexp = rex.new(r, "i", "UTF8");
   end