Merge 0.6->0.7

[prosody.git] / plugins / muc / muc.lib.lua

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 0544cfe32edc3a065fb251f9da357f02594af629..1cc001bb0fc8ead4aca56c7e9420f0a0edadbf33 100644 (file)
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -514,6 +514,9 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha
                                        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._occupants[self.jid.."/"..item.attr.nick];
                                                if occupant then item.attr.jid = occupant.jid; end
+                                       elseif not item.attr.nick and item.attr.jid then
+                                               local nick = self._jid_nick[item.attr.jid];
+                                               if nick then item.attr.nick = select(3, jid_split(nick)); end
                                        end
                                        local reason = item.tags[1] and item.tags[1].name == "reason" and #item.tags[1] == 1 and item.tags[1][1];
                                        if item.attr.affiliation and item.attr.jid and not item.attr.role then
@@ -545,9 +548,14 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha
                                                        -- TODO allow admins and owners not in room? Provide read-only access to everyone who can see the participants anyway?
                                                        if _rol == "none" then _rol = nil; end
                                                        local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
-                                                       for nick, occupant in pairs(self._occupants) do
+                                                       for occupant_jid, occupant in pairs(self._occupants) do
                                                                if occupant.role == _rol then
-                                                                       reply:tag("item", {nick = nick, role = _rol or "none", affiliation = occupant.affiliation or "none", jid = occupant.jid}):up();
+                                                                       reply:tag("item", {
+                                                                               nick = select(3, jid_split(occupant_jid)),
+                                                                               role = _rol or "none",
+                                                                               affiliation = occupant.affiliation or "none",
+                                                                               jid = occupant.jid
+                                                                               }):up();
                                                                end
                                                        end
                                                        origin.send(reply);
@@ -735,21 +743,21 @@ function room_mt:get_role(nick)
        local session = self._occupants[nick];
        return session and session.role or nil;
 end
-function room_mt:set_role(actor, nick, role, callback, reason)
+function room_mt:set_role(actor, occupant_jid, role, callback, reason)
        if role == "none" then role = nil; end
        if role and role ~= "moderator" and role ~= "participant" and role ~= "visitor" then return nil, "modify", "not-acceptable"; end
        if self:get_affiliation(actor) ~= "owner" then return nil, "cancel", "not-allowed"; end
-       local occupant = self._occupants[nick];
+       local occupant = self._occupants[occupant_jid];
        if not occupant then return nil, "modify", "not-acceptable"; end
        if occupant.affiliation == "owner" or occupant.affiliation == "admin" then return nil, "cancel", "not-allowed"; end
-       local p = st.presence({from = nick})
+       local p = st.presence({from = occupant_jid})
                :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"})
-                       :tag("item", {affiliation=occupant.affiliation or "none", nick=nick, role=role or "none"})
+                       :tag("item", {affiliation=occupant.affiliation or "none", nick=select(3, jid_split(occupant_jid)), role=role or "none"})
                                :tag("reason"):text(reason or ""):up()
                        :up();
        if not role then -- kick
                p.attr.type = "unavailable";
-               self._occupants[nick] = nil;
+               self._occupants[occupant_jid] = nil;
                for jid in pairs(occupant.sessions) do -- remove for all sessions of the nick
                        self._jid_nick[jid] = nil;
                end
@@ -762,7 +770,7 @@ function room_mt:set_role(actor, nick, role, callback, reason)
                self:_route_stanza(p);
        end
        if callback then callback(); end
-       self:broadcast_except_nick(p, nick);
+       self:broadcast_except_nick(p, occupant_jid);
        return true;
 end