Software / code / prosody
Diff
plugins/muc/muc.lib.lua @ 6475:3c815a64042b
plugins/muc/muc.lib: Fix passing actor along as a boolean (thanks fippo)
| author | daurnimator <quae@daurnimator.com> |
|---|---|
| date | Wed, 15 Oct 2014 14:28:16 -0400 |
| parent | 6454:6842b07fc7bc |
| child | 6476:fb8a9873728b |
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua Tue Oct 14 10:59:54 2014 +0100 +++ b/plugins/muc/muc.lib.lua Wed Oct 15 14:28:16 2014 -0400 @@ -1000,7 +1000,9 @@ local target_affiliation = self._affiliations[jid]; -- Raw; don't want to check against host local is_downgrade = valid_affiliations[target_affiliation or "none"] > valid_affiliations[affiliation or "none"]; - if actor ~= true then + if actor == true then + actor = nil -- So we can pass it safely to 'publicise_occupant_status' below + else local actor_affiliation = self:get_affiliation(actor); if actor_affiliation == "owner" then if jid_bare(actor) == jid then -- self change @@ -1098,7 +1100,9 @@ end role = role ~= "none" and role or nil; -- coerces `role == false` to `nil` - if actor ~= true then + if actor == true then + actor = nil -- So we can pass it safely to 'publicise_occupant_status' below + else -- Can't do anything to other owners or admins local occupant_affiliation = self:get_affiliation(occupant.bare_jid); if occupant_affiliation == "owner" and occupant_affiliation == "admin" then
