diff options
| author | Kim Alvefur <zash@zash.se> | 2019-01-06 12:19:23 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-01-06 12:19:23 +0100 |
| commit | f84260d3b2a2306a591bf98bc96890eaf714bce0 (patch) | |
| tree | c21427cb6ae7330c08db10310fb9f59c8e4ba02e | |
| parent | 8321e093388eb2374d56cfe7dd023388c46a3202 (diff) | |
| parent | f61b36e2d32c4e5ea7ed7eb3d800bcc7ef5afee2 (diff) | |
| download | prosody-f84260d3b2a2306a591bf98bc96890eaf714bce0.tar.gz prosody-f84260d3b2a2306a591bf98bc96890eaf714bce0.zip | |
Merge with jonas
| -rw-r--r-- | plugins/muc/muc.lib.lua | 4 |
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 |