mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_blocklist: Restructure how we keep track of where to send unavailable presence

Browse source
This commit is contained in:
Kim Alvefur 2015-12-06 02:22:49 +01:00
parent b4679e2188
commit 4fb06ad84f
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/mod_blocklist.lua
View file

@ -119,6 +119,13 @@ local function edit_blocklist(event)
local action = stanza.tags[1]; -- "block" or "unblock" local action = stanza.tags[1]; -- "block" or "unblock"
local new = {}; -- JIDs to block depending or unblock on action local new = {}; -- JIDs to block depending or unblock on action
-- XEP-0191 sayeth:
-- > When the user blocks communications with the contact, the user's
-- > server MUST send unavailable presence information to the contact (but
-- > only if the contact is allowed to receive presence notifications [...]
-- So contacts we need to do that for are added to the set below.
local send_unavailable = {};
for item in action:childtags("item") do for item in action:childtags("item") do
local jid = jid_prep(item.attr.jid); local jid = jid_prep(item.attr.jid);
if not jid then if not jid then
@ -126,7 +133,10 @@ local function edit_blocklist(event)
return true; return true;
end end
item.attr.jid = jid; -- echo back prepped item.attr.jid = jid; -- echo back prepped
new[jid] = is_contact_subscribed(username, module.host, jid) or false; new[jid] = true;
if is_contact_subscribed(username, module.host, jid) then
send_unavailable[jid] = true;
end
end end
local is_blocking = action.name == "block" or nil; -- nil if unblocking local is_blocking = action.name == "block" or nil; -- nil if unblocking
@ -161,8 +171,8 @@ local function edit_blocklist(event)
end end
if is_blocking then if is_blocking then
for jid, in_roster in pairs(new) do for jid in pairs(send_unavailable) do
if not blocklist[jid] and in_roster then if not blocklist[jid] then
for _, session in pairs(sessions[username].sessions) do for _, session in pairs(sessions[username].sessions) do
if session.presence then if session.presence then
module:send(st.presence({ type = "unavailable", to = jid, from = session.full_jid })); module:send(st.presence({ type = "unavailable", to = jid, from = session.full_jid }));