Sun, 12 Dec 2010 17:18:16 +0500
prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable.
1522
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1461
diff
changeset
|
1 | -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2329
diff
changeset
|
2 | -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2329
diff
changeset
|
3 | -- Copyright (C) 2008-2010 Waqas Hussain |
1522
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1461
diff
changeset
|
4 | -- |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1461
diff
changeset
|
5 | -- This project is MIT/X11 licensed. Please see the |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1461
diff
changeset
|
6 | -- COPYING file in the source package for more information. |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1461
diff
changeset
|
7 | -- |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1461
diff
changeset
|
8 | |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
9 | |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
10 | local jid_bare = require "util.jid".bare; |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
11 | local jid_split = require "util.jid".split; |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
12 | local st = require "util.stanza"; |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
13 | local hosts = hosts; |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
14 | local user_exists = require "core.usermanager".user_exists; |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
15 | local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed; |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
16 | local pairs, ipairs = pairs, ipairs; |
1401
a3ce55c1e43a
mod_pep: Remove data when a user disables a node
Waqas Hussain <waqas20@gmail.com>
parents:
1400
diff
changeset
|
17 | local next = next; |
1437
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
18 | local type = type; |
3344 | 19 | local calculate_hash = require "util.caps".calculate_hash; |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
20 | |
1430
39169cf8d36f
mod_pep: Broadcast only to available recipients with caps
Waqas Hussain <waqas20@gmail.com>
parents:
1429
diff
changeset
|
21 | local NULL = {}; |
1323
e1bfe7816761
mod_pep: Maintain user nodes for delayed delivery
Waqas Hussain <waqas20@gmail.com>
parents:
1136
diff
changeset
|
22 | local data = {}; |
1325
b58645973d7d
mod_pep: Send items to contacts coming online
Waqas Hussain <waqas20@gmail.com>
parents:
1324
diff
changeset
|
23 | local recipients = {}; |
1437
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
24 | local hash_map = {}; |
1323
e1bfe7816761
mod_pep: Maintain user nodes for delayed delivery
Waqas Hussain <waqas20@gmail.com>
parents:
1136
diff
changeset
|
25 | |
2045
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
26 | module.save = function() |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
27 | return { data = data, recipients = recipients, hash_map = hash_map }; |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
28 | end |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
29 | module.restore = function(state) |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
30 | data = state.data or {}; |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
31 | recipients = state.recipients or {}; |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
32 | hash_map = state.hash_map or {}; |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
33 | end |
3b7473a3fa44
PEP: Better reload support.
Waqas Hussain <waqas20@gmail.com>
parents:
2044
diff
changeset
|
34 | |
1696
2afc87ccc379
mod_pep: Added name 'Prosody' to the pubsub/pep identity
Waqas Hussain <waqas20@gmail.com>
parents:
1625
diff
changeset
|
35 | module:add_identity("pubsub", "pep", "Prosody"); |
1338
0bfc8d866479
mod_pep: Add pubsub#publsih disco feature to host
Waqas Hussain <waqas20@gmail.com>
parents:
1335
diff
changeset
|
36 | module:add_feature("http://jabber.org/protocol/pubsub#publish"); |
1335
7c71783b40cf
mod_pep: Add host identity pubsub/pep
Waqas Hussain <waqas20@gmail.com>
parents:
1332
diff
changeset
|
37 | |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
38 | local function subscription_presence(user_bare, recipient) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
39 | local recipient_bare = jid_bare(recipient); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
40 | if (recipient_bare == user_bare) then return true end |
3130
80e630e60f06
mod_pep: Use is_contact_subscribed (which uses the new rostermanager fix to avoid unnecessary roster loads)
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
41 | local username, host = jid_split(user_bare); |
80e630e60f06
mod_pep: Use is_contact_subscribed (which uses the new rostermanager fix to avoid unnecessary roster loads)
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
42 | return is_contact_subscribed(username, host, recipient_bare); |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
43 | end |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
44 | |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
45 | local function publish(session, node, id, item) |
2041
8cf9b978ab36
PEP: Fixed namespace for the <item> element in PEP broadcasts.
Waqas Hussain <waqas20@gmail.com>
parents:
1696
diff
changeset
|
46 | item.attr.xmlns = nil; |
2328
814eaba0c777
mod_pep: Allow storage of urn:xmpp:avatar:data node (payload only with base64 data)
Paul Aurich <paul@darkrain42.org>
parents:
2045
diff
changeset
|
47 | local disable = #item.tags ~= 1 or #item.tags[1] == 0; |
1619
ae3250783db2
mod_pep: Added support for pubsub item retraction
Waqas Hussain <waqas20@gmail.com>
parents:
1522
diff
changeset
|
48 | if #item.tags == 0 then item.name = "retract"; end |
1402
34723bbd5acb
mod_pep: Broadcast from the user's bare JID, not full JID
Waqas Hussain <waqas20@gmail.com>
parents:
1401
diff
changeset
|
49 | local bare = session.username..'@'..session.host; |
34723bbd5acb
mod_pep: Broadcast from the user's bare JID, not full JID
Waqas Hussain <waqas20@gmail.com>
parents:
1401
diff
changeset
|
50 | local stanza = st.message({from=bare, type='headline'}) |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
51 | :tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'}) |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
52 | :tag('items', {node=node}) |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
53 | :add_child(item) |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
54 | :up() |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
55 | :up(); |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
56 | |
1323
e1bfe7816761
mod_pep: Maintain user nodes for delayed delivery
Waqas Hussain <waqas20@gmail.com>
parents:
1136
diff
changeset
|
57 | -- store for the future |
e1bfe7816761
mod_pep: Maintain user nodes for delayed delivery
Waqas Hussain <waqas20@gmail.com>
parents:
1136
diff
changeset
|
58 | local user_data = data[bare]; |
1401
a3ce55c1e43a
mod_pep: Remove data when a user disables a node
Waqas Hussain <waqas20@gmail.com>
parents:
1400
diff
changeset
|
59 | if disable then |
1440
d3117a6ad1bf
mod_pep: Fixed a nil access error
Waqas Hussain <waqas20@gmail.com>
parents:
1439
diff
changeset
|
60 | if user_data then |
d3117a6ad1bf
mod_pep: Fixed a nil access error
Waqas Hussain <waqas20@gmail.com>
parents:
1439
diff
changeset
|
61 | user_data[node] = nil; |
d3117a6ad1bf
mod_pep: Fixed a nil access error
Waqas Hussain <waqas20@gmail.com>
parents:
1439
diff
changeset
|
62 | if not next(user_data) then data[bare] = nil; end |
d3117a6ad1bf
mod_pep: Fixed a nil access error
Waqas Hussain <waqas20@gmail.com>
parents:
1439
diff
changeset
|
63 | end |
1401
a3ce55c1e43a
mod_pep: Remove data when a user disables a node
Waqas Hussain <waqas20@gmail.com>
parents:
1400
diff
changeset
|
64 | else |
a3ce55c1e43a
mod_pep: Remove data when a user disables a node
Waqas Hussain <waqas20@gmail.com>
parents:
1400
diff
changeset
|
65 | if not user_data then user_data = {}; data[bare] = user_data; end |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
66 | user_data[node] = {id or "1", item}; |
1401
a3ce55c1e43a
mod_pep: Remove data when a user disables a node
Waqas Hussain <waqas20@gmail.com>
parents:
1400
diff
changeset
|
67 | end |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
68 | |
1430
39169cf8d36f
mod_pep: Broadcast only to available recipients with caps
Waqas Hussain <waqas20@gmail.com>
parents:
1429
diff
changeset
|
69 | -- broadcast |
1437
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
70 | for recipient, notify in pairs(recipients[bare] or NULL) do |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
71 | if notify[node] then |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
72 | stanza.attr.to = recipient; |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
73 | core_post_stanza(session, stanza); |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
74 | end |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
75 | end |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
76 | end |
1439
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
77 | local function publish_all(user, recipient, session) |
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
78 | local d = data[user]; |
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
79 | local notify = recipients[user] and recipients[user][recipient]; |
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
80 | if d and notify then |
1451
cc0aa9470775
mod_pep: Fixed boolean indexing error while casting all messages for a user
Waqas Hussain <waqas20@gmail.com>
parents:
1440
diff
changeset
|
81 | for node in pairs(notify) do |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
82 | if d[node] then |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
83 | local id, item = unpack(d[node]); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
84 | session.send(st.message({from=user, to=recipient, type='headline'}) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
85 | :tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'}) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
86 | :tag('items', {node=node}) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
87 | :add_child(item) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
88 | :up() |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
89 | :up()); |
1439
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
90 | end |
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
91 | end |
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
92 | end |
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
93 | end |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
94 | |
1428
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
95 | local function get_caps_hash_from_presence(stanza, current) |
1429
51cfb152cb38
mod_pep: Ignore presence subscriptions when extractng hash information
Waqas Hussain <waqas20@gmail.com>
parents:
1428
diff
changeset
|
96 | local t = stanza.attr.type; |
51cfb152cb38
mod_pep: Ignore presence subscriptions when extractng hash information
Waqas Hussain <waqas20@gmail.com>
parents:
1428
diff
changeset
|
97 | if not t then |
1428
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
98 | for _, child in pairs(stanza.tags) do |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
99 | if child.name == "c" and child.attr.xmlns == "http://jabber.org/protocol/caps" then |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
100 | local attr = child.attr; |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
101 | if attr.hash then -- new caps |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
102 | if attr.hash == 'sha-1' and attr.node and attr.ver then return attr.ver, attr.node.."#"..attr.ver; end |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
103 | else -- legacy caps |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
104 | if attr.node and attr.ver then return attr.node.."#"..attr.ver.."#"..(attr.ext or ""), attr.node.."#"..attr.ver; end |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
105 | end |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
106 | return; -- bad caps format |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
107 | end |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
108 | end |
1429
51cfb152cb38
mod_pep: Ignore presence subscriptions when extractng hash information
Waqas Hussain <waqas20@gmail.com>
parents:
1428
diff
changeset
|
109 | elseif t == "unavailable" or t == "error" then |
51cfb152cb38
mod_pep: Ignore presence subscriptions when extractng hash information
Waqas Hussain <waqas20@gmail.com>
parents:
1428
diff
changeset
|
110 | return; |
1428
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
111 | end |
1429
51cfb152cb38
mod_pep: Ignore presence subscriptions when extractng hash information
Waqas Hussain <waqas20@gmail.com>
parents:
1428
diff
changeset
|
112 | return current; -- no caps, could mean caps optimization, so return current |
1428
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
113 | end |
02e97e716675
mod_pep: Added function get_caps_hash_from_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1425
diff
changeset
|
114 | |
1399
8879f8278762
mod_pep: Fixed detection of contact presence changes
Waqas Hussain <waqas20@gmail.com>
parents:
1338
diff
changeset
|
115 | module:hook("presence/bare", function(event) |
1325
b58645973d7d
mod_pep: Send items to contacts coming online
Waqas Hussain <waqas20@gmail.com>
parents:
1324
diff
changeset
|
116 | -- inbound presence to bare JID recieved |
1399
8879f8278762
mod_pep: Fixed detection of contact presence changes
Waqas Hussain <waqas20@gmail.com>
parents:
1338
diff
changeset
|
117 | local origin, stanza = event.origin, event.stanza; |
1325
b58645973d7d
mod_pep: Send items to contacts coming online
Waqas Hussain <waqas20@gmail.com>
parents:
1324
diff
changeset
|
118 | local user = stanza.attr.to or (origin.username..'@'..origin.host); |
3132
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
119 | local t = stanza.attr.type; |
3664
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
120 | local self = not stanza.attr.to; |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
121 | |
3132
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
122 | if not t then -- available presence |
3664
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
123 | if self or subscription_presence(user, stanza.attr.from) then |
3132
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
124 | local recipient = stanza.attr.from; |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
125 | local current = recipients[user] and recipients[user][recipient]; |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
126 | local hash = get_caps_hash_from_presence(stanza, current); |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
127 | if current == hash then return; end |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
128 | if not hash then |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
129 | if recipients[user] then recipients[user][recipient] = nil; end |
1439
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
130 | else |
3132
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
131 | recipients[user] = recipients[user] or {}; |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
132 | if hash_map[hash] then |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
133 | recipients[user][recipient] = hash_map[hash]; |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
134 | publish_all(user, recipient, origin); |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
135 | else |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
136 | recipients[user][recipient] = hash; |
3738
ae2ac97b23b1
mod_pep: Fixed a traceback when non-local users send presence.
Waqas Hussain <waqas20@gmail.com>
parents:
3737
diff
changeset
|
137 | local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host; |
3737
659563b1db89
mod_pep: Handle the case where local contacts send directed presence with caps hash.
Waqas Hussain <waqas20@gmail.com>
parents:
3668
diff
changeset
|
138 | if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then |
3664
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
139 | origin.send( |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
140 | st.stanza("iq", {from=stanza.attr.to, to=stanza.attr.from, id="disco", type="get"}) |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
141 | :query("http://jabber.org/protocol/disco#info") |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
142 | ); |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
143 | end |
3132
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
144 | end |
1439
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
145 | end |
1325
b58645973d7d
mod_pep: Send items to contacts coming online
Waqas Hussain <waqas20@gmail.com>
parents:
1324
diff
changeset
|
146 | end |
3132
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
147 | elseif t == "unavailable" then |
4d2251242ac1
mod_pep: Corrected and optimized handling of non-available presence stanzas.
Waqas Hussain <waqas20@gmail.com>
parents:
3130
diff
changeset
|
148 | if recipients[user] then recipients[user][stanza.attr.from] = nil; end |
3668
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
149 | elseif not self and t == "unsubscribe" then |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
150 | local from = jid_bare(stanza.attr.from); |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
151 | local subscriptions = recipients[user]; |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
152 | if subscriptions then |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
153 | for subscriber in pairs(subscriptions) do |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
154 | if jid_bare(subscriber) == from then |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
155 | recipients[user][subscriber] = nil; |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
156 | end |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
157 | end |
29a340777d7b
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain <waqas20@gmail.com>
parents:
3667
diff
changeset
|
158 | end |
1325
b58645973d7d
mod_pep: Send items to contacts coming online
Waqas Hussain <waqas20@gmail.com>
parents:
1324
diff
changeset
|
159 | end |
1327
20285e9d71ee
mod_pep: Give the presence handler a higher than default priority
Waqas Hussain <waqas20@gmail.com>
parents:
1325
diff
changeset
|
160 | end, 10); |
1325
b58645973d7d
mod_pep: Send items to contacts coming online
Waqas Hussain <waqas20@gmail.com>
parents:
1324
diff
changeset
|
161 | |
1404
12abd2da8885
mod_pep: Use new style events
Waqas Hussain <waqas20@gmail.com>
parents:
1402
diff
changeset
|
162 | module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event) |
12abd2da8885
mod_pep: Use new style events
Waqas Hussain <waqas20@gmail.com>
parents:
1402
diff
changeset
|
163 | local session, stanza = event.origin, event.stanza; |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
164 | local payload = stanza.tags[1]; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
165 | |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
166 | if stanza.attr.type == 'set' and (not stanza.attr.to or jid_bare(stanza.attr.from) == stanza.attr.to) then |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
167 | payload = payload.tags[1]; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
168 | if payload and (payload.name == 'publish' or payload.name == 'retract') and payload.attr.node then -- <publish node='http://jabber.org/protocol/tune'> |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
169 | local node = payload.attr.node; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
170 | payload = payload.tags[1]; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
171 | if payload and payload.name == "item" then -- <item> |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
172 | local id = payload.attr.id; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
173 | session.send(st.reply(stanza)); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
174 | publish(session, node, id, st.clone(payload)); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
175 | return true; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
176 | end |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
177 | end |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
178 | elseif stanza.attr.type == 'get' then |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
179 | local user = stanza.attr.to and jid_bare(stanza.attr.to) or session.username..'@'..session.host; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
180 | if subscription_presence(user, stanza.attr.from) then |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
181 | local user_data = data[user]; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
182 | local node, requested_id; |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
183 | payload = payload.tags[1]; |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
184 | if payload and payload.name == 'items' then |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
185 | node = payload.attr.node; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
186 | local item = payload.tags[1]; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
187 | if item and item.name == "item" then |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
188 | requested_id = item.attr.id; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
189 | end |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
190 | end |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
191 | if node and user_data and user_data[node] then -- Send the last item |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
192 | local id, item = unpack(user_data[node]); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
193 | if not requested_id or id == requested_id then |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
194 | local stanza = st.reply(stanza) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
195 | :tag('pubsub', {xmlns='http://jabber.org/protocol/pubsub'}) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
196 | :tag('items', {node=node}) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
197 | :add_child(item) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
198 | :up() |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
199 | :up(); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
200 | session.send(stanza); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
201 | return true; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
202 | else -- requested item doesn't exist |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
203 | local stanza = st.reply(stanza) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
204 | :tag('pubsub', {xmlns='http://jabber.org/protocol/pubsub'}) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
205 | :tag('items', {node=node}) |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
206 | :up(); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
207 | session.send(stanza); |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
208 | return true; |
1425
8187f72b7425
mod_pep: Removed some YODO comments
Waqas Hussain <waqas20@gmail.com>
parents:
1424
diff
changeset
|
209 | end |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
210 | elseif node then -- node doesn't exist |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
211 | session.send(st.error_reply(stanza, 'cancel', 'item-not-found')); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
212 | return true; |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
213 | else --invalid request |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
214 | session.send(st.error_reply(stanza, 'modify', 'bad-request')); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
215 | return true; |
1425
8187f72b7425
mod_pep: Removed some YODO comments
Waqas Hussain <waqas20@gmail.com>
parents:
1424
diff
changeset
|
216 | end |
2329
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
217 | else --no presence subscription |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
218 | session.send(st.error_reply(stanza, 'auth', 'not-authorized') |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
219 | :tag('presence-subscription-required', {xmlns='http://jabber.org/protocol/pubsub#errors'})); |
5839f303addf
mod_pep: Support item retrieval use cases
Paul Aurich <paul@darkrain42.org>
parents:
2328
diff
changeset
|
220 | return true; |
1136
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
221 | end |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
222 | end |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
223 | end); |
506012db54e8
mod_pep: Initial commit (extremely basic implementation)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
224 | |
3652
c0148fddd81f
mod_pep: Updated disco#info result handler to use new event name format.
Waqas Hussain <waqas20@gmail.com>
parents:
3344
diff
changeset
|
225 | module:hook("iq-result/bare/disco", function(event) |
1424
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
226 | local session, stanza = event.origin, event.stanza; |
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
227 | if stanza.attr.type == "result" then |
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
228 | local disco = stanza.tags[1]; |
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
229 | if disco and disco.name == "query" and disco.attr.xmlns == "http://jabber.org/protocol/disco#info" then |
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
230 | -- Process disco response |
3664
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
231 | local self = not stanza.attr.to; |
1437
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
232 | local user = stanza.attr.to or (session.username..'@'..session.host); |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
233 | local contact = stanza.attr.from; |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
234 | local current = recipients[user] and recipients[user][contact]; |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
235 | if type(current) ~= "string" then return; end -- check if waiting for recipient's response |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
236 | local ver = current; |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
237 | if not string.find(current, "#") then |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
238 | ver = calculate_hash(disco.tags); -- calculate hash |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
239 | end |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
240 | local notify = {}; |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
241 | for _, feature in pairs(disco.tags) do |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
242 | if feature.name == "feature" and feature.attr.var then |
1461
51f0202b0868
mod_pep: Escape + in pattern
Matthew Wild <mwild1@gmail.com>
parents:
1457
diff
changeset
|
243 | local nfeature = feature.attr.var:match("^(.*)%+notify$"); |
1437
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
244 | if nfeature then notify[nfeature] = true; end |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
245 | end |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
246 | end |
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
247 | hash_map[ver] = notify; -- update hash map |
3664
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
248 | if self then |
3666
44c4789d6e17
mod_pep: Fixed a nil access (thanks Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3664
diff
changeset
|
249 | for jid, item in pairs(session.roster) do -- for all interested contacts |
3664
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
250 | if item.subscription == "both" or item.subscription == "from" then |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
251 | if not recipients[jid] then recipients[jid] = {}; end |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
252 | recipients[jid][contact] = notify; |
3667
5c39dce29eaf
mod_pep: Fixed regression where PEP messages were not correctly being broadcasted on caps hash change.
Waqas Hussain <waqas20@gmail.com>
parents:
3666
diff
changeset
|
253 | publish_all(jid, contact, session); |
3664
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
254 | end |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
255 | end |
345cd1e04e80
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain <waqas20@gmail.com>
parents:
3652
diff
changeset
|
256 | end |
3667
5c39dce29eaf
mod_pep: Fixed regression where PEP messages were not correctly being broadcasted on caps hash change.
Waqas Hussain <waqas20@gmail.com>
parents:
3666
diff
changeset
|
257 | recipients[user][contact] = notify; -- set recipient's data to calculated data |
1437
cf2eba9b1716
mod_pep: Entity capabilities
Waqas Hussain <waqas20@gmail.com>
parents:
1430
diff
changeset
|
258 | -- send messages to recipient |
1439
f989608964ec
mod_pep: Use cached caps
Waqas Hussain <waqas20@gmail.com>
parents:
1437
diff
changeset
|
259 | publish_all(user, contact, session); |
1424
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
260 | end |
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
261 | end |
6969ad97ca58
mod_pep: Added handler for disco responses
Waqas Hussain <waqas20@gmail.com>
parents:
1404
diff
changeset
|
262 | end); |
2384
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
263 | |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
264 | module:hook("account-disco-info", function(event) |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
265 | local stanza = event.stanza; |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
266 | stanza:tag('identity', {category='pubsub', type='pep'}):up(); |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
267 | stanza:tag('feature', {var='http://jabber.org/protocol/pubsub#publish'}):up(); |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
268 | end); |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
269 | |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
270 | module:hook("account-disco-items", function(event) |
3290
1eec2bd19bf7
mod_pep: Fixed a possible traceback during disco#items queries on a user's bare JID by remote users.
Waqas Hussain <waqas20@gmail.com>
parents:
3132
diff
changeset
|
271 | local stanza = event.stanza; |
1eec2bd19bf7
mod_pep: Fixed a possible traceback during disco#items queries on a user's bare JID by remote users.
Waqas Hussain <waqas20@gmail.com>
parents:
3132
diff
changeset
|
272 | local bare = stanza.attr.to; |
2384
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
273 | local user_data = data[bare]; |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
274 | |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
275 | if user_data then |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
276 | for node, _ in pairs(user_data) do |
2385 | 277 | stanza:tag('item', {jid=bare, node=node}):up(); -- TODO we need to handle queries to these nodes |
2384
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
278 | end |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
279 | end |
7bec10f26082
mod_pep: Handle service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
2329
diff
changeset
|
280 | end); |