aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2014-03-31 14:44:52 -0400
committerdaurnimator <quae@daurnimator.com>2014-03-31 14:44:52 -0400
commite19853af0e7f6049fd43e3d061f4a1f54cbb8fa6 (patch)
treeed483e575ca672109ef5bcf86108c6a61dd38e7b
parent8b8f89703e632711ee0a6371a2f7e2400176b692 (diff)
downloadprosody-e19853af0e7f6049fd43e3d061f4a1f54cbb8fa6.tar.gz
prosody-e19853af0e7f6049fd43e3d061f4a1f54cbb8fa6.zip
plugins/muc/muc.lib: Don't try and get occupant jids for annotating invite affiliation changes
-rw-r--r--plugins/muc/muc.lib.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 58fa7b83..d6ba68f9 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1272,9 +1272,8 @@ module:hook("muc-invite", function(event)
local invitee = stanza.attr.to
if room:get_members_only() and not room:get_affiliation(invitee) then
local from = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite").attr.from
- local current_nick = room:get_occupant_jid(from)
log("debug", "%s invited %s into members only room %s, granting membership", from, invitee, room.jid);
- room:set_affiliation(from, invitee, "member", "Invited by " .. current_nick)
+ room:set_affiliation(from, invitee, "member", "Invited by " .. from); -- This might fail; ignore for now
end
end);