Software / code / prosody
File
util/error.lua @ 10684:de607875d4bd
MUC: Pass previous role to :publicise_occupant_status() whenever possible
Currently there is what amounts to a hack in presence_broadcast.lib.lua to
make it always broadcast presence with roles of "none". This is to ensure
that if you previously saw available presence for someone, you will also
see the unavailable presence (which always has role="none").
The correct approach is to take into account what the previous role was (
i.e. answer the question: "Was the available presence for this occupant
a role for which presence broadcast is enabled?).
The logic is already in place to do this correctly, but most call sites
do not provide the previous role (prev_role argument) of the occupant,
which causes it to not be used. In its place the hack to always broadcast
presence of role="none" has allowed things to continue to work.
The intention is that a subsequent commit will remove the unconditional
broadcast of role="none".
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 12 Mar 2020 14:10:12 +0000 |
| parent | 10501:e8186aba1583 |
| child | 11050:51be24b16e8a |
line wrap: on
line source
local error_mt = { __name = "error" }; function error_mt:__tostring() return ("error<%s:%s:%s>"):format(self.type, self.condition, self.text or ""); end local function is_err(e) return getmetatable(e) == error_mt; end -- Do we want any more well-known fields? -- Or could we just copy all fields from `e`? -- Sometimes you want variable details in the `text`, how to handle that? -- Translations? -- Should the `type` be restricted to the stanza error types or free-form? -- What to set `type` to for stream errors or SASL errors? Those don't have a 'type' attr. local function new(e, context, registry) local template = (registry and registry[e]) or e or {}; return setmetatable({ type = template.type or "cancel"; condition = template.condition or "undefined-condition"; text = template.text; code = template.code; context = context or template.context or { _error_id = e }; }, error_mt); end local function coerce(ok, err, ...) if ok or is_err(err) then return ok, err, ...; end local new_err = setmetatable({ native = err; type = "cancel"; condition = "undefined-condition"; }, error_mt); return ok, new_err, ...; end local function from_stanza(stanza, context) local error_type, condition, text = stanza:get_error(); return setmetatable({ type = error_type or "cancel"; condition = condition or "undefined-condition"; text = text; context = context or { stanza = stanza }; }, error_mt); end return { new = new; coerce = coerce; is_err = is_err; from_stanza = from_stanza; }