Software / code / prosody
Changeset
9540:8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
It stored the caps hash as a string in the recipients table while
waiting for a disco#info response, then replaces it with the set of
nodes that had +notify.
This mixing of types is bad, so here it gets removed.
This can be improved once an IQ tracking API (#714) is added.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Oct 2018 22:54:15 +0200 |
| parents | 9539:b30455212f89 |
| children | 9541:742977123168 |
| files | plugins/mod_pep.lua |
| diffstat | 1 files changed, 7 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_pep.lua Sun Oct 21 22:21:18 2018 +0200 +++ b/plugins/mod_pep.lua Tue Oct 23 22:54:15 2018 +0200 @@ -271,7 +271,7 @@ end local current = service_recipients[recipient]; - if not current or type(current) ~= "table" then + if not current then current = empty_set; end @@ -322,15 +322,11 @@ if hash_map[hash] then update_subscriptions(recipient, username, hash_map[hash]); else - recipients[username][recipient] = hash; - local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host; - if is_self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then - -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute - origin.send( - st.stanza("iq", {from=user_bare, to=stanza.attr.from, id="disco", type="get"}) - :tag("query", {xmlns = "http://jabber.org/protocol/disco#info", node = query_node}) - ); - end + -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute + origin.send( + st.stanza("iq", {from=user_bare, to=stanza.attr.from, id="disco", type="get"}) + :tag("query", {xmlns = "http://jabber.org/protocol/disco#info", node = query_node}) + ); end end end @@ -365,12 +361,7 @@ user_bare = jid_join(username, host); end local contact = stanza.attr.from; - local current = recipients[username] and recipients[username][contact]; - if type(current) ~= "string" then return; end -- check if waiting for recipient's response - local ver = current; - if not string.find(current, "#") then - ver = calculate_hash(disco.tags); -- calculate hash - end + local ver = calculate_hash(disco.tags); -- calculate hash local notify = set_new(); for _, feature in pairs(disco.tags) do if feature.name == "feature" and feature.attr.var then
