Comparison

plugins/muc/muc.lib.lua @ 9717:537f6a27bdb6

Merge 0.11->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 19 Dec 2018 23:14:30 +0000
parent 9647:0f43b901c854
parent 9716:5281a795d6df
child 9719:941497cdefc3
comparison
equal deleted inserted replaced
9715:7e21ffbf7ca5 9717:537f6a27bdb6
59 if event.affiliation_rank >= valid_affiliations.admin then 59 if event.affiliation_rank >= valid_affiliations.admin then
60 return "moderator"; 60 return "moderator";
61 elseif event.affiliation_rank >= valid_affiliations.none then 61 elseif event.affiliation_rank >= valid_affiliations.none then
62 return "participant"; 62 return "participant";
63 end 63 end
64 end); 64 end, -1);
65 65
66 --- Occupant functions 66 --- Occupant functions
67 function room_mt:new_occupant(bare_real_jid, nick) 67 function room_mt:new_occupant(bare_real_jid, nick)
68 local occupant = occupant_lib.new(bare_real_jid, nick); 68 local occupant = occupant_lib.new(bare_real_jid, nick);
69 local affiliation = self:get_affiliation(bare_real_jid); 69 local affiliation = self:get_affiliation(bare_real_jid);