aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-01-06 12:20:57 +0100
committerKim Alvefur <zash@zash.se>2019-01-06 12:20:57 +0100
commitf0550233fa24e17773e0c7cc21885cd195ad8c1f (patch)
tree57b8c86d6a7ac071ce56e61c3889d9389bf60124
parent0108a7f4959057aca65a6b23f0daee3ca624b1db (diff)
downloadprosody-f0550233fa24e17773e0c7cc21885cd195ad8c1f.tar.gz
prosody-f0550233fa24e17773e0c7cc21885cd195ad8c1f.zip
MUC: Rename import to avoid name clash [luacheck]
-rw-r--r--plugins/muc/muc.lib.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index a34e912b..7259dde2 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -23,7 +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 new_id = require "util.id".medium;
local log = module._log;
@@ -1039,7 +1039,7 @@ 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()
+ stanza.attr.id = new_id()
end
if module:fire_event("muc-occupant-groupchat", {
room = self; origin = origin; stanza = stanza; from = from; occupant = occupant;