Software / code / prosody
Annotate
plugins/mod_presence.lua @ 1475:16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sun, 05 Jul 2009 12:25:15 +0500 |
| parent | 1474:6947761fd531 |
| child | 1476:5d6199a9b4f6 |
| rev | line source |
|---|---|
| 1009 | 1 -- Prosody IM v0.4 |
| 2 -- Copyright (C) 2008-2009 Matthew Wild | |
| 3 -- Copyright (C) 2008-2009 Waqas Hussain | |
| 4 -- | |
| 5 -- This project is MIT/X11 licensed. Please see the | |
| 6 -- COPYING file in the source package for more information. | |
| 7 -- | |
| 8 | |
|
1210
342f401f354c
mod_presence: Use logger supplied by modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
1209
diff
changeset
|
9 local log = module._log; |
| 1009 | 10 |
| 11 local require = require; | |
| 12 local pairs, ipairs = pairs, ipairs; | |
|
1470
af4b918e3432
mod_presence: Declare t_insert, fixes a potential traceback
Matthew Wild <mwild1@gmail.com>
parents:
1463
diff
changeset
|
13 local t_concat, t_insert = table.concat, table.insert; |
| 1009 | 14 local s_find = string.find; |
| 15 local tonumber = tonumber; | |
| 16 | |
| 17 local st = require "util.stanza"; | |
| 18 local jid_split = require "util.jid".split; | |
| 19 local jid_bare = require "util.jid".bare; | |
| 20 local hosts = hosts; | |
| 21 | |
| 22 local rostermanager = require "core.rostermanager"; | |
| 23 local sessionmanager = require "core.sessionmanager"; | |
| 24 local offlinemanager = require "core.offlinemanager"; | |
| 25 | |
|
1044
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
26 local _core_route_stanza = core_route_stanza; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
27 local core_route_stanza; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
28 function core_route_stanza(origin, stanza) |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
29 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
30 local node, host = jid_split(stanza.attr.to); |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
31 host = hosts[host]; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
32 if host and host.type == "local" then |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
33 handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
34 return; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
35 end |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
36 end |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
37 _core_route_stanza(origin, stanza); |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
38 end |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
39 |
|
1418
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
40 local function select_top_resources(user) |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
41 local priority = 0; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
42 local recipients = {}; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
43 for _, session in pairs(user.sessions) do -- find resource with greatest priority |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
44 if session.presence then |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
45 -- TODO check active privacy list for session |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
46 local p = session.priority; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
47 if p > priority then |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
48 priority = p; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
49 recipients = {session}; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
50 elseif p == priority then |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
51 t_insert(recipients, session); |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
52 end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
53 end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
54 end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
55 return recipients; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
56 end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
57 local function recalc_resource_map(origin) |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
58 local user = hosts[origin.host].sessions[origin.username]; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
59 user.top_resources = select_top_resources(user); |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
60 if #user.top_resources == 0 then user.top_resources = nil; end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
61 end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
62 |
| 1009 | 63 function handle_normal_presence(origin, stanza, core_route_stanza) |
|
1475
16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
Waqas Hussain <waqas20@gmail.com>
parents:
1474
diff
changeset
|
64 local roster = origin.roster; |
|
16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
Waqas Hussain <waqas20@gmail.com>
parents:
1474
diff
changeset
|
65 if roster then |
|
16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
Waqas Hussain <waqas20@gmail.com>
parents:
1474
diff
changeset
|
66 for jid, item in pairs(roster) do -- broadcast to all interested contacts |
|
1474
6947761fd531
mod_presence: Simplified roster iteration
Waqas Hussain <waqas20@gmail.com>
parents:
1473
diff
changeset
|
67 if item.subscription == "both" or item.subscription == "from" then |
| 1009 | 68 stanza.attr.to = jid; |
| 69 core_route_stanza(origin, stanza); | |
| 70 end | |
| 71 end | |
|
1473
d2211cbb822f
mod_presence: Eliminated a jid_split
Waqas Hussain <waqas20@gmail.com>
parents:
1472
diff
changeset
|
72 local node, host = origin.username, origin.host; |
| 1009 | 73 for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources |
|
1057
2677f5a4e66b
mod_presence: Broadcast a user's presence to only the user's 'available' resources
Waqas Hussain <waqas20@gmail.com>
parents:
1044
diff
changeset
|
74 if res ~= origin and res.presence then -- to resource |
| 1009 | 75 stanza.attr.to = res.full_jid; |
| 76 core_route_stanza(origin, stanza); | |
| 77 end | |
| 78 end | |
| 79 if stanza.attr.type == nil and not origin.presence then -- initial presence | |
| 80 local probe = st.presence({from = origin.full_jid, type = "probe"}); | |
|
1475
16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
Waqas Hussain <waqas20@gmail.com>
parents:
1474
diff
changeset
|
81 for jid, item in pairs(roster) do -- probe all contacts we are subscribed to |
|
1474
6947761fd531
mod_presence: Simplified roster iteration
Waqas Hussain <waqas20@gmail.com>
parents:
1473
diff
changeset
|
82 if item.subscription == "both" or item.subscription == "to" then |
| 1009 | 83 probe.attr.to = jid; |
| 84 core_route_stanza(origin, probe); | |
| 85 end | |
| 86 end | |
| 87 for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all available resources | |
| 88 if res ~= origin and res.presence then | |
| 89 res.presence.attr.to = origin.full_jid; | |
| 90 core_route_stanza(res, res.presence); | |
| 91 res.presence.attr.to = nil; | |
| 92 end | |
| 93 end | |
|
1475
16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
Waqas Hussain <waqas20@gmail.com>
parents:
1474
diff
changeset
|
94 if roster.pending then -- resend incoming subscription requests |
|
16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
Waqas Hussain <waqas20@gmail.com>
parents:
1474
diff
changeset
|
95 for jid in pairs(roster.pending) do |
| 1009 | 96 origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? |
| 97 end | |
| 98 end | |
| 99 local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host}); | |
|
1475
16c8b1a8f6a7
mod_presence: Changed handle_normal_presence to use a local roster rather than origin's roster
Waqas Hussain <waqas20@gmail.com>
parents:
1474
diff
changeset
|
100 for jid, item in pairs(roster) do -- resend outgoing subscription requests |
| 1009 | 101 if item.ask then |
| 102 request.attr.to = jid; | |
| 103 core_route_stanza(origin, request); | |
| 104 end | |
| 105 end | |
| 106 local offline = offlinemanager.load(node, host); | |
| 107 if offline then | |
| 108 for _, msg in ipairs(offline) do | |
| 109 origin.send(msg); -- FIXME do we need to modify to/from in any way? | |
| 110 end | |
| 111 offlinemanager.deleteAll(node, host); | |
| 112 end | |
| 113 end | |
| 114 if stanza.attr.type == "unavailable" then | |
| 115 origin.presence = nil; | |
|
1418
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
116 if origin.priority then |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
117 origin.priority = nil; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
118 recalc_resource_map(origin); |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
119 end |
| 1009 | 120 if origin.directed then |
| 121 for jid in pairs(origin.directed) do | |
| 122 stanza.attr.to = jid; | |
| 123 core_route_stanza(origin, stanza); | |
| 124 end | |
| 125 origin.directed = nil; | |
| 126 end | |
| 127 else | |
| 128 origin.presence = stanza; | |
| 129 local priority = stanza:child_with_name("priority"); | |
| 130 if priority and #priority > 0 then | |
| 131 priority = t_concat(priority); | |
| 132 if s_find(priority, "^[+-]?[0-9]+$") then | |
| 133 priority = tonumber(priority); | |
| 134 if priority < -128 then priority = -128 end | |
| 135 if priority > 127 then priority = 127 end | |
|
1418
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
136 else priority = 0; end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
137 else priority = 0; end |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
138 if origin.priority ~= priority then |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
139 origin.priority = priority; |
|
d14de6cb8b5b
mod_message, mod_presence: Maintain list of top resources. Less work in routing messages to bare JIDs. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1287
diff
changeset
|
140 recalc_resource_map(origin); |
| 1009 | 141 end |
| 142 end | |
| 143 stanza.attr.to = nil; -- reset it | |
| 144 else | |
|
1211
d60e68855176
mod_presence: Lower some log levels to their correct values
Matthew Wild <mwild1@gmail.com>
parents:
1210
diff
changeset
|
145 log("warn", "presence recieved from client with no roster"); |
| 1009 | 146 end |
| 147 end | |
| 148 | |
| 149 function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza) | |
| 150 local h = hosts[host]; | |
| 151 local count = 0; | |
| 152 if h and h.type == "local" then | |
| 153 local u = h.sessions[user]; | |
| 154 if u then | |
| 155 for k, session in pairs(u.sessions) do | |
| 156 local pres = session.presence; | |
| 157 if pres then | |
| 158 pres.attr.to = jid; | |
| 159 core_route_stanza(session, pres); | |
| 160 pres.attr.to = nil; | |
| 161 count = count + 1; | |
| 162 end | |
| 163 end | |
| 164 end | |
| 165 end | |
|
1211
d60e68855176
mod_presence: Lower some log levels to their correct values
Matthew Wild <mwild1@gmail.com>
parents:
1210
diff
changeset
|
166 log("debug", "broadcasted presence of "..count.." resources from "..user.."@"..host.." to "..jid); |
| 1009 | 167 return count; |
| 168 end | |
| 169 | |
| 170 function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) | |
| 171 local node, host = jid_split(from_bare); | |
| 172 local st_from, st_to = stanza.attr.from, stanza.attr.to; | |
| 173 stanza.attr.from, stanza.attr.to = from_bare, to_bare; | |
| 174 log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); | |
| 175 if stanza.attr.type == "subscribe" then | |
| 176 -- 1. route stanza | |
| 177 -- 2. roster push (subscription = none, ask = subscribe) | |
| 178 if rostermanager.set_contact_pending_out(node, host, to_bare) then | |
| 179 rostermanager.roster_push(node, host, to_bare); | |
| 180 end -- else file error | |
| 181 core_route_stanza(origin, stanza); | |
| 182 elseif stanza.attr.type == "unsubscribe" then | |
| 183 -- 1. route stanza | |
| 184 -- 2. roster push (subscription = none or from) | |
| 185 if rostermanager.unsubscribe(node, host, to_bare) then | |
| 186 rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed? | |
| 187 end -- else file error | |
| 188 core_route_stanza(origin, stanza); | |
| 189 elseif stanza.attr.type == "subscribed" then | |
| 190 -- 1. route stanza | |
| 191 -- 2. roster_push () | |
| 192 -- 3. send_presence_of_available_resources | |
| 193 if rostermanager.subscribed(node, host, to_bare) then | |
| 194 rostermanager.roster_push(node, host, to_bare); | |
| 195 end | |
| 196 core_route_stanza(origin, stanza); | |
| 197 send_presence_of_available_resources(node, host, to_bare, origin, core_route_stanza); | |
| 198 elseif stanza.attr.type == "unsubscribed" then | |
| 199 -- 1. route stanza | |
| 200 -- 2. roster push (subscription = none or to) | |
| 201 if rostermanager.unsubscribed(node, host, to_bare) then | |
| 202 rostermanager.roster_push(node, host, to_bare); | |
| 203 end | |
| 204 core_route_stanza(origin, stanza); | |
| 205 end | |
| 206 stanza.attr.from, stanza.attr.to = st_from, st_to; | |
| 207 end | |
| 208 | |
| 209 function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) | |
| 210 local node, host = jid_split(to_bare); | |
| 211 local st_from, st_to = stanza.attr.from, stanza.attr.to; | |
| 212 stanza.attr.from, stanza.attr.to = from_bare, to_bare; | |
| 213 log("debug", "inbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); | |
| 214 if stanza.attr.type == "probe" then | |
| 215 if rostermanager.is_contact_subscribed(node, host, from_bare) then | |
| 216 if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) then | |
| 217 -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) | |
| 218 end | |
| 219 else | |
| 220 core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"})); | |
| 221 end | |
| 222 elseif stanza.attr.type == "subscribe" then | |
| 223 if rostermanager.is_contact_subscribed(node, host, from_bare) then | |
| 224 core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed | |
| 225 -- Sending presence is not clearly stated in the RFC, but it seems appropriate | |
| 226 if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) then | |
| 227 -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) | |
| 228 end | |
| 229 else | |
| 230 if not rostermanager.is_contact_pending_in(node, host, from_bare) then | |
| 231 if rostermanager.set_contact_pending_in(node, host, from_bare) then | |
| 232 sessionmanager.send_to_available_resources(node, host, stanza); | |
| 233 end -- TODO else return error, unable to save | |
| 234 end | |
| 235 end | |
| 236 elseif stanza.attr.type == "unsubscribe" then | |
| 237 if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then | |
| 238 rostermanager.roster_push(node, host, from_bare); | |
| 239 end | |
| 240 elseif stanza.attr.type == "subscribed" then | |
| 241 if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then | |
| 242 rostermanager.roster_push(node, host, from_bare); | |
| 243 end | |
| 244 elseif stanza.attr.type == "unsubscribed" then | |
| 245 if rostermanager.process_inbound_subscription_cancellation(node, host, from_bare) then | |
| 246 rostermanager.roster_push(node, host, from_bare); | |
| 247 end | |
| 248 end -- discard any other type | |
| 249 stanza.attr.from, stanza.attr.to = st_from, st_to; | |
| 250 end | |
| 251 | |
|
1279
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
252 local outbound_presence_handler = function(data) |
|
1282
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
253 -- outbound presence recieved |
|
1276
d0e80c1578e1
mod_presence: Handle outbound presence to full JIDs
Waqas Hussain <waqas20@gmail.com>
parents:
1245
diff
changeset
|
254 local origin, stanza = data.origin, data.stanza; |
|
d0e80c1578e1
mod_presence: Handle outbound presence to full JIDs
Waqas Hussain <waqas20@gmail.com>
parents:
1245
diff
changeset
|
255 |
|
1286
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
256 local to = stanza.attr.to; |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
257 if to then |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
258 local t = stanza.attr.type; |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
259 if t ~= nil and t ~= "unavailable" and t ~= "error" then -- check for subscriptions and probes |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
260 handle_outbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
261 return true; |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
262 end |
|
1278
2abf85791f29
mod_presence: A little cleanup
Waqas Hussain <waqas20@gmail.com>
parents:
1277
diff
changeset
|
263 |
|
1286
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
264 local to_bare = jid_bare(to); |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
265 if not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then -- directed presence |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
266 origin.directed = origin.directed or {}; |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
267 if t then -- removing from directed presence list on sending an error or unavailable |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
268 origin.directed[to] = nil; -- FIXME does it make more sense to add to_bare rather than to? |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
269 else |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
270 origin.directed[to] = true; -- FIXME does it make more sense to add to_bare rather than to? |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
271 end |
|
1277
f2b50efe8d44
mod_presence: Remove JIDs from directed presence list on sending error or unavailable presence
Waqas Hussain <waqas20@gmail.com>
parents:
1276
diff
changeset
|
272 end |
|
1286
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
273 end -- TODO maybe handle normal presence here, instead of letting it pass to incoming handlers? |
|
1279
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
274 end |
|
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
275 |
|
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
276 module:hook("pre-presence/full", outbound_presence_handler); |
|
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
277 module:hook("pre-presence/bare", outbound_presence_handler); |
|
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
278 module:hook("pre-presence/host", outbound_presence_handler); |
|
1281
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
279 |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
280 module:hook("presence/bare", function(data) |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
281 -- inbound presence to bare JID recieved |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
282 local origin, stanza = data.origin, data.stanza; |
|
1282
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
283 |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
284 local to = stanza.attr.to; |
|
1287
ac82c7b9c76b
mod_presence: Fix a global access
Waqas Hussain <waqas20@gmail.com>
parents:
1286
diff
changeset
|
285 local t = stanza.attr.type; |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
286 if to then |
|
1285
0a6e2d6ae459
mod_presence: Check for nil 'to' attribute in all cases for incoming stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1284
diff
changeset
|
287 if t ~= nil and t ~= "unavailable" and t ~= "error" then -- check for subscriptions and probes sent to bare JID |
|
0a6e2d6ae459
mod_presence: Check for nil 'to' attribute in all cases for incoming stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1284
diff
changeset
|
288 handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); |
|
0a6e2d6ae459
mod_presence: Check for nil 'to' attribute in all cases for incoming stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1284
diff
changeset
|
289 return true; |
|
0a6e2d6ae459
mod_presence: Check for nil 'to' attribute in all cases for incoming stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1284
diff
changeset
|
290 end |
|
0a6e2d6ae459
mod_presence: Check for nil 'to' attribute in all cases for incoming stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1284
diff
changeset
|
291 |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
292 local user = bare_sessions[to]; |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
293 if user then |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
294 for _, session in pairs(user.sessions) do |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
295 if session.presence then -- only send to available resources |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
296 session.send(stanza); |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
297 end |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
298 end |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
299 end -- no resources not online, discard |
|
1285
0a6e2d6ae459
mod_presence: Check for nil 'to' attribute in all cases for incoming stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1284
diff
changeset
|
300 elseif not t or t == "unavailable" then |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
301 handle_normal_presence(origin, stanza, core_route_stanza); |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
302 end |
|
1284
c0fb8379696e
mod_presence: return true from incoming presence handlers to prevent further processing
Waqas Hussain <waqas20@gmail.com>
parents:
1283
diff
changeset
|
303 return true; |
|
1281
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
304 end); |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
305 module:hook("presence/full", function(data) |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
306 -- inbound presence to full JID recieved |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
307 local origin, stanza = data.origin, data.stanza; |
|
1282
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
308 |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
309 local t = stanza.attr.type; |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
310 if t ~= nil and t ~= "unavailable" and t ~= "error" then -- check for subscriptions and probes sent to full JID |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
311 handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
312 return true; |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
313 end |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
314 |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
315 local session = full_sessions[stanza.attr.to]; |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
316 if session then |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
317 -- TODO fire post processing event |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
318 session.send(stanza); |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
319 end -- resource not online, discard |
|
1284
c0fb8379696e
mod_presence: return true from incoming presence handlers to prevent further processing
Waqas Hussain <waqas20@gmail.com>
parents:
1283
diff
changeset
|
320 return true; |
|
1281
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
321 end); |
