diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-22 01:54:22 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-22 01:54:22 +0000 |
| commit | edc283b4555a5024d7a9e44ab7d2669a23c1e8e4 (patch) | |
| tree | 4e42665d1c792062b54f1a7395406b68e6888fa8 | |
| parent | c4bb05ab3e6699e5c367cc4cc698f7473b106a9b (diff) | |
| download | prosody-edc283b4555a5024d7a9e44ab7d2669a23c1e8e4.tar.gz prosody-edc283b4555a5024d7a9e44ab7d2669a23c1e8e4.zip | |
mod_roster: Tidier code for the roster versioning logic
| -rw-r--r-- | plugins/mod_roster.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua index 4362dca2..d301dd78 100644 --- a/plugins/mod_roster.lua +++ b/plugins/mod_roster.lua @@ -36,9 +36,10 @@ 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 @@ -55,7 +56,7 @@ module:add_iq_handler("c2s", "jabber:iq:roster", 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 |