diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2009-06-14 18:02:02 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2009-06-14 18:02:02 +0500 |
| commit | 29b48ea220ed613b3f0a55fe7544c8371dc2cd09 (patch) | |
| tree | bc435016d0e8bcd5cdecb08808c0a7967709ed13 | |
| parent | bdddf1bfd654c2c378cf2cee24230ae9b38d8d54 (diff) | |
| download | prosody-29b48ea220ed613b3f0a55fe7544c8371dc2cd09.tar.gz prosody-29b48ea220ed613b3f0a55fe7544c8371dc2cd09.zip | |
stanza_router: Remove all traces of presencemanager
| -rw-r--r-- | core/stanza_router.lua | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 22064f3f..32c1a088 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -23,10 +23,6 @@ local offlinemanager = require "core.offlinemanager"; local modules_handle_stanza = require "core.modulemanager".handle_stanza; local component_handle_stanza = require "core.componentmanager".handle_stanza; -local handle_outbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes; -local handle_inbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes; -local handle_normal_presence = function()end;--require "core.presencemanager".handle_normal_presence; - local format = string.format; local tostring = tostring; local t_concat = table.concat; @@ -228,7 +224,7 @@ function core_route_stanza(origin, stanza) -- if we get here, resource was not specified or was unavailable if stanza.name == "presence" then if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then - handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); + -- inbound presence subscriptions and probes, already handled, so should never get here elseif not resource then -- sender is available or unavailable or error for _, session in pairs(user.sessions) do -- presence broadcast to all user resources. if session.full_jid then -- FIXME should this be just for available resources? Do we need to check subscription? @@ -268,7 +264,7 @@ function core_route_stanza(origin, stanza) if user_exists(node, host) then if stanza.name == "presence" then if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then - handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); + -- inbound presence subscriptions and probes, already handled, so should never get here else -- TODO send unavailable presence or unsubscribed end |