From 2b3431a779d6c4140492d1d3988645f8a0e9ade9 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 2 Jun 2009 07:26:40 +0500 Subject: mod_presence: A little cleanup --- plugins/mod_presence.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index f30a1b84..ea6a61fc 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -273,19 +273,20 @@ module.unload = function() end module:hook("pre-presence/full", function(data) - -- presence to full JID recieved + -- outbound presence to full JID recieved local origin, stanza = data.origin, data.stanza; - if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then + local t = stanza.attr.type; + if t ~= nil and t ~= "unavailable" and t ~= "error" then -- check for subscriptions and probes sent to full JID handle_outbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); return true; end - + local to = stanza.attr.to; local to_bare = jid_bare(to); if not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then -- directed presence origin.directed = origin.directed or {}; - if stanza.attr.type then -- removing from directed presence list on sending an error or unavailable + if t then -- removing from directed presence list on sending an error or unavailable origin.directed[to] = nil; -- FIXME does it make more sense to add to_bare rather than to? else origin.directed[to] = true; -- FIXME does it make more sense to add to_bare rather than to? -- cgit v1.2.3