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

mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster

Browse source
This commit is contained in:
Waqas Hussain 2009-07-05 12:25:15 +05:00
parent 0d35651c13
commit 25a62bae4e
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/mod_presence.lua
View file

@ -61,8 +61,9 @@ local function recalc_resource_map(origin)
end end
function handle_normal_presence(origin, stanza, core_route_stanza) function handle_normal_presence(origin, stanza, core_route_stanza)
if origin.roster then local roster = origin.roster;
for jid, item in pairs(origin.roster) do -- broadcast to all interested contacts if roster then
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_route_stanza(origin, stanza);
@ -77,7 +78,7 @@ function handle_normal_presence(origin, stanza, core_route_stanza)
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
local probe = st.presence({from = origin.full_jid, type = "probe"}); local probe = st.presence({from = origin.full_jid, type = "probe"});
for jid, item in pairs(origin.roster) do -- probe all contacts we are subscribed to for jid, item in pairs(roster) do -- probe all contacts we are subscribed to
if item.subscription == "both" or item.subscription == "to" then if item.subscription == "both" or item.subscription == "to" then
probe.attr.to = jid; probe.attr.to = jid;
core_route_stanza(origin, probe); core_route_stanza(origin, probe);
@ -90,13 +91,13 @@ function handle_normal_presence(origin, stanza, core_route_stanza)
res.presence.attr.to = nil; res.presence.attr.to = nil;
end end
end end
if origin.roster.pending then -- resend incoming subscription requests if roster.pending then -- resend incoming subscription requests
for jid in pairs(origin.roster.pending) do for jid in pairs(roster.pending) do
origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original?
end end
end end
local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host}); local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host});
for jid, item in pairs(origin.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_route_stanza(origin, request);