# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269222862 0
# Node ID 767864297afe5d53e0e37c011dc49f265005158f
# Parent  2b54ef7cec32d75f03997b8ba2d64bb513dc4313
mod_roster: Tidier code for the roster versioning logic

diff -r 2b54ef7cec32 -r 767864297afe plugins/mod_roster.lua
--- a/plugins/mod_roster.lua	Sat Mar 20 14:17:51 2010 +0000
+++ b/plugins/mod_roster.lua	Mon Mar 22 01:54:22 2010 +0000
@@ -36,9 +36,10 @@
 				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
@@ -55,7 +56,7 @@
 								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