General fixes for s2s, to make it more robust (I hope), sending data to remote hosts...

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index f32efaa829f56fad78d51c0d4c39758650d4ef6b..1ccaafd06fce4320b333d007e8da1f80776b6dd7 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -6,6 +6,7 @@ local jid_split = require "util.jid".split;
 local t_concat = table.concat;
 
 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", 
@@ -15,22 +16,26 @@ add_iq_handler("c2s", "jabber:iq:roster",
                                        local roster = st.reply(stanza)
                                                                :query("jabber:iq:roster");
                                        for jid in pairs(session.roster) do
-                                               local item = st.stanza("item", {
-                                                       jid = jid,
-                                                       subscription = session.roster[jid].subscription,
-                                                       name = session.roster[jid].name,
-                                               });
-                                               for group in pairs(session.roster[jid].groups) do
-                                                       item:tag("group"):text(group):up();
+                                               if jid ~= "pending" then
+                                                       roster:tag("item", {
+                                                               jid = jid,
+                                                               subscription = session.roster[jid].subscription,
+                                                               ask = session.roster[jid].ask,
+                                                               name = session.roster[jid].name,
+                                                       });
+                                                       for group in pairs(session.roster[jid].groups) do
+                                                               roster:tag("group"):text(group):up();
+                                                       end
                                                end
-                                               roster:add_child(item);
                                        end
                                        send(session, roster);
+                                       session.interested = true; -- resource is interested in roster updates
                                        return true;
                                elseif stanza.attr.type == "set" then
                                        local query = stanza.tags[1];
                                        if #query.tags == 1 and query.tags[1].name == "item"
-                                                       and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid then
+                                                       and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid
+                                                       and query.tags[1].attr.jid ~= "pending" then
                                                local item = query.tags[1];
                                                local from_node, from_host = jid_split(stanza.attr.from);
                                                local node, host, resource = jid_split(item.attr.jid);
@@ -52,7 +57,8 @@ add_iq_handler("c2s", "jabber:iq:roster",
                                                                        local r_item = {name = item.attr.name, groups = {}};
                                                                        if r_item.name == "" then r_item.name = nil; end
                                                                        if session.roster[item.attr.jid] then
-                                                                               r_item.subscription = session.roster[item.attr.jid];
+                                                                               r_item.subscription = session.roster[item.attr.jid].subscription;
+                                                                               r_item.ask = session.roster[item.attr.jid].ask;
                                                                        else
                                                                                r_item.subscription = "none";
                                                                        end