Thu, 15 Jul 2010 21:31:57 +0200
util.dataforms: Capability to set default for list-single
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1355
diff
changeset
|
1 | -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2227
diff
changeset
|
2 | -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2227
diff
changeset
|
3 | -- Copyright (C) 2008-2010 Waqas Hussain |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
4 | -- |
758 | 5 | -- This project is MIT/X11 licensed. Please see the |
6 | -- COPYING file in the source package for more information. | |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
7 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
8 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
9 | |
30 | 10 | |
11 | local st = require "util.stanza" | |
12 | ||
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
13 | local jid_split = require "util.jid".split; |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
14 | local jid_prep = require "util.jid".prep; |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
15 | local t_concat = table.concat; |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
16 | local tostring = tostring; |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
17 | |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
18 | local rm_remove_from_roster = require "core.rostermanager".remove_from_roster; |
110 | 19 | local rm_add_to_roster = require "core.rostermanager".add_to_roster; |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
20 | local rm_roster_push = require "core.rostermanager".roster_push; |
1354
a27eb60a77cd
mod_roster: Using core_post_stanza in place of core.presencemanager.handle_presence
Waqas Hussain <waqas20@gmail.com>
parents:
1200
diff
changeset
|
21 | local core_post_stanza = core_post_stanza; |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
22 | |
541
3521e0851c9e
Change modules to use the new add_feature module API method.
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
23 | module:add_feature("jabber:iq:roster"); |
421
63be85693710
Modules now sending disco replies
Waqas Hussain <waqas20@gmail.com>
parents:
326
diff
changeset
|
24 | |
1133
b293d7dc6a45
mod_roster: Advertize roster versioning support
Waqas Hussain <waqas20@gmail.com>
parents:
928
diff
changeset
|
25 | local rosterver_stream_feature = st.stanza("ver", {xmlns="urn:xmpp:features:rosterver"}):tag("optional"):up(); |
2611
c3ea4d3f857f
mod_roster: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2227
diff
changeset
|
26 | module:hook("stream-features", function(event) |
c3ea4d3f857f
mod_roster: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2227
diff
changeset
|
27 | local origin, features = event.origin, event.features; |
c3ea4d3f857f
mod_roster: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2227
diff
changeset
|
28 | if origin.username then |
c3ea4d3f857f
mod_roster: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2227
diff
changeset
|
29 | features:add_child(rosterver_stream_feature); |
c3ea4d3f857f
mod_roster: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2227
diff
changeset
|
30 | end |
c3ea4d3f857f
mod_roster: Hook stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2227
diff
changeset
|
31 | end); |
1133
b293d7dc6a45
mod_roster: Advertize roster versioning support
Waqas Hussain <waqas20@gmail.com>
parents:
928
diff
changeset
|
32 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
421
diff
changeset
|
33 | module:add_iq_handler("c2s", "jabber:iq:roster", |
30 | 34 | function (session, stanza) |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
35 | if stanza.tags[1].name == "query" then |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
36 | if stanza.attr.type == "get" then |
1198
545c81364939
mod_roster: Don't send a query element in roster response if roster is unchanged
Matthew Wild <mwild1@gmail.com>
parents:
1133
diff
changeset
|
37 | local roster = st.reply(stanza); |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
38 | |
2907
767864297afe
mod_roster: Tidier code for the roster versioning logic
Matthew Wild <mwild1@gmail.com>
parents:
2611
diff
changeset
|
39 | local client_ver = tonumber(stanza.tags[1].attr.ver); |
767864297afe
mod_roster: Tidier code for the roster versioning logic
Matthew Wild <mwild1@gmail.com>
parents:
2611
diff
changeset
|
40 | local server_ver = tonumber(session.roster[false].version or 1); |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
41 | |
2907
767864297afe
mod_roster: Tidier code for the roster versioning logic
Matthew Wild <mwild1@gmail.com>
parents:
2611
diff
changeset
|
42 | if not (client_ver and server_ver) or client_ver ~= server_ver then |
1198
545c81364939
mod_roster: Don't send a query element in roster response if roster is unchanged
Matthew Wild <mwild1@gmail.com>
parents:
1133
diff
changeset
|
43 | roster:query("jabber:iq:roster"); |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
44 | -- Client does not support versioning, or has stale roster |
3323
5228a395999b
mod_roster: Use value returned by pairs() during roster iteration to avoid dozens of wasteful table lookups
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
45 | for jid, item in pairs(session.roster) do |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
46 | if jid ~= "pending" and jid then |
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
47 | roster:tag("item", { |
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
48 | jid = jid, |
3323
5228a395999b
mod_roster: Use value returned by pairs() during roster iteration to avoid dozens of wasteful table lookups
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
49 | subscription = item.subscription, |
5228a395999b
mod_roster: Use value returned by pairs() during roster iteration to avoid dozens of wasteful table lookups
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
50 | ask = item.ask, |
5228a395999b
mod_roster: Use value returned by pairs() during roster iteration to avoid dozens of wasteful table lookups
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
51 | name = item.name, |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
52 | }); |
3323
5228a395999b
mod_roster: Use value returned by pairs() during roster iteration to avoid dozens of wasteful table lookups
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
53 | for group in pairs(item.groups) do |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
54 | roster:tag("group"):text(group):up(); |
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
55 | end |
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
56 | roster:up(); -- move out from item |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
57 | end |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
58 | end |
2907
767864297afe
mod_roster: Tidier code for the roster versioning logic
Matthew Wild <mwild1@gmail.com>
parents:
2611
diff
changeset
|
59 | roster.tags[1].attr.ver = server_ver; |
102
a5b914370db5
Fixed: mod_roster now outputs all roster data (instead of just the JIDs)
Waqas Hussain <waqas20@gmail.com>
parents:
79
diff
changeset
|
60 | end |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
61 | session.send(roster); |
114
bed2a8508cf5
Added session property for interested resources
Waqas Hussain <waqas20@gmail.com>
parents:
110
diff
changeset
|
62 | session.interested = true; -- resource is interested in roster updates |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
63 | return true; |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
64 | elseif stanza.attr.type == "set" then |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
65 | local query = stanza.tags[1]; |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
66 | if #query.tags == 1 and query.tags[1].name == "item" |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
67 | and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid |
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
68 | -- Protection against overwriting roster.pending, until we move it |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
69 | and query.tags[1].attr.jid ~= "pending" then |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
70 | local item = query.tags[1]; |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
71 | local from_node, from_host = jid_split(stanza.attr.from); |
326
99a8317d1235
Send unsubscribe and unsubscribed on roster item delete, and broadcast available resources' presence in reply to pre-approved subscription request
Waqas Hussain <waqas20@gmail.com>
parents:
299
diff
changeset
|
72 | local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
73 | local jid = jid_prep(item.attr.jid); |
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
74 | local node, host, resource = jid_split(jid); |
326
99a8317d1235
Send unsubscribe and unsubscribed on roster item delete, and broadcast available resources' presence in reply to pre-approved subscription request
Waqas Hussain <waqas20@gmail.com>
parents:
299
diff
changeset
|
75 | if not resource and host then |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
76 | if jid ~= from_node.."@"..from_host then |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
77 | if item.attr.subscription == "remove" then |
2227
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
78 | local roster = session.roster; |
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
79 | local r_item = roster[jid]; |
326
99a8317d1235
Send unsubscribe and unsubscribed on roster item delete, and broadcast available resources' presence in reply to pre-approved subscription request
Waqas Hussain <waqas20@gmail.com>
parents:
299
diff
changeset
|
80 | if r_item then |
2227
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
81 | local to_bare = node and (node.."@"..host) or host; -- bare JID |
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
82 | if r_item.subscription == "both" or r_item.subscription == "from" or (roster.pending and roster.pending[jid]) then |
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
83 | core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare})); |
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
84 | end |
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
85 | if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then |
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
86 | core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare})); |
1888368c58c5
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
Waqas Hussain <waqas20@gmail.com>
parents:
1668
diff
changeset
|
87 | end |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
88 | local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
89 | if success then |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
90 | session.send(st.reply(stanza)); |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
91 | rm_roster_push(from_node, from_host, jid); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
92 | else |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
93 | session.send(st.error_reply(stanza, err_type, err_cond, err_msg)); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
94 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
95 | else |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
96 | session.send(st.error_reply(stanza, "modify", "item-not-found")); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
97 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
98 | else |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
99 | local r_item = {name = item.attr.name, groups = {}}; |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
100 | if r_item.name == "" then r_item.name = nil; end |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
101 | if session.roster[jid] then |
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
102 | r_item.subscription = session.roster[jid].subscription; |
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
103 | r_item.ask = session.roster[jid].ask; |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
104 | else |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
105 | r_item.subscription = "none"; |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
106 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
107 | for _, child in ipairs(item) do |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
108 | if child.name == "group" then |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
109 | local text = t_concat(child); |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
110 | if text and text ~= "" then |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
111 | r_item.groups[text] = true; |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
112 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
113 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
114 | end |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
115 | local success, err_type, err_cond, err_msg = rm_add_to_roster(session, jid, r_item); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
116 | if success then |
1200
57a72472e1bc
mod_roster: Add some comments for the error cases to improve readability
Matthew Wild <mwild1@gmail.com>
parents:
1198
diff
changeset
|
117 | -- Ok, send success |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
118 | session.send(st.reply(stanza)); |
1200
57a72472e1bc
mod_roster: Add some comments for the error cases to improve readability
Matthew Wild <mwild1@gmail.com>
parents:
1198
diff
changeset
|
119 | -- and push change to all resources |
928
92288c13d7bc
Fixed: mod_roster: Prep JIDs being added to roster (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
120 | rm_roster_push(from_node, from_host, jid); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
121 | else |
1200
57a72472e1bc
mod_roster: Add some comments for the error cases to improve readability
Matthew Wild <mwild1@gmail.com>
parents:
1198
diff
changeset
|
122 | -- Adding to roster failed |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
123 | session.send(st.error_reply(stanza, err_type, err_cond, err_msg)); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
124 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
125 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
126 | else |
1200
57a72472e1bc
mod_roster: Add some comments for the error cases to improve readability
Matthew Wild <mwild1@gmail.com>
parents:
1198
diff
changeset
|
127 | -- Trying to add self to roster |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
128 | session.send(st.error_reply(stanza, "cancel", "not-allowed")); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
129 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
130 | else |
1200
57a72472e1bc
mod_roster: Add some comments for the error cases to improve readability
Matthew Wild <mwild1@gmail.com>
parents:
1198
diff
changeset
|
131 | -- Invalid JID added to roster |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
132 | session.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME what's the correct error? |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
133 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
134 | else |
1200
57a72472e1bc
mod_roster: Add some comments for the error cases to improve readability
Matthew Wild <mwild1@gmail.com>
parents:
1198
diff
changeset
|
135 | -- Roster set didn't include a single item, or its name wasn't 'item' |
299
300b5a201ad3
Fix mod_roster to use session.send for sending stanzas
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
136 | session.send(st.error_reply(stanza, "modify", "bad-request")); |
108
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
137 | end |
1d79da482c5d
Added: More complete implementation for mod_roster
Waqas Hussain <waqas20@gmail.com>
parents:
102
diff
changeset
|
138 | return true; |
30 | 139 | end |
140 | end | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
421
diff
changeset
|
141 | end); |