prosody
6728ad041761
plugins/muc/mod_muc.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/muc/mod_muc.lua @ 6745:6728ad041761

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:57:43 +0200
parent 6479:d016437e01bf
parent 6744:79318d548465
child 6768:7816923fd5bf
child 6769:4caef6d53304
comparison
equal deleted inserted replaced
6729:daa5c83b2879 6745:6728ad041761
37 return _get_affiliation(self, jid); 37 return _get_affiliation(self, jid);
38 end 38 end
39 39
40 local _set_affiliation = room_mt.set_affiliation; 40 local _set_affiliation = room_mt.set_affiliation;
41 function room_mt:set_affiliation(actor, jid, ...) 41 function room_mt:set_affiliation(actor, jid, ...)
42 if is_admin(jid) then return nil, "modify", "not-acceptable"; end 42 if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end
43 return _set_affiliation(self, actor, jid, ...); 43 return _set_affiliation(self, actor, jid, ...);
44 end 44 end
45 end 45 end
46 46
47 local persistent = module:require "muc/persistent"; 47 local persistent = module:require "muc/persistent";