aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-01-06 12:19:23 +0100
committerKim Alvefur <zash@zash.se>2019-01-06 12:19:23 +0100
commit0108a7f4959057aca65a6b23f0daee3ca624b1db (patch)
treec21427cb6ae7330c08db10310fb9f59c8e4ba02e /plugins
parentc1722de2333d48eb3ab57c6e285a88e8f17cf7f5 (diff)
parent90f8c75467e26c7a9dc74a55c615304ee4a3569e (diff)
downloadprosody-0108a7f4959057aca65a6b23f0daee3ca624b1db.tar.gz
prosody-0108a7f4959057aca65a6b23f0daee3ca624b1db.zip
Merge with jonas
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/muc.lib.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index bb79cda6..a34e912b 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -23,6 +23,7 @@ local resourceprep = require "util.encodings".stringprep.resourceprep;
local st = require "util.stanza";
local base64 = require "util.encodings".base64;
local md5 = require "util.hashes".md5;
+local id = require "util.id";
local log = module._log;
@@ -1037,6 +1038,9 @@ end
function room_mt:handle_groupchat_to_room(origin, stanza)
local from = stanza.attr.from;
local occupant = self:get_occupant_by_real_jid(from);
+ if not stanza.attr.id then
+ stanza.attr.id = id.medium()
+ end
if module:fire_event("muc-occupant-groupchat", {
room = self; origin = origin; stanza = stanza; from = from; occupant = occupant;
}) then return true; end