Mercurial > prosody-hg
annotate plugins/mod_presence.lua @ 1474:6947761fd531
mod_presence: Simplified roster iteration
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sun, 05 Jul 2009 12:17:22 +0500 |
| parents | d2211cbb822f |
| children | 16c8b1a8f6a7 |
| 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) |
| 64 if origin.roster then | |
|
1474
6947761fd531
mod_presence: Simplified roster iteration
Waqas Hussain <waqas20@gmail.com>
parents:
1473
diff
changeset
|
65 for jid, item in pairs(origin.roster) do -- broadcast to all interested contacts |
|
6947761fd531
mod_presence: Simplified roster iteration
Waqas Hussain <waqas20@gmail.com>
parents:
1473
diff
changeset
|
66 if item.subscription == "both" or item.subscription == "from" then |
| 1009 | 67 stanza.attr.to = jid; |
| 68 core_route_stanza(origin, stanza); | |
| 69 end | |
| 70 end | |
|
1473
d2211cbb822f
mod_presence: Eliminated a jid_split
Waqas Hussain <waqas20@gmail.com>
parents:
1472
diff
changeset
|
71 local node, host = origin.username, origin.host; |
| 1009 | 72 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
|
73 if res ~= origin and res.presence then -- to resource |
| 1009 | 74 stanza.attr.to = res.full_jid; |
| 75 core_route_stanza(origin, stanza); | |
| 76 end | |
| 77 end | |
| 78 if stanza.attr.type == nil and not origin.presence then -- initial presence | |
| 79 local probe = st.presence({from = origin.full_jid, type = "probe"}); | |
|
1474
6947761fd531
mod_presence: Simplified roster iteration
Waqas Hussain <waqas20@gmail.com>
parents:
1473
diff
changeset
|
80 for jid, item in pairs(origin.roster) do -- probe all contacts we are subscribed to |
|
6947761fd531
mod_presence: Simplified roster iteration
Waqas Hussain <waqas20@gmail.com>
parents:
1473
diff
changeset
|
81 if item.subscription == "both" or item.subscription == "to" then |
| 1009 | 82 probe.attr.to = jid; |
| 83 core_route_stanza(origin, probe); | |
| 84 end | |
| 85 end | |
| 86 for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all available resources | |
| 87 if res ~= origin and res.presence then | |
| 88 res.presence.attr.to = origin.full_jid; | |
| 89 core_route_stanza(res, res.presence); | |
| 90 res.presence.attr.to = nil; | |
| 91 end | |
| 92 end | |
| 93 if origin.roster.pending then -- resend incoming subscription requests | |
| 94 for jid in pairs(origin.roster.pending) do | |
| 95 origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? | |
| 96 end | |
| 97 end | |
| 98 local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host}); | |
| 99 for jid, item in pairs(origin.roster) do -- resend outgoing subscription requests | |
| 100 if item.ask then | |
| 101 request.attr.to = jid; | |
| 102 core_route_stanza(origin, request); | |
| 103 end | |
| 104 end | |
| 105 local offline = offlinemanager.load(node, host); | |
| 106 if offline then | |
| 107 for _, msg in ipairs(offline) do | |
| 108 origin.send(msg); -- FIXME do we need to modify to/from in any way? | |
| 109 end | |
| 110 offlinemanager.deleteAll(node, host); | |
| 111 end | |
| 112 end | |
| 113 if stanza.attr.type == "unavailable" then | |
| 114 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
|
115 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
|
116 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
|
117 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
|
118 end |
| 1009 | 119 if origin.directed then |
| 120 for jid in pairs(origin.directed) do | |
| 121 stanza.attr.to = jid; | |
| 122 core_route_stanza(origin, stanza); | |
| 123 end | |
| 124 origin.directed = nil; | |
| 125 end | |
| 126 else | |
| 127 origin.presence = stanza; | |
| 128 local priority = stanza:child_with_name("priority"); | |
| 129 if priority and #priority > 0 then | |
| 130 priority = t_concat(priority); | |
| 131 if s_find(priority, "^[+-]?[0-9]+$") then | |
| 132 priority = tonumber(priority); | |
| 133 if priority < -128 then priority = -128 end | |
| 134 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
|
135 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
|
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 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
|
138 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
|
139 recalc_resource_map(origin); |
| 1009 | 140 end |
| 141 end | |
| 142 stanza.attr.to = nil; -- reset it | |
| 143 else | |
|
1211
d60e68855176
mod_presence: Lower some log levels to their correct values
Matthew Wild <mwild1@gmail.com>
parents:
1210
diff
changeset
|
144 log("warn", "presence recieved from client with no roster"); |
| 1009 | 145 end |
| 146 end | |
| 147 | |
| 148 function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza) | |
| 149 local h = hosts[host]; | |
| 150 local count = 0; | |
| 151 if h and h.type == "local" then | |
| 152 local u = h.sessions[user]; | |
| 153 if u then | |
| 154 for k, session in pairs(u.sessions) do | |
| 155 local pres = session.presence; | |
| 156 if pres then | |
| 157 pres.attr.to = jid; | |
| 158 core_route_stanza(session, pres); | |
| 159 pres.attr.to = nil; | |
| 160 count = count + 1; | |
| 161 end | |
| 162 end | |
| 163 end | |
| 164 end | |
|
1211
d60e68855176
mod_presence: Lower some log levels to their correct values
Matthew Wild <mwild1@gmail.com>
parents:
1210
diff
changeset
|
165 log("debug", "broadcasted presence of "..count.." resources from "..user.."@"..host.." to "..jid); |
| 1009 | 166 return count; |
| 167 end | |
| 168 | |
| 169 function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) | |
| 170 local node, host = jid_split(from_bare); | |
| 171 local st_from, st_to = stanza.attr.from, stanza.attr.to; | |
| 172 stanza.attr.from, stanza.attr.to = from_bare, to_bare; | |
| 173 log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); | |
| 174 if stanza.attr.type == "subscribe" then | |
| 175 -- 1. route stanza | |
| 176 -- 2. roster push (subscription = none, ask = subscribe) | |
| 177 if rostermanager.set_contact_pending_out(node, host, to_bare) then | |
| 178 rostermanager.roster_push(node, host, to_bare); | |
| 179 end -- else file error | |
| 180 core_route_stanza(origin, stanza); | |
| 181 elseif stanza.attr.type == "unsubscribe" then | |
| 182 -- 1. route stanza | |
| 183 -- 2. roster push (subscription = none or from) | |
| 184 if rostermanager.unsubscribe(node, host, to_bare) then | |
| 185 rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed? | |
| 186 end -- else file error | |
| 187 core_route_stanza(origin, stanza); | |
| 188 elseif stanza.attr.type == "subscribed" then | |
| 189 -- 1. route stanza | |
| 190 -- 2. roster_push () | |
| 191 -- 3. send_presence_of_available_resources | |
| 192 if rostermanager.subscribed(node, host, to_bare) then | |
| 193 rostermanager.roster_push(node, host, to_bare); | |
| 194 end | |
| 195 core_route_stanza(origin, stanza); | |
| 196 send_presence_of_available_resources(node, host, to_bare, origin, core_route_stanza); | |
| 197 elseif stanza.attr.type == "unsubscribed" then | |
| 198 -- 1. route stanza | |
| 199 -- 2. roster push (subscription = none or to) | |
| 200 if rostermanager.unsubscribed(node, host, to_bare) then | |
| 201 rostermanager.roster_push(node, host, to_bare); | |
| 202 end | |
| 203 core_route_stanza(origin, stanza); | |
| 204 end | |
| 205 stanza.attr.from, stanza.attr.to = st_from, st_to; | |
| 206 end | |
| 207 | |
| 208 function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) | |
| 209 local node, host = jid_split(to_bare); | |
| 210 local st_from, st_to = stanza.attr.from, stanza.attr.to; | |
| 211 stanza.attr.from, stanza.attr.to = from_bare, to_bare; | |
| 212 log("debug", "inbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); | |
| 213 if stanza.attr.type == "probe" then | |
| 214 if rostermanager.is_contact_subscribed(node, host, from_bare) then | |
| 215 if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) then | |
| 216 -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) | |
| 217 end | |
| 218 else | |
| 219 core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"})); | |
| 220 end | |
| 221 elseif stanza.attr.type == "subscribe" then | |
| 222 if rostermanager.is_contact_subscribed(node, host, from_bare) then | |
| 223 core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed | |
| 224 -- Sending presence is not clearly stated in the RFC, but it seems appropriate | |
| 225 if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) then | |
| 226 -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) | |
| 227 end | |
| 228 else | |
| 229 if not rostermanager.is_contact_pending_in(node, host, from_bare) then | |
| 230 if rostermanager.set_contact_pending_in(node, host, from_bare) then | |
| 231 sessionmanager.send_to_available_resources(node, host, stanza); | |
| 232 end -- TODO else return error, unable to save | |
| 233 end | |
| 234 end | |
| 235 elseif stanza.attr.type == "unsubscribe" then | |
| 236 if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then | |
| 237 rostermanager.roster_push(node, host, from_bare); | |
| 238 end | |
| 239 elseif stanza.attr.type == "subscribed" then | |
| 240 if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then | |
| 241 rostermanager.roster_push(node, host, from_bare); | |
| 242 end | |
| 243 elseif stanza.attr.type == "unsubscribed" then | |
| 244 if rostermanager.process_inbound_subscription_cancellation(node, host, from_bare) then | |
| 245 rostermanager.roster_push(node, host, from_bare); | |
| 246 end | |
| 247 end -- discard any other type | |
| 248 stanza.attr.from, stanza.attr.to = st_from, st_to; | |
| 249 end | |
| 250 | |
|
1279
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
251 local outbound_presence_handler = function(data) |
|
1282
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
252 -- outbound presence recieved |
|
1276
d0e80c1578e1
mod_presence: Handle outbound presence to full JIDs
Waqas Hussain <waqas20@gmail.com>
parents:
1245
diff
changeset
|
253 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
|
254 |
|
1286
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
255 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
|
256 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
|
257 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
|
258 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
|
259 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
|
260 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
|
261 end |
|
1278
2abf85791f29
mod_presence: A little cleanup
Waqas Hussain <waqas20@gmail.com>
parents:
1277
diff
changeset
|
262 |
|
1286
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
263 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
|
264 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
|
265 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
|
266 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
|
267 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
|
268 else |
|
a9b1675ad16e
mod_presence: Check for nil 'to' attribute in all cases for outgoing stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1285
diff
changeset
|
269 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
|
270 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
|
271 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
|
272 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
|
273 end |
|
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
274 |
|
fa00d56a9fd3
mod_presence: Handle all outbound presence stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1278
diff
changeset
|
275 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
|
276 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
|
277 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
|
278 |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
279 module:hook("presence/bare", function(data) |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
280 -- inbound presence to bare JID recieved |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
281 local origin, stanza = data.origin, data.stanza; |
|
1282
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
282 |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
283 local to = stanza.attr.to; |
|
1287
ac82c7b9c76b
mod_presence: Fix a global access
Waqas Hussain <waqas20@gmail.com>
parents:
1286
diff
changeset
|
284 local t = stanza.attr.type; |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
285 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
|
286 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
|
287 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
|
288 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
|
289 end |
|
0a6e2d6ae459
mod_presence: Check for nil 'to' attribute in all cases for incoming stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1284
diff
changeset
|
290 |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
291 local user = bare_sessions[to]; |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
292 if user then |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
293 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
|
294 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
|
295 session.send(stanza); |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
296 end |
|
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 -- 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
|
299 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
|
300 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
|
301 end |
|
1284
c0fb8379696e
mod_presence: return true from incoming presence handlers to prevent further processing
Waqas Hussain <waqas20@gmail.com>
parents:
1283
diff
changeset
|
302 return true; |
|
1281
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
303 end); |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
304 module:hook("presence/full", function(data) |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
305 -- inbound presence to full JID recieved |
|
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
306 local origin, stanza = data.origin, data.stanza; |
|
1282
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
307 |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
308 local t = stanza.attr.type; |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
309 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
|
310 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
|
311 return true; |
|
ff58ef687a3f
mod_presence: Handle subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1281
diff
changeset
|
312 end |
|
1283
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
313 |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
314 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
|
315 if session then |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
316 -- TODO fire post processing event |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
317 session.send(stanza); |
|
2e57f2176612
mod_presence: Handle non-subscription presence and routing
Waqas Hussain <waqas20@gmail.com>
parents:
1282
diff
changeset
|
318 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
|
319 return true; |
|
1281
bc65d57c76ef
mod_presence: Add hooks for inbound presence
Waqas Hussain <waqas20@gmail.com>
parents:
1280
diff
changeset
|
320 end); |