Comparison

Merge 0.11->trunk

comparison

equal deleted inserted replaced

-:c523642ea293
+:4b2cc8a60449
 	-- > 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 = is_blocking and {};
+	local send_available = not is_blocking and {};
 	-- Because blocking someone currently also blocks the ability to reject
 	-- subscription requests, we'll preemptively reject such
 	local remove_pending = is_blocking and {};
 			if is_contact_subscribed(username, module.host, jid) then
 				send_unavailable[jid] = true;
 			elseif is_contact_pending_in(username, module.host, jid) then
 				remove_pending[jid] = true;
 			end
+		elseif is_contact_subscribed(username, module.host, jid) then
+			send_available[jid] = true;
 		end
 	end
 	if is_blocking and not next(new) then
 		-- <block/> element does not contain at least one <item/> child element
 				roster[false].pending[jid] = nil;
 			end
 			save_roster(username, module.host, roster);
 			-- Not much we can do about save failing here
 		end
+	else
+		local user_bare = username .. "@" .. module.host;
+		for jid in pairs(send_available) do
+			module:send(st.presence({ type = "probe", to = user_bare, from = jid }));
+		end
 	end
 	local blocklist_push = st.iq({ type = "set", id = "blocklist-push" })
 		:add_child(action); -- I am lazy