prosody
79318d548465
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 @ 6744:79318d548465

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:54:01 +0200
parent 6000:0f6399c86c10
parent 6743:adf2fdf1264a
child 6745:6728ad041761
child 7266:f0a2a305b788
comparison
equal deleted inserted replaced
6740:99b3f29c3c71 6744:79318d548465
58 function muclib.room_mt:get_affiliation(jid) 58 function muclib.room_mt:get_affiliation(jid)
59 if is_admin(jid) then return "owner"; end 59 if is_admin(jid) then return "owner"; end
60 return _get_affiliation(self, jid); 60 return _get_affiliation(self, jid);
61 end 61 end
62 function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reason) 62 function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reason)
63 if is_admin(jid) then return nil, "modify", "not-acceptable"; end 63 if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end
64 return _set_affiliation(self, actor, jid, affiliation, callback, reason); 64 return _set_affiliation(self, actor, jid, affiliation, callback, reason);
65 end 65 end
66 66
67 local function room_route_stanza(room, stanza) module:send(stanza); end 67 local function room_route_stanza(room, stanza) module:send(stanza); end
68 local function room_save(room, forced) 68 local function room_save(room, forced)