author | Matthew Wild <mwild1@gmail.com> |
Wed, 31 Aug 2016 16:10:16 +0100 | |
changeset 7649 | 6210dfaec84f |
parent 7274 | dae47cd774ac |
child 7782 | b1f80447a2b1 |
permissions | -rw-r--r-- |
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1380
diff
changeset
|
1 |
-- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2050
diff
changeset
|
2 |
-- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2050
diff
changeset
|
3 |
-- Copyright (C) 2008-2010 Waqas Hussain |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5747
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:
268
diff
changeset
|
7 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
268
diff
changeset
|
8 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
268
diff
changeset
|
9 |
|
0 | 10 |
|
263
75275b6b4e03
Update rostermanager to use new logger
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
11 |
|
75275b6b4e03
Update rostermanager to use new logger
Matthew Wild <mwild1@gmail.com>
parents:
193
diff
changeset
|
12 |
local log = require "util.logger".init("rostermanager"); |
0 | 13 |
|
5348
ca0d820e9318
rostermanager: Remove unused imports
Kim Alvefur <zash@zash.se>
parents:
5060
diff
changeset
|
14 |
local pairs = pairs; |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
15 |
local tostring = tostring; |
6625
fb60cee2144e
rostermanager: Add missing import of `type()`
Florian Zeitz <florob@babelmonkeys.de>
parents:
6619
diff
changeset
|
16 |
local type = type; |
0 | 17 |
|
103
ebdb7875443e
Fixed: Typos caused by lack of sleep.
Waqas Hussain <waqas20@gmail.com>
parents:
101
diff
changeset
|
18 |
local hosts = hosts; |
6553
a335d02951b3
rostermanager: Access bare_sessions through prosody.bare_sessions
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
19 |
local bare_sessions = prosody.bare_sessions; |
103
ebdb7875443e
Fixed: Typos caused by lack of sleep.
Waqas Hussain <waqas20@gmail.com>
parents:
101
diff
changeset
|
20 |
|
5429
25333de6e7c7
rostermanager: do not save rosters for unexistant users.
Marco Cirillo <maranda@lightwitch.org>
parents:
5348
diff
changeset
|
21 |
local um_user_exists = require "core.usermanager".user_exists; |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
22 |
local st = require "util.stanza"; |
7170
7ae430fecf12
rostermanager: Require storagemanager at the top, fixes traceback on Lua 5.2
Matthew Wild <mwild1@gmail.com>
parents:
7158
diff
changeset
|
23 |
local storagemanager = require "core.storagemanager"; |
0 | 24 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
25 |
local _ENV = nil; |
0 | 26 |
|
6790
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
27 |
local save_roster; -- forward declaration |
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
28 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
29 |
local function add_to_roster(session, jid, item) |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
30 |
if session.roster then |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
31 |
local old_item = session.roster[jid]; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
32 |
session.roster[jid] = item; |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
33 |
if save_roster(session.username, session.host, nil, jid) then |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
34 |
return true; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
35 |
else |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
36 |
session.roster[jid] = old_item; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
37 |
return nil, "wait", "internal-server-error", "Unable to save roster"; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
38 |
end |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
39 |
else |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
40 |
return nil, "auth", "not-authorized", "Session's roster not loaded"; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
41 |
end |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
42 |
end |
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
43 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
44 |
local function remove_from_roster(session, jid) |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
45 |
if session.roster then |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
46 |
local old_item = session.roster[jid]; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
47 |
session.roster[jid] = nil; |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
48 |
if save_roster(session.username, session.host, nil, jid) then |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
49 |
return true; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
50 |
else |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
51 |
session.roster[jid] = old_item; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
52 |
return nil, "wait", "internal-server-error", "Unable to save roster"; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
53 |
end |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
54 |
else |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
55 |
return nil, "auth", "not-authorized", "Session's roster not loaded"; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
56 |
end |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
57 |
end |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
58 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
59 |
local function roster_push(username, host, jid) |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
60 |
local roster = jid and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster; |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
61 |
if roster then |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
62 |
local item = hosts[host].sessions[username].roster[jid]; |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
63 |
local stanza = st.iq({type="set"}); |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
64 |
stanza:tag("query", {xmlns = "jabber:iq:roster", ver = tostring(roster[false].version or "1") }); |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
65 |
if item then |
132 | 66 |
stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name, ask = item.ask}); |
110 | 67 |
for group in pairs(item.groups) do |
68 |
stanza:tag("group"):text(group):up(); |
|
69 |
end |
|
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
70 |
else |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
71 |
stanza:tag("item", {jid = jid, subscription = "remove"}); |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
72 |
end |
193 | 73 |
stanza:up(); -- move out from item |
74 |
stanza:up(); -- move out from stanza |
|
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
75 |
-- stanza ready |
110 | 76 |
for _, session in pairs(hosts[host].sessions[username].sessions) do |
114
bed2a8508cf5
Added session property for interested resources
Waqas Hussain <waqas20@gmail.com>
parents:
110
diff
changeset
|
77 |
if session.interested then |
110 | 78 |
session.send(stanza); |
107
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
79 |
end |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
80 |
end |
8d8debda3df2
Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents:
103
diff
changeset
|
81 |
end |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
82 |
end |
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
83 |
|
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
84 |
local function roster_metadata(roster, err) |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
85 |
local metadata = roster[false]; |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
86 |
if not metadata then |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
87 |
metadata = { broken = err or nil }; |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
88 |
roster[false] = metadata; |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
89 |
end |
6627
7f9b49f2758a
rostermanager: Fix roster upgrade code (thanks mva)
Kim Alvefur <zash@zash.se>
parents:
6625
diff
changeset
|
90 |
if roster.pending and type(roster.pending.subscription) ~= "string" then |
7f9b49f2758a
rostermanager: Fix roster upgrade code (thanks mva)
Kim Alvefur <zash@zash.se>
parents:
6625
diff
changeset
|
91 |
metadata.pending = roster.pending; |
7f9b49f2758a
rostermanager: Fix roster upgrade code (thanks mva)
Kim Alvefur <zash@zash.se>
parents:
6625
diff
changeset
|
92 |
roster.pending = nil; |
7f9b49f2758a
rostermanager: Fix roster upgrade code (thanks mva)
Kim Alvefur <zash@zash.se>
parents:
6625
diff
changeset
|
93 |
elseif not metadata.pending then |
7f9b49f2758a
rostermanager: Fix roster upgrade code (thanks mva)
Kim Alvefur <zash@zash.se>
parents:
6625
diff
changeset
|
94 |
metadata.pending = {}; |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
95 |
end |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
96 |
return metadata; |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
97 |
end |
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
98 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
99 |
local function load_roster(username, host) |
2048
d420722519e1
rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents:
2047
diff
changeset
|
100 |
local jid = username.."@"..host; |
4993
5243b74a4cbb
Hopefully inert commit to clean up logging across a number of modules, removing all cases of concatenation when building log messages
Matthew Wild <mwild1@gmail.com>
parents:
3129
diff
changeset
|
101 |
log("debug", "load_roster: asked for: %s", jid); |
2049
227f3fd2caaf
rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
2048
diff
changeset
|
102 |
local user = bare_sessions[jid]; |
1380
9b3b43b8963a
rostermanager: Fire event on roster load
Matthew Wild <mwild1@gmail.com>
parents:
925
diff
changeset
|
103 |
local roster; |
2049
227f3fd2caaf
rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
2048
diff
changeset
|
104 |
if user then |
227f3fd2caaf
rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
2048
diff
changeset
|
105 |
roster = user.roster; |
227f3fd2caaf
rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
2048
diff
changeset
|
106 |
if roster then return roster; end |
4993
5243b74a4cbb
Hopefully inert commit to clean up logging across a number of modules, removing all cases of concatenation when building log messages
Matthew Wild <mwild1@gmail.com>
parents:
3129
diff
changeset
|
107 |
log("debug", "load_roster: loading for new user: %s@%s", username, host); |
2049
227f3fd2caaf
rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
2048
diff
changeset
|
108 |
else -- Attempt to load roster for non-loaded user |
4993
5243b74a4cbb
Hopefully inert commit to clean up logging across a number of modules, removing all cases of concatenation when building log messages
Matthew Wild <mwild1@gmail.com>
parents:
3129
diff
changeset
|
109 |
log("debug", "load_roster: loading for offline user: %s@%s", username, host); |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
110 |
end |
7170
7ae430fecf12
rostermanager: Require storagemanager at the top, fixes traceback on Lua 5.2
Matthew Wild <mwild1@gmail.com>
parents:
7158
diff
changeset
|
111 |
local roster_store = storagemanager.open(host, "roster", "keyval"); |
7157
b3b92204802f
rostermanager: Use storagemanager
Kim Alvefur <zash@zash.se>
parents:
7067
diff
changeset
|
112 |
local data, err = roster_store:get(username); |
3087
9b31e36528e0
rostermanager: When loading the roster, also return a datamanager error if available.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
113 |
roster = data or {}; |
2049
227f3fd2caaf
rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
2048
diff
changeset
|
114 |
if user then user.roster = roster; end |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
115 |
roster_metadata(roster, err); |
2048
d420722519e1
rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents:
2047
diff
changeset
|
116 |
if roster[jid] then |
d420722519e1
rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents:
2047
diff
changeset
|
117 |
roster[jid] = nil; |
4993
5243b74a4cbb
Hopefully inert commit to clean up logging across a number of modules, removing all cases of concatenation when building log messages
Matthew Wild <mwild1@gmail.com>
parents:
3129
diff
changeset
|
118 |
log("warn", "roster for %s has a self-contact", jid); |
2048
d420722519e1
rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents:
2047
diff
changeset
|
119 |
end |
3090
f14d2962f32c
rostermanager: Don't fire roster-load event if there was an error loading the roster
Matthew Wild <mwild1@gmail.com>
parents:
3087
diff
changeset
|
120 |
if not err then |
5747
23076ee191d3
rostermanager, mod_groups: Change roster-load event to pass an event table for consistency
Matthew Wild <mwild1@gmail.com>
parents:
5429
diff
changeset
|
121 |
hosts[host].events.fire_event("roster-load", { username = username, host = host, roster = roster }); |
3090
f14d2962f32c
rostermanager: Don't fire roster-load event if there was an error loading the roster
Matthew Wild <mwild1@gmail.com>
parents:
3087
diff
changeset
|
122 |
end |
3087
9b31e36528e0
rostermanager: When loading the roster, also return a datamanager error if available.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
123 |
return roster, err; |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
124 |
end |
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
125 |
|
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
126 |
function save_roster(username, host, roster, jid) |
5429
25333de6e7c7
rostermanager: do not save rosters for unexistant users.
Marco Cirillo <maranda@lightwitch.org>
parents:
5348
diff
changeset
|
127 |
if not um_user_exists(username, host) then |
25333de6e7c7
rostermanager: do not save rosters for unexistant users.
Marco Cirillo <maranda@lightwitch.org>
parents:
5348
diff
changeset
|
128 |
log("debug", "not saving roster for %s@%s: the user doesn't exist", username, host); |
25333de6e7c7
rostermanager: do not save rosters for unexistant users.
Marco Cirillo <maranda@lightwitch.org>
parents:
5348
diff
changeset
|
129 |
return nil; |
25333de6e7c7
rostermanager: do not save rosters for unexistant users.
Marco Cirillo <maranda@lightwitch.org>
parents:
5348
diff
changeset
|
130 |
end |
25333de6e7c7
rostermanager: do not save rosters for unexistant users.
Marco Cirillo <maranda@lightwitch.org>
parents:
5348
diff
changeset
|
131 |
|
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
132 |
log("debug", "save_roster: saving roster for %s@%s, (%s)", username, host, jid or "all contacts"); |
1897
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
133 |
if not roster then |
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
134 |
roster = hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster; |
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
135 |
--if not roster then |
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
136 |
-- --roster = load_roster(username, host); |
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
137 |
-- return true; -- roster unchanged, no reason to save |
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
138 |
--end |
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
139 |
end |
6d81e74310a7
rostermanager: Added support for saving rosters of offline users to the save_roster function.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
140 |
if roster then |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
141 |
local metadata = roster_metadata(roster); |
2909
bcfd76cc9b7d
rostermanager: Don't bump the roster version if it is == true (ie. we are not versioning the roster)
Matthew Wild <mwild1@gmail.com>
parents:
2050
diff
changeset
|
142 |
if metadata.version ~= true then |
bcfd76cc9b7d
rostermanager: Don't bump the roster version if it is == true (ie. we are not versioning the roster)
Matthew Wild <mwild1@gmail.com>
parents:
2050
diff
changeset
|
143 |
metadata.version = (metadata.version or 0) + 1; |
bcfd76cc9b7d
rostermanager: Don't bump the roster version if it is == true (ie. we are not versioning the roster)
Matthew Wild <mwild1@gmail.com>
parents:
2050
diff
changeset
|
144 |
end |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
145 |
if metadata.broken then return nil, "Not saving broken roster" end |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
146 |
if jid == nil then |
7170
7ae430fecf12
rostermanager: Require storagemanager at the top, fixes traceback on Lua 5.2
Matthew Wild <mwild1@gmail.com>
parents:
7158
diff
changeset
|
147 |
local roster_store = storagemanager.open(host, "roster", "keyval"); |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
148 |
return roster_store:set(username, roster); |
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
149 |
else |
7170
7ae430fecf12
rostermanager: Require storagemanager at the top, fixes traceback on Lua 5.2
Matthew Wild <mwild1@gmail.com>
parents:
7158
diff
changeset
|
150 |
local roster_store = storagemanager.open(host, "roster", "map"); |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
151 |
return roster_store:set_keys(username, { [false] = metadata, [jid] = roster[jid] or roster_store.remove }); |
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
152 |
end |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
153 |
end |
916
f0743928ef7e
core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
154 |
log("warn", "save_roster: user had no roster to save"); |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
80
diff
changeset
|
155 |
return nil; |
0 | 156 |
end |
80
523ac742cc19
Fixed: rostermanager.lua now returns the module
Waqas Hussain <waqas20@gmail.com>
parents:
6
diff
changeset
|
157 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
158 |
local function process_inbound_subscription_approval(username, host, jid) |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
159 |
local roster = load_roster(username, host); |
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
160 |
local item = roster[jid]; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
161 |
if item and item.ask then |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
162 |
if item.subscription == "none" then |
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
163 |
item.subscription = "to"; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
164 |
else -- subscription == from |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
165 |
item.subscription = "both"; |
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
166 |
end |
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
167 |
item.ask = nil; |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
168 |
return save_roster(username, host, roster, jid); |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
169 |
end |
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
170 |
end |
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
132
diff
changeset
|
171 |
|
6790
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
172 |
local is_contact_pending_out -- forward declaration |
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
173 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
174 |
local function process_inbound_subscription_cancellation(username, host, jid) |
172
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
175 |
local roster = load_roster(username, host); |
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
176 |
local item = roster[jid]; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
177 |
local changed = nil; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
178 |
if is_contact_pending_out(username, host, jid) then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
179 |
item.ask = nil; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
180 |
changed = true; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
181 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
182 |
if item then |
172
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
183 |
if item.subscription == "to" then |
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
184 |
item.subscription = "none"; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
185 |
changed = true; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
186 |
elseif item.subscription == "both" then |
172
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
187 |
item.subscription = "from"; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
188 |
changed = true; |
172
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
189 |
end |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
190 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
191 |
if changed then |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
192 |
return save_roster(username, host, roster, jid); |
172
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
193 |
end |
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
194 |
end |
71247788c7c7
Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents:
171
diff
changeset
|
195 |
|
6790
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
196 |
local is_contact_pending_in -- forward declaration |
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
197 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
198 |
local function process_inbound_unsubscribe(username, host, jid) |
173 | 199 |
local roster = load_roster(username, host); |
200 |
local item = roster[jid]; |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
201 |
local changed = nil; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
202 |
if is_contact_pending_in(username, host, jid) then |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
203 |
roster[false].pending[jid] = nil; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
204 |
changed = true; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
205 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
206 |
if item then |
173 | 207 |
if item.subscription == "from" then |
208 |
item.subscription = "none"; |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
209 |
changed = true; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
210 |
elseif item.subscription == "both" then |
173 | 211 |
item.subscription = "to"; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
212 |
changed = true; |
173 | 213 |
end |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
214 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
215 |
if changed then |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
216 |
return save_roster(username, host, roster, jid); |
173 | 217 |
end |
218 |
end |
|
219 |
||
3129
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
220 |
local function _get_online_roster_subscription(jidA, jidB) |
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
221 |
local user = bare_sessions[jidA]; |
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
222 |
local item = user and (user.roster[jidB] or { subscription = "none" }); |
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
223 |
return item and item.subscription; |
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
224 |
end |
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
225 |
local function is_contact_subscribed(username, host, jid) |
3129
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
226 |
do |
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
227 |
local selfjid = username.."@"..host; |
6665
5ef319efedba
rostermanager: Variable rename for clarity and to avoid name clash [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6627
diff
changeset
|
228 |
local user_subscription = _get_online_roster_subscription(selfjid, jid); |
5ef319efedba
rostermanager: Variable rename for clarity and to avoid name clash [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6627
diff
changeset
|
229 |
if user_subscription then return (user_subscription == "both" or user_subscription == "from"); end |
5ef319efedba
rostermanager: Variable rename for clarity and to avoid name clash [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6627
diff
changeset
|
230 |
local contact_subscription = _get_online_roster_subscription(jid, selfjid); |
5ef319efedba
rostermanager: Variable rename for clarity and to avoid name clash [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6627
diff
changeset
|
231 |
if contact_subscription then return (contact_subscription == "both" or contact_subscription == "to"); end |
3129
125f03db0b1a
rostermanager: Optimisation to avoid unnecessarily loading rosters for offline contacts on probes, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
3111
diff
changeset
|
232 |
end |
3111
826cb5f1859b
rostermanager: Return an error string when subscription test fails due to an error.
Waqas Hussain <waqas20@gmail.com>
parents:
3110
diff
changeset
|
233 |
local roster, err = load_roster(username, host); |
174
f9aff1fc7e99
Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents:
173
diff
changeset
|
234 |
local item = roster[jid]; |
3111
826cb5f1859b
rostermanager: Return an error string when subscription test fails due to an error.
Waqas Hussain <waqas20@gmail.com>
parents:
3110
diff
changeset
|
235 |
return item and (item.subscription == "from" or item.subscription == "both"), err; |
174
f9aff1fc7e99
Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents:
173
diff
changeset
|
236 |
end |
f9aff1fc7e99
Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents:
173
diff
changeset
|
237 |
|
6790
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
238 |
function is_contact_pending_in(username, host, jid) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
239 |
local roster = load_roster(username, host); |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
240 |
return roster[false].pending[jid]; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
241 |
end |
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
242 |
local function set_contact_pending_in(username, host, jid) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
243 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
244 |
local item = roster[jid]; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
245 |
if item and (item.subscription == "from" or item.subscription == "both") then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
246 |
return; -- false |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
247 |
end |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
248 |
roster[false].pending[jid] = true; |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
249 |
return save_roster(username, host, roster, jid); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
250 |
end |
6790
ad64e2eacd0e
rostermanager: Add forward declarations
Kim Alvefur <zash@zash.se>
parents:
6782
diff
changeset
|
251 |
function is_contact_pending_out(username, host, jid) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
252 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
253 |
local item = roster[jid]; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
254 |
return item and item.ask; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
255 |
end |
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
256 |
local function set_contact_pending_out(username, host, jid) -- subscribe |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
257 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
258 |
local item = roster[jid]; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
259 |
if item and (item.ask or item.subscription == "to" or item.subscription == "both") then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
260 |
return true; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
261 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
262 |
if not item then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
263 |
item = {subscription = "none", groups = {}}; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
264 |
roster[jid] = item; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
265 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
266 |
item.ask = "subscribe"; |
4993
5243b74a4cbb
Hopefully inert commit to clean up logging across a number of modules, removing all cases of concatenation when building log messages
Matthew Wild <mwild1@gmail.com>
parents:
3129
diff
changeset
|
267 |
log("debug", "set_contact_pending_out: saving roster; set %s@%s.roster[%q].ask=subscribe", username, host, jid); |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
268 |
return save_roster(username, host, roster, jid); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
269 |
end |
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
270 |
local function unsubscribe(username, host, jid) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
271 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
272 |
local item = roster[jid]; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
273 |
if not item then return false; end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
274 |
if (item.subscription == "from" or item.subscription == "none") and not item.ask then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
275 |
return true; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
276 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
277 |
item.ask = nil; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
278 |
if item.subscription == "both" then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
279 |
item.subscription = "from"; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
280 |
elseif item.subscription == "to" then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
281 |
item.subscription = "none"; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
282 |
end |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
283 |
return save_roster(username, host, roster, jid); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
284 |
end |
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
285 |
local function subscribed(username, host, jid) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
286 |
if is_contact_pending_in(username, host, jid) then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
287 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
288 |
local item = roster[jid]; |
925
4861bcf0afa4
Fixed: rostermanager: Create new roster item if one doesn't exist on subscription approval (fixes issue #77)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
289 |
if not item then -- FIXME should roster item be auto-created? |
4861bcf0afa4
Fixed: rostermanager: Create new roster item if one doesn't exist on subscription approval (fixes issue #77)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
290 |
item = {subscription = "none", groups = {}}; |
4861bcf0afa4
Fixed: rostermanager: Create new roster item if one doesn't exist on subscription approval (fixes issue #77)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
291 |
roster[jid] = item; |
4861bcf0afa4
Fixed: rostermanager: Create new roster item if one doesn't exist on subscription approval (fixes issue #77)
Waqas Hussain <waqas20@gmail.com>
parents:
916
diff
changeset
|
292 |
end |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
293 |
if item.subscription == "none" then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
294 |
item.subscription = "from"; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
295 |
else -- subscription == to |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
296 |
item.subscription = "both"; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
297 |
end |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
298 |
roster[false].pending[jid] = nil; |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
299 |
return save_roster(username, host, roster, jid); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
300 |
end -- TODO else implement optional feature pre-approval (ask = subscribed) |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
301 |
end |
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
302 |
local function unsubscribed(username, host, jid) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
303 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
304 |
local item = roster[jid]; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
305 |
local pending = is_contact_pending_in(username, host, jid); |
5060
b0e36777f715
mod_presence, rostermanager: Bring outbound subscription cancellation in line with RFC6121.
Waqas Hussain <waqas20@gmail.com>
parents:
5024
diff
changeset
|
306 |
if pending then |
6616
2aae36312eb9
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur <zash@zash.se>
parents:
6553
diff
changeset
|
307 |
roster[false].pending[jid] = nil; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
308 |
end |
7067
b98006bfd97a
rostermanager: Rename variable to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
6790
diff
changeset
|
309 |
local is_subscribed; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
310 |
if item then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
311 |
if item.subscription == "from" then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
312 |
item.subscription = "none"; |
7067
b98006bfd97a
rostermanager: Rename variable to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
6790
diff
changeset
|
313 |
is_subscribed = true; |
267 | 314 |
elseif item.subscription == "both" then |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
315 |
item.subscription = "to"; |
7067
b98006bfd97a
rostermanager: Rename variable to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
6790
diff
changeset
|
316 |
is_subscribed = true; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
317 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
318 |
end |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
319 |
local success = (pending or is_subscribed) and save_roster(username, host, roster, jid); |
5060
b0e36777f715
mod_presence, rostermanager: Bring outbound subscription cancellation in line with RFC6121.
Waqas Hussain <waqas20@gmail.com>
parents:
5024
diff
changeset
|
320 |
return success, pending, subscribed; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
321 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
322 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
323 |
local function process_outbound_subscription_request(username, host, jid) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
324 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
325 |
local item = roster[jid]; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
326 |
if item and (item.subscription == "none" or item.subscription == "from") then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
327 |
item.ask = "subscribe"; |
7158
4a0825984e42
rostermanager: Use map stores when only one contact is changed
Kim Alvefur <zash@zash.se>
parents:
7157
diff
changeset
|
328 |
return save_roster(username, host, roster, jid); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
329 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
330 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
331 |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
332 |
--[[function process_outbound_subscription_approval(username, host, jid) |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
333 |
local roster = load_roster(username, host); |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
334 |
local item = roster[jid]; |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
335 |
if item and (item.subscription == "none" or item.subscription == "from" then |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
336 |
item.ask = "subscribe"; |
1898
1ce02e2f5a3f
rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents:
1897
diff
changeset
|
337 |
return save_roster(username, host, roster); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
338 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
339 |
end]] |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
340 |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
341 |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
342 |
|
6782
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
343 |
return { |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
344 |
add_to_roster = add_to_roster; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
345 |
remove_from_roster = remove_from_roster; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
346 |
roster_push = roster_push; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
347 |
load_roster = load_roster; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
348 |
save_roster = save_roster; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
349 |
process_inbound_subscription_approval = process_inbound_subscription_approval; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
350 |
process_inbound_subscription_cancellation = process_inbound_subscription_cancellation; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
351 |
process_inbound_unsubscribe = process_inbound_unsubscribe; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
352 |
is_contact_subscribed = is_contact_subscribed; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
353 |
is_contact_pending_in = is_contact_pending_in; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
354 |
set_contact_pending_in = set_contact_pending_in; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
355 |
is_contact_pending_out = is_contact_pending_out; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
356 |
set_contact_pending_out = set_contact_pending_out; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
357 |
unsubscribe = unsubscribe; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
358 |
subscribed = subscribed; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
359 |
unsubscribed = unsubscribed; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
360 |
process_outbound_subscription_request = process_outbound_subscription_request; |
6236668da30a
core.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6665
diff
changeset
|
361 |
}; |