Forced merge.

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index f5dbf74297b57602aae09f9c78caeb3a2f6cc942..0b52e43e356dfcfd21a90a2f8687f494089e099c 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -1,15 +1,17 @@
 
 local st = require "util.stanza"
-local send = require "core.sessionmanager".send_to_session
 
 local jid_split = require "util.jid".split;
 local t_concat = table.concat;
 
+local handle_outbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes;
 local rm_remove_from_roster = require "core.rostermanager".remove_from_roster;
 local rm_add_to_roster = require "core.rostermanager".add_to_roster;
 local rm_roster_push = require "core.rostermanager".roster_push;
 
-add_iq_handler("c2s", "jabber:iq:roster", 
+require "core.discomanager".set("roster", "jabber:iq:roster");
+
+module:add_iq_handler("c2s", "jabber:iq:roster", 
                function (session, stanza)
                        if stanza.tags[1].name == "query" then
                                if stanza.attr.type == "get" then
@@ -29,7 +31,7 @@ add_iq_handler("c2s", "jabber:iq:roster",
                                                        roster:up(); -- move out from item
                                                end
                                        end
-                                       send(session, roster);
+                                       session.send(roster);
                                        session.interested = true; -- resource is interested in roster updates
                                        return true;
                                elseif stanza.attr.type == "set" then
@@ -39,20 +41,30 @@ add_iq_handler("c2s", "jabber:iq:roster",
                                                        and query.tags[1].attr.jid ~= "pending" then
                                                local item = query.tags[1];
                                                local from_node, from_host = jid_split(stanza.attr.from);
+                                               local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
                                                local node, host, resource = jid_split(item.attr.jid);
-                                               if not resource then
+                                               local to_bare = node and (node.."@"..host) or host; -- bare JID
+                                               if not resource and host then
                                                        if item.attr.jid ~= from_node.."@"..from_host then
                                                                if item.attr.subscription == "remove" then
-                                                                       if session.roster[item.attr.jid] then
+                                                                       local r_item = session.roster[item.attr.jid];
+                                                                       if r_item then
                                                                                local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, item.attr.jid);
                                                                                if success then
-                                                                                       send(session, st.reply(stanza));
+                                                                                       session.send(st.reply(stanza));
                                                                                        rm_roster_push(from_node, from_host, item.attr.jid);
+                                                                                       if r_item.subscription == "both" or r_item.subscription == "from" then
+                                                                                               handle_outbound_presence_subscriptions_and_probes(session,
+                                                                                                       st.presence({type="unsubscribed"}), from_bare, to_bare);
+                                                                                       elseif r_item.subscription == "both" or r_item.subscription == "to" then
+                                                                                               handle_outbound_presence_subscriptions_and_probes(session,
+                                                                                                       st.presence({type="unsubscribe"}), from_bare, to_bare);
+                                                                                       end
                                                                                else
-                                                                                       send(session, st.error_reply(stanza, err_type, err_cond, err_msg));
+                                                                                       session.send(st.error_reply(stanza, err_type, err_cond, err_msg));
                                                                                end
                                                                        else
-                                                                               send(session, st.error_reply(stanza, "modify", "item-not-found"));
+                                                                               session.send(st.error_reply(stanza, "modify", "item-not-found"));
                                                                        end
                                                                else
                                                                        local r_item = {name = item.attr.name, groups = {}};
@@ -73,22 +85,22 @@ add_iq_handler("c2s", "jabber:iq:roster",
                                                                        end
                                                                        local success, err_type, err_cond, err_msg = rm_add_to_roster(session, item.attr.jid, r_item);
                                                                        if success then
-                                                                               send(session, st.reply(stanza));
+                                                                               session.send(st.reply(stanza));
                                                                                rm_roster_push(from_node, from_host, item.attr.jid);
                                                                        else
-                                                                               send(session, st.error_reply(stanza, err_type, err_cond, err_msg));
+                                                                               session.send(st.error_reply(stanza, err_type, err_cond, err_msg));
                                                                        end
                                                                end
                                                        else
-                                                               send(session, st.error_reply(stanza, "cancel", "not-allowed"));
+                                                               session.send(st.error_reply(stanza, "cancel", "not-allowed"));
                                                        end
                                                else
-                                                       send(session, st.error_reply(stanza, "modify", "bad-request")); -- FIXME what's the correct error?
+                                                       session.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME what's the correct error?
                                                end
                                        else
-                                               send(session, st.error_reply(stanza, "modify", "bad-request"));
+                                               session.send(st.error_reply(stanza, "modify", "bad-request"));
                                        end
                                        return true;
                                end
                        end
-               end);
\ No newline at end of file
+               end);