mod_presence: Send unavailable presence when sending unsubscribed presence stanzas...

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index d696612d9d7941b1b62f82bf8722fd7f23e6ebf7..f83e017b3b54c631bc92b622a58bc4989f590a89 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -142,7 +142,7 @@ function handle_normal_presence(origin, stanza, core_route_stanza)
        stanza.attr.to = nil; -- reset it
 end
 
-function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza)
+function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza, stanza)
        local h = hosts[host];
        local count = 0;
        if h and h.type == "local" then
@@ -151,6 +151,7 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
                        for k, session in pairs(u.sessions) do
                                local pres = session.presence;
                                if pres then
+                                       if stanza then pres = stanza; pres.attr.from = session.full_jid; end
                                        pres.attr.to = jid;
                                        core_route_stanza(session, pres);
                                        pres.attr.to = nil;
@@ -199,6 +200,9 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
                        rostermanager.roster_push(node, host, to_bare);
                end
                core_route_stanza(origin, stanza);
+               -- COMPAT: Some legacy clients keep displaying unsubscribed contacts as online unless an unavailable presence is sent:
+               send_presence_of_available_resources(node, host, to_bare, origin, core_route_stanza,
+                       st.presence({ type="unavailable", from=from_bare, to=to_bare, id=stanza.attr.id }));
        end
        stanza.attr.from, stanza.attr.to = st_from, st_to;
 end