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