From 2e417768dcfab554e5211269a4fd1d4cbea7e6ef Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 21 Oct 2018 16:17:55 +0100 Subject: MUC: Include affiliation data when iterating over affiliations with a room --- plugins/muc/muc.lib.lua | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'plugins') diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index d8fd7128..4e1d32f2 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -1222,17 +1222,14 @@ end -- Iterates over jid, affiliation pairs function room_mt:each_affiliation(with_affiliation) - if not with_affiliation then - return pairs(self._affiliations); - else - return function(_affiliations, jid) - local affiliation; - repeat -- Iterate until we get a match - jid, affiliation = next(_affiliations, jid); - until jid == nil or affiliation == with_affiliation - return jid, affiliation; - end, self._affiliations, nil - end + local _affiliations, _affiliation_data = self._affiliations, self._affiliation_data; + return function(_, jid) + local affiliation; + repeat -- Iterate until we get a match + jid, affiliation = next(_affiliations, jid); + until with_affiliation == nil or jid == nil or affiliation == with_affiliation + return jid, affiliation, _affiliation_data[jid]; + end, nil, nil; end function room_mt:set_affiliation(actor, jid, affiliation, reason, data) -- cgit v1.2.3