mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_presence: Enable firing of pre-events for all outbound stanzas, and switching completely to core_post_stanza.

Browse source
This commit is contained in:
Waqas Hussain 2010-06-08 16:21:14 +05:00
parent 1357c719b9
commit c04a3c71c7
1 changed files with 19 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

52
plugins/mod_presence.lua
View file

@ -24,20 +24,6 @@ local rostermanager = require "core.rostermanager";
local sessionmanager = require "core.sessionmanager"; local sessionmanager = require "core.sessionmanager";
local offlinemanager = require "core.offlinemanager"; local offlinemanager = require "core.offlinemanager";
local _core_route_stanza = core_route_stanza;
local core_route_stanza;
function core_route_stanza(origin, stanza)
if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then
local node, host = jid_split(stanza.attr.to);
host = hosts[host];
if node and host and host.type == "local" then
handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to));
return;
end
end
_core_route_stanza(origin, stanza);
end
local function select_top_resources(user) local function select_top_resources(user)
local priority = 0; local priority = 0;
local recipients = {}; local recipients = {};
@ -82,13 +68,13 @@ function handle_normal_presence(origin, stanza)
for _, res in pairs(user and user.sessions or NULL) do -- broadcast to all resources for _, res in pairs(user and user.sessions or NULL) do -- broadcast to all resources
if res ~= origin and res.presence then -- to resource if res ~= origin and res.presence then -- to resource
stanza.attr.to = res.full_jid; stanza.attr.to = res.full_jid;
core_route_stanza(origin, stanza); core_post_stanza(origin, stanza, true);
end end
end end
for jid, item in pairs(roster) do -- broadcast to all interested contacts for jid, item in pairs(roster) do -- broadcast to all interested contacts
if item.subscription == "both" or item.subscription == "from" then if item.subscription == "both" or item.subscription == "from" then
stanza.attr.to = jid; stanza.attr.to = jid;
core_route_stanza(origin, stanza); core_post_stanza(origin, stanza, true);
end end
end end
if stanza.attr.type == nil and not origin.presence then -- initial presence if stanza.attr.type == nil and not origin.presence then -- initial presence
@ -103,7 +89,7 @@ function handle_normal_presence(origin, stanza)
for _, res in pairs(user and user.sessions or NULL) do -- broadcast from all available resources for _, res in pairs(user and user.sessions or NULL) do -- broadcast from all available resources
if res ~= origin and res.presence then if res ~= origin and res.presence then
res.presence.attr.to = origin.full_jid; res.presence.attr.to = origin.full_jid;
core_route_stanza(res, res.presence); core_post_stanza(res, res.presence, true);
res.presence.attr.to = nil; res.presence.attr.to = nil;
end end
end end
@ -116,7 +102,7 @@ function handle_normal_presence(origin, stanza)
for jid, item in pairs(roster) do -- resend outgoing subscription requests for jid, item in pairs(roster) do -- resend outgoing subscription requests
if item.ask then if item.ask then
request.attr.to = jid; request.attr.to = jid;
core_route_stanza(origin, request); core_post_stanza(origin, request, true);
end end
end end
local offline = offlinemanager.load(node, host); local offline = offlinemanager.load(node, host);
@ -136,7 +122,7 @@ function handle_normal_presence(origin, stanza)
if origin.directed then if origin.directed then
for jid in pairs(origin.directed) do for jid in pairs(origin.directed) do
stanza.attr.to = jid; stanza.attr.to = jid;
core_route_stanza(origin, stanza); core_post_stanza(origin, stanza, true);
end end
origin.directed = nil; origin.directed = nil;
end end
@ -170,7 +156,7 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
if pres then if pres then
if stanza then pres = stanza; pres.attr.from = session.full_jid; end if stanza then pres = stanza; pres.attr.from = session.full_jid; end
pres.attr.to = jid; pres.attr.to = jid;
core_route_stanza(session, pres); core_post_stanza(session, pres, true);
pres.attr.to = nil; pres.attr.to = nil;
count = count + 1; count = count + 1;
end end
@ -196,14 +182,14 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
if rostermanager.set_contact_pending_out(node, host, to_bare) then if rostermanager.set_contact_pending_out(node, host, to_bare) then
rostermanager.roster_push(node, host, to_bare); rostermanager.roster_push(node, host, to_bare);
end -- else file error end -- else file error
core_route_stanza(origin, stanza); core_post_stanza(origin, stanza);
elseif stanza.attr.type == "unsubscribe" then elseif stanza.attr.type == "unsubscribe" then
-- 1. route stanza -- 1. route stanza
-- 2. roster push (subscription = none or from) -- 2. roster push (subscription = none or from)
if rostermanager.unsubscribe(node, host, to_bare) then if rostermanager.unsubscribe(node, host, to_bare) then
rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed? rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed?
end -- else file error end -- else file error
core_route_stanza(origin, stanza); core_post_stanza(origin, stanza);
elseif stanza.attr.type == "subscribed" then elseif stanza.attr.type == "subscribed" then
-- 1. route stanza -- 1. route stanza
-- 2. roster_push () -- 2. roster_push ()
@ -211,7 +197,7 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
if rostermanager.subscribed(node, host, to_bare) then if rostermanager.subscribed(node, host, to_bare) then
rostermanager.roster_push(node, host, to_bare); rostermanager.roster_push(node, host, to_bare);
end end
core_route_stanza(origin, stanza); core_post_stanza(origin, stanza);
send_presence_of_available_resources(node, host, to_bare, origin); send_presence_of_available_resources(node, host, to_bare, origin);
elseif stanza.attr.type == "unsubscribed" then elseif stanza.attr.type == "unsubscribed" then
-- 1. route stanza -- 1. route stanza
@ -219,7 +205,7 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
if rostermanager.unsubscribed(node, host, to_bare) then if rostermanager.unsubscribed(node, host, to_bare) then
rostermanager.roster_push(node, host, to_bare); rostermanager.roster_push(node, host, to_bare);
end end
core_route_stanza(origin, stanza); core_post_stanza(origin, stanza);
end end
stanza.attr.from, stanza.attr.to = st_from, st_to; stanza.attr.from, stanza.attr.to = st_from, st_to;
return true; return true;
@ -235,20 +221,20 @@ function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_b
local result, err = rostermanager.is_contact_subscribed(node, host, from_bare); local result, err = rostermanager.is_contact_subscribed(node, host, from_bare);
if result then if result then
if 0 == send_presence_of_available_resources(node, host, st_from, origin) then if 0 == send_presence_of_available_resources(node, host, st_from, origin) then
core_route_stanza(hosts[host], st.presence({from=to_bare, to=st_from, type="unavailable"})); -- TODO send last activity core_post_stanza(hosts[host], st.presence({from=to_bare, to=st_from, type="unavailable"}), true); -- TODO send last activity
end end
elseif not err then elseif not err then
core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unsubscribed"})); core_post_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unsubscribed"}), true);
end end
elseif stanza.attr.type == "subscribe" then elseif stanza.attr.type == "subscribe" then
if rostermanager.is_contact_subscribed(node, host, from_bare) then if rostermanager.is_contact_subscribed(node, host, from_bare) then
core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed core_post_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="subscribed"}), true); -- already subscribed
-- Sending presence is not clearly stated in the RFC, but it seems appropriate -- Sending presence is not clearly stated in the RFC, but it seems appropriate
if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then
core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- TODO send last activity core_post_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"}), true); -- TODO send last activity
end end
else else
core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- acknowledging receipt core_post_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"}), true); -- acknowledging receipt
if not rostermanager.is_contact_pending_in(node, host, from_bare) then if not rostermanager.is_contact_pending_in(node, host, from_bare) then
if rostermanager.set_contact_pending_in(node, host, from_bare) then if rostermanager.set_contact_pending_in(node, host, from_bare) then
sessionmanager.send_to_available_resources(node, host, stanza); sessionmanager.send_to_available_resources(node, host, stanza);
@ -349,10 +335,10 @@ module:hook("presence/host", function(data)
local from_bare = jid_bare(stanza.attr.from); local from_bare = jid_bare(stanza.attr.from);
local t = stanza.attr.type; local t = stanza.attr.type;
if t == "probe" then if t == "probe" then
core_route_stanza(hosts[module.host], st.presence({ from = module.host, to = from_bare, id = stanza.attr.id })); core_post_stanza(hosts[module.host], st.presence({ from = module.host, to = from_bare, id = stanza.attr.id }));
elseif t == "subscribe" then elseif t == "subscribe" then
core_route_stanza(hosts[module.host], st.presence({ from = module.host, to = from_bare, id = stanza.attr.id, type = "subscribed" })); core_post_stanza(hosts[module.host], st.presence({ from = module.host, to = from_bare, id = stanza.attr.id, type = "subscribed" }));
core_route_stanza(hosts[module.host], st.presence({ from = module.host, to = from_bare, id = stanza.attr.id })); core_post_stanza(hosts[module.host], st.presence({ from = module.host, to = from_bare, id = stanza.attr.id }));
end end
return true; return true;
end); end);
@ -371,7 +357,7 @@ module:hook("resource-unbind", function(event)
pres:tag("status"):text("Disconnected: "..err):up(); pres:tag("status"):text("Disconnected: "..err):up();
for jid in pairs(session.directed) do for jid in pairs(session.directed) do
pres.attr.to = jid; pres.attr.to = jid;
core_route_stanza(session, pres); core_post_stanza(session, pres, true);
end end
session.directed = nil; session.directed = nil;
end end