mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating...

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 52c61a2601daacefd54bc4a4f20e51ecd58879ba..af92e24e5809de09396e5824cbfea574083a518c 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -23,12 +23,12 @@ local core_post_stanza = core_post_stanza;
 module:add_feature("jabber:iq:roster");
 
 local rosterver_stream_feature = st.stanza("ver", {xmlns="urn:xmpp:features:rosterver"}):tag("optional"):up();
-module:add_event_hook("stream-features", 
-               function (session, features)
-                       if session.username then
-                               features:add_child(rosterver_stream_feature);
-                       end
-               end);
+module:hook("stream-features", function(event)
+       local origin, features = event.origin, event.features;
+       if origin.username then
+               features:add_child(rosterver_stream_feature);
+       end
+end);
 
 module:add_iq_handler("c2s", "jabber:iq:roster", 
                function (session, stanza)
@@ -36,26 +36,27 @@ module:add_iq_handler("c2s", "jabber:iq:roster",
                                if stanza.attr.type == "get" then
                                        local roster = st.reply(stanza);
                                        
-                                       local ver = stanza.tags[1].attr.ver
+                                       local client_ver = tonumber(stanza.tags[1].attr.ver);
+                                       local server_ver = tonumber(session.roster[false].version or 1);
                                        
-                                       if (not ver) or tonumber(ver) ~= (session.roster[false].version or 1) then
+                                       if not (client_ver and server_ver) or client_ver ~= server_ver then
                                                roster:query("jabber:iq:roster");
                                                -- Client does not support versioning, or has stale roster
-                                               for jid in pairs(session.roster) do
+                                               for jid, item in pairs(session.roster) do
                                                        if jid ~= "pending" and jid then
                                                                roster:tag("item", {
                                                                        jid = jid,
-                                                                       subscription = session.roster[jid].subscription,
-                                                                       ask = session.roster[jid].ask,
-                                                                       name = session.roster[jid].name,
+                                                                       subscription = item.subscription,
+                                                                       ask = item.ask,
+                                                                       name = item.name,
                                                                });
-                                                               for group in pairs(session.roster[jid].groups) do
+                                                               for group in pairs(item.groups) do
                                                                        roster:tag("group"):text(group):up();
                                                                end
                                                                roster:up(); -- move out from item
                                                        end
                                                end
-                                               roster.tags[1].attr.ver = tostring(session.roster[false].version or "1");
+                                               roster.tags[1].attr.ver = server_ver;
                                        end
                                        session.send(roster);
                                        session.interested = true; -- resource is interested in roster updates