diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2011-08-25 12:05:27 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2011-08-25 12:05:27 +0500 |
| commit | ec3c0dac32b1ff3c45fd15751a3c7571ac97d5d3 (patch) | |
| tree | 52b019c6c36428a6f1743e56756124ae1e980e6d | |
| parent | 45ef372127bff6f9be6ebd2ae47a4f9ec6438aa5 (diff) | |
| download | prosody-ec3c0dac32b1ff3c45fd15751a3c7571ac97d5d3.tar.gz prosody-ec3c0dac32b1ff3c45fd15751a3c7571ac97d5d3.zip | |
MUC: Allow affiliation change when argument actor==true in room:set_affiliation().
| -rw-r--r-- | plugins/muc/muc.lib.lua | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index ff11bd69..8e05bbb4 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -931,21 +931,23 @@ function room_mt:set_affiliation(actor, jid, affiliation, callback, reason) if affiliation and affiliation ~= "outcast" and affiliation ~= "owner" and affiliation ~= "admin" and affiliation ~= "member" then return nil, "modify", "not-acceptable"; end - local actor_affiliation = self:get_affiliation(actor); - local target_affiliation = self:get_affiliation(jid); - if target_affiliation == affiliation then -- no change, shortcut - if callback then callback(); end - return true; - end - if actor_affiliation ~= "owner" then - if actor_affiliation ~= "admin" or target_affiliation == "owner" or target_affiliation == "admin" then - return nil, "cancel", "not-allowed"; + if actor ~= true then + local actor_affiliation = self:get_affiliation(actor); + local target_affiliation = self:get_affiliation(jid); + if target_affiliation == affiliation then -- no change, shortcut + if callback then callback(); end + return true; end - elseif target_affiliation == "owner" and jid_bare(actor) == jid then -- self change - local is_last = true; - for j, aff in pairs(self._affiliations) do if j ~= jid and aff == "owner" then is_last = false; break; end end - if is_last then - return nil, "cancel", "conflict"; + if actor_affiliation ~= "owner" then + if actor_affiliation ~= "admin" or target_affiliation == "owner" or target_affiliation == "admin" then + return nil, "cancel", "not-allowed"; + end + elseif target_affiliation == "owner" and jid_bare(actor) == jid then -- self change + local is_last = true; + for j, aff in pairs(self._affiliations) do if j ~= jid and aff == "owner" then is_last = false; break; end end + if is_last then + return nil, "cancel", "conflict"; + end end end self._affiliations[jid] = affiliation; |