Software /
code /
prosody
File
util/timer.lua @ 8791:8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
According to XEP-0045 sections 9.2, 9.5 and 9.8 affiliation lists and role
lists should allow mass-modification. Prosody however would just use the
first entry of the list and ignore the rest. This is fixed by introducing
a `for` loop to `set` stanzas of the respective `muc#admin` namespace.
In order for this loop to work, the error handling was changed a little.
Prosody no longer returns after the first error. Instead, an error reply
is sent for each malformed or otherwise wrong entry, but the loop keeps
going over the other entries. This may lead to multiple error messages
being sent for one client request. A notable exception from this is when
the XML Schema for `muc#admin` requests is violated. In that case the loop
is aborted with an error message to the client.
The change is a bit bigger than that in order to have the loop only for
`set` stanzas without changing the behaviour of the `get` stanzas. This is
now more in line with trunk, where there are separate methods for each
stanza type.
References: #345
author | Lennart Sauerbeck <devel@lennart.sauerbeck.org> |
---|---|
date | Sat, 18 Mar 2017 18:47:28 +0100 |
parent | 7988:dc758422d896 |
child | 7989:5632aa85e0b6 |
line wrap: on
line source
-- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local server = require "net.server"; local math_min = math.min local math_huge = math.huge local get_time = require "util.time".now local t_insert = table.insert; local pairs = pairs; local type = type; local data = {}; local new_data = {}; local _ENV = nil; local _add_task; if not server.event then function _add_task(delay, callback) local current_time = get_time(); delay = delay + current_time; if delay >= current_time then t_insert(new_data, {delay, callback}); else local r = callback(current_time); if r and type(r) == "number" then return _add_task(r, callback); end end end server._addtimer(function() local current_time = get_time(); if #new_data > 0 then for _, d in pairs(new_data) do t_insert(data, d); end new_data = {}; end local next_time = math_huge; for i, d in pairs(data) do local t, callback = d[1], d[2]; if t <= current_time then data[i] = nil; local r = callback(current_time); if type(r) == "number" then _add_task(r, callback); next_time = math_min(next_time, r); end else next_time = math_min(next_time, t - current_time); end end return next_time; end); else local event = server.event; local event_base = server.event_base; local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1; function _add_task(delay, callback) local event_handle; event_handle = event_base:addevent(nil, 0, function () local ret = callback(get_time()); if ret then return 0, ret; elseif event_handle then return EVENT_LEAVE; end end , delay); end end return { add_task = _add_task; };