Mercurial > prosody-hg

comparison plugins/muc/mod_muc.lua @ 6770:cb84731b2dfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Matthew Wild <mwild1@gmail.com>
date Mon, 27 Jul 2015 09:38:40 +0100
parents 4caef6d53304 7816923fd5bf
children ad231285efdd
comparison
equal deleted inserted replaced
6769:4caef6d53304 6770:cb84731b2dfd
85 if is_admin(jid) then return "owner"; end 85 if is_admin(jid) then return "owner"; end
86 return _get_affiliation(self, jid); 86 return _get_affiliation(self, jid);
87 end 87 end
88 88
89 local _set_affiliation = room_mt.set_affiliation; 89 local _set_affiliation = room_mt.set_affiliation;
90 function room_mt:set_affiliation(actor, jid, ...) 90 function room_mt:set_affiliation(actor, jid, affiliation, reason)
91 if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end 91 if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end
92 return _set_affiliation(self, actor, jid, ...); 92 return _set_affiliation(self, actor, jid, affiliation, reason);
93 end 93 end
94 end 94 end
95 95
96 local persistent = module:require "muc/persistent"; 96 local persistent = module:require "muc/persistent";
97 local persistent_rooms_storage = module:open_store("persistent"); 97 local persistent_rooms_storage = module:open_store("persistent");