aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-10-21 16:04:54 +0100
committerMatthew Wild <mwild1@gmail.com>2018-10-21 16:04:54 +0100
commit9825eee8c1d9ca7a245650cf4b21c64c0beb578f (patch)
tree9d3034445b7eb400660c86a2f905cfb911a0484f /plugins/muc
parente12a6cdb99b73e99551d2b716e51275031056616 (diff)
downloadprosody-9825eee8c1d9ca7a245650cf4b21c64c0beb578f.tar.gz
prosody-9825eee8c1d9ca7a245650cf4b21c64c0beb578f.zip
MUC: Use the bare JID when performing a lookup for COMPAT with clients that don't set it (fixes #1224)
The full JID is never meant to be the target of affiliation changes.
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 8e039457..d8fd7128 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -922,7 +922,7 @@ function room_mt:handle_admin_query_set_command(origin, stanza)
if not item.attr.jid and item.attr.nick then
-- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation
local occupant = self:get_occupant_by_nick(self.jid.."/"..item.attr.nick);
- if occupant then item.attr.jid = occupant.jid; end
+ if occupant then item.attr.jid = occupant.bare_jid; end
elseif item.attr.role and not item.attr.nick and item.attr.jid then
-- Role changes should use nick, but we have a JID so pull the nick from that
local nick = self:get_occupant_jid(item.attr.jid);