Merge with 0.6.

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index cda8dab0db40b3ff5fdd7ff6cee49bf623de93e6..d3818a5da27b031d0bb81f11d8e50a2bf6389da9 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -200,9 +200,6 @@ 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
@@ -233,7 +230,7 @@ function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_b
                                -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
                        end
                else
-                       core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- acknowledging receipt
+                       core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- acknowledging receipt
                        if not rostermanager.is_contact_pending_in(node, host, from_bare) then
                                if rostermanager.set_contact_pending_in(node, host, from_bare) then
                                        sessionmanager.send_to_available_resources(node, host, stanza);

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 7ca22aa1aa9f2b3c6f3c20ce6f71e352ae1ffdde..52c61a2601daacefd54bc4a4f20e51ecd58879ba 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -74,18 +74,20 @@ module:add_iq_handler("c2s", "jabber:iq:roster",
                                                if not resource and host then
                                                        if jid ~= from_node.."@"..from_host then
                                                                if item.attr.subscription == "remove" then
-                                                                       local r_item = session.roster[jid];
+                                                                       local roster = session.roster;
+                                                                       local r_item = roster[jid];
                                                                        if r_item then
+                                                                               local to_bare = node and (node.."@"..host) or host; -- bare JID
+                                                                               if r_item.subscription == "both" or r_item.subscription == "from" or (roster.pending and roster.pending[jid]) then
+                                                                                       core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare}));
+                                                                               end
+                                                                               if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then
+                                                                                       core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare}));
+                                                                               end
                                                                                local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid);
                                                                                if success then
                                                                                        session.send(st.reply(stanza));
                                                                                        rm_roster_push(from_node, from_host, jid);
-                                                                                       local to_bare = node and (node.."@"..host) or host; -- bare JID
-                                                                                       if r_item.subscription == "both" or r_item.subscription == "from" then
-                                                                                               core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare}));
-                                                                                       elseif r_item.subscription == "both" or r_item.subscription == "to" then
-                                                                                               core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare}));
-                                                                                       end
                                                                                else
                                                                                        session.send(st.error_reply(stanza, err_type, err_cond, err_msg));
                                                                                end