core/rostermanager.lua

Wed, 07 Apr 2010 21:00:20 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Wed, 07 Apr 2010 21:00:20 +0100
changeset 2964
49b5c87d2fa0
parent 2925
692b3c6c5bd2
child 3087
9b31e36528e0
permissions
-rw-r--r--

util.timer: When using libevent hold onto the event handle to stop it being collected (and the timer stopping). Fixes BOSH ghosts, thanks Flo, niekie, waqas.

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
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 268
diff changeset
4 --
758
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 615
diff changeset
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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
13
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
14 local setmetatable = setmetatable;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
15 local format = string.format;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
16 local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
110
bb5ac5976a97 Fixed: Roster support
Waqas Hussain <waqas20@gmail.com>
parents: 107
diff changeset
17 local pairs, ipairs = pairs, ipairs;
916
f0743928ef7e core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents: 894
diff changeset
18 local tostring = tostring;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
19
103
ebdb7875443e Fixed: Typos caused by lack of sleep.
Waqas Hussain <waqas20@gmail.com>
parents: 101
diff changeset
20 local hosts = hosts;
2050
adc1b92b8c6b rostermanager: Fixed a global access.
Waqas Hussain <waqas20@gmail.com>
parents: 2049
diff changeset
21 local bare_sessions = bare_sessions;
103
ebdb7875443e Fixed: Typos caused by lack of sleep.
Waqas Hussain <waqas20@gmail.com>
parents: 101
diff changeset
22
183
403db3b5c3c2 Combined some lines
Waqas Hussain <waqas20@gmail.com>
parents: 177
diff changeset
23 local datamanager = require "util.datamanager"
107
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
24 local st = require "util.stanza";
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
25
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
26 module "rostermanager"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
27
107
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
28 function add_to_roster(session, jid, item)
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
29 if session.roster then
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
30 local old_item = session.roster[jid];
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
31 session.roster[jid] = item;
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
32 if save_roster(session.username, session.host) then
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
33 return true;
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
34 else
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
35 session.roster[jid] = old_item;
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
36 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
37 end
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
38 else
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
39 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
40 end
101
c690fa382743 Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents: 80
diff changeset
41 end
c690fa382743 Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents: 80
diff changeset
42
107
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
43 function remove_from_roster(session, jid)
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
44 if session.roster then
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
45 local old_item = session.roster[jid];
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
46 session.roster[jid] = nil;
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
47 if save_roster(session.username, session.host) then
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
48 return true;
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
49 else
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
50 session.roster[jid] = old_item;
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
51 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
52 end
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
53 else
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
54 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
55 end
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
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
58 function roster_push(username, host, jid)
916
f0743928ef7e core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents: 894
diff changeset
59 local roster = jid and jid ~= "pending" and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster;
f0743928ef7e core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents: 894
diff changeset
60 if roster then
107
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
61 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
62 local stanza = st.iq({type="set"});
916
f0743928ef7e core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents: 894
diff changeset
63 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
64 if item then
132
9a4aa57af367 Roster updates
Waqas Hussain <waqas20@gmail.com>
parents: 114
diff changeset
65 stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name, ask = item.ask});
110
bb5ac5976a97 Fixed: Roster support
Waqas Hussain <waqas20@gmail.com>
parents: 107
diff changeset
66 for group in pairs(item.groups) do
bb5ac5976a97 Fixed: Roster support
Waqas Hussain <waqas20@gmail.com>
parents: 107
diff changeset
67 stanza:tag("group"):text(group):up();
bb5ac5976a97 Fixed: Roster support
Waqas Hussain <waqas20@gmail.com>
parents: 107
diff changeset
68 end
107
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
69 else
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
70 stanza:tag("item", {jid = jid, subscription = "remove"});
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
71 end
193
13ac34255c37 mod_roster fix
Waqas Hussain <waqas20@gmail.com>
parents: 183
diff changeset
72 stanza:up(); -- move out from item
13ac34255c37 mod_roster fix
Waqas Hussain <waqas20@gmail.com>
parents: 183
diff changeset
73 stanza:up(); -- move out from stanza
107
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
74 -- stanza ready
110
bb5ac5976a97 Fixed: Roster support
Waqas Hussain <waqas20@gmail.com>
parents: 107
diff changeset
75 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
76 if session.interested then
107
8d8debda3df2 Added: Roster manipulation functions to core.rostermanager
Waqas Hussain <waqas20@gmail.com>
parents: 103
diff changeset
77 -- FIXME do we need to set stanza.attr.to?
110
bb5ac5976a97 Fixed: Roster support
Waqas Hussain <waqas20@gmail.com>
parents: 107
diff changeset
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
103
ebdb7875443e Fixed: Typos caused by lack of sleep.
Waqas Hussain <waqas20@gmail.com>
parents: 101
diff changeset
84 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
85 local jid = username.."@"..host;
d420722519e1 rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents: 2047
diff changeset
86 log("debug", "load_roster: asked for: "..jid);
2049
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
87 local user = bare_sessions[jid];
1380
9b3b43b8963a rostermanager: Fire event on roster load
Matthew Wild <mwild1@gmail.com>
parents: 925
diff changeset
88 local roster;
2049
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
89 if user then
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
90 roster = user.roster;
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
91 if roster then return roster; end
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
92 log("debug", "load_roster: loading for new user: "..username.."@"..host);
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
93 else -- Attempt to load roster for non-loaded user
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
94 log("debug", "load_roster: loading for offline user: "..username.."@"..host);
101
c690fa382743 Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents: 80
diff changeset
95 end
1380
9b3b43b8963a rostermanager: Fire event on roster load
Matthew Wild <mwild1@gmail.com>
parents: 925
diff changeset
96 roster = datamanager.load(username, host, "roster") or {};
2049
227f3fd2caaf rostermanager: Refactored roster loading to remove duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents: 2048
diff changeset
97 if user then user.roster = roster; end
2047
fb236904c959 rostermanager: Ensure meta-data entry is present on roster load.
Waqas Hussain <waqas20@gmail.com>
parents: 2046
diff changeset
98 if not roster[false] then roster[false] = { }; end
2048
d420722519e1 rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents: 2047
diff changeset
99 if roster[jid] then
d420722519e1 rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents: 2047
diff changeset
100 roster[jid] = nil;
d420722519e1 rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents: 2047
diff changeset
101 log("warn", "roster for "..jid.." has a self-contact");
d420722519e1 rostermanager: Log a warning when a self-contact is detected.
Waqas Hussain <waqas20@gmail.com>
parents: 2047
diff changeset
102 end
1380
9b3b43b8963a rostermanager: Fire event on roster load
Matthew Wild <mwild1@gmail.com>
parents: 925
diff changeset
103 hosts[host].events.fire_event("roster-load", username, host, roster);
9b3b43b8963a rostermanager: Fire event on roster load
Matthew Wild <mwild1@gmail.com>
parents: 925
diff changeset
104 return roster;
101
c690fa382743 Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents: 80
diff changeset
105 end
c690fa382743 Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents: 80
diff changeset
106
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
107 function save_roster(username, host, roster)
177
606c433955e7 Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents: 176
diff changeset
108 log("debug", "save_roster: saving roster for "..username.."@"..host);
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
109 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
110 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
111 --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
112 -- --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
113 -- 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
114 --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
115 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
116 if roster then
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
117 local metadata = roster[false];
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
118 if not metadata 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
119 metadata = {};
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
120 roster[false] = metadata;
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
121 end
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
122 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
123 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
124 end
1947
ff2b86076e9c rostermanager: Fixed a traceback on roster save.
Waqas Hussain <waqas20@gmail.com>
parents: 1898
diff changeset
125 return datamanager.store(username, host, "roster", roster);
101
c690fa382743 Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents: 80
diff changeset
126 end
916
f0743928ef7e core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents: 894
diff changeset
127 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
128 return nil;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
129 end
80
523ac742cc19 Fixed: rostermanager.lua now returns the module
Waqas Hussain <waqas20@gmail.com>
parents: 6
diff changeset
130
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
131 function process_inbound_subscription_approval(username, host, jid)
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
132 local roster = load_roster(username, host);
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
133 local item = roster[jid];
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
134 if item and item.ask then
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
135 if item.subscription == "none" then
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
136 item.subscription = "to";
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
137 else -- subscription == from
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
138 item.subscription = "both";
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
139 end
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
140 item.ask = nil;
1898
1ce02e2f5a3f rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents: 1897
diff changeset
141 return save_roster(username, host, roster);
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
142 end
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
143 end
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 132
diff changeset
144
172
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
145 function process_inbound_subscription_cancellation(username, host, jid)
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
146 local roster = load_roster(username, host);
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
147 local item = roster[jid];
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
148 local changed = nil;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
149 if is_contact_pending_out(username, host, jid) then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
150 item.ask = nil;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
151 changed = true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
152 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
153 if item then
172
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
154 if item.subscription == "to" then
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
155 item.subscription = "none";
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
156 changed = true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
157 elseif item.subscription == "both" then
172
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
158 item.subscription = "from";
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
159 changed = true;
172
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
160 end
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
161 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
162 if changed then
1898
1ce02e2f5a3f rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents: 1897
diff changeset
163 return save_roster(username, host, roster);
172
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
164 end
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
165 end
71247788c7c7 Inbound subscription cancellation
Waqas Hussain <waqas20@gmail.com>
parents: 171
diff changeset
166
173
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
167 function process_inbound_unsubscribe(username, host, jid)
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
168 local roster = load_roster(username, host);
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
169 local item = roster[jid];
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
170 local changed = nil;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
171 if is_contact_pending_in(username, host, jid) then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
172 roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty?
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
173 changed = true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
174 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
175 if item then
173
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
176 if item.subscription == "from" then
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
177 item.subscription = "none";
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
178 changed = true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
179 elseif item.subscription == "both" then
173
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
180 item.subscription = "to";
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
181 changed = true;
173
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
182 end
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
183 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
184 if changed then
1898
1ce02e2f5a3f rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents: 1897
diff changeset
185 return save_roster(username, host, roster);
173
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
186 end
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
187 end
f3a2af4d2ff2 Inbound unsubscribe
Waqas Hussain <waqas20@gmail.com>
parents: 172
diff changeset
188
174
f9aff1fc7e99 Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents: 173
diff changeset
189 function is_contact_subscribed(username, host, jid)
f9aff1fc7e99 Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents: 173
diff changeset
190 local roster = load_roster(username, host);
f9aff1fc7e99 Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents: 173
diff changeset
191 local item = roster[jid];
f9aff1fc7e99 Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents: 173
diff changeset
192 return item and (item.subscription == "from" or item.subscription == "both");
f9aff1fc7e99 Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents: 173
diff changeset
193 end
f9aff1fc7e99 Inbound subscription request
Waqas Hussain <waqas20@gmail.com>
parents: 173
diff changeset
194
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
195 function is_contact_pending_in(username, host, jid)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
196 local roster = load_roster(username, host);
177
606c433955e7 Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents: 176
diff changeset
197 return roster.pending and roster.pending[jid];
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
198 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
199 function set_contact_pending_in(username, host, jid, pending)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
200 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
201 local item = roster[jid];
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
202 if item and (item.subscription == "from" or item.subscription == "both") then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
203 return; -- false
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
204 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
205 if not roster.pending then roster.pending = {}; end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
206 roster.pending[jid] = true;
1898
1ce02e2f5a3f rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents: 1897
diff changeset
207 return save_roster(username, host, roster);
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
208 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
209 function is_contact_pending_out(username, host, jid)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
210 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
211 local item = roster[jid];
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
212 return item and item.ask;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
213 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
214 function set_contact_pending_out(username, host, jid) -- subscribe
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
215 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
216 local item = roster[jid];
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
217 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
218 return true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
219 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
220 if not item then
177
606c433955e7 Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents: 176
diff changeset
221 item = {subscription = "none", groups = {}};
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
222 roster[jid] = item;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
223 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
224 item.ask = "subscribe";
177
606c433955e7 Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents: 176
diff changeset
225 log("debug", "set_contact_pending_out: saving roster; set "..username.."@"..host..".roster["..jid.."].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
226 return save_roster(username, host, roster);
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
227 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
228 function unsubscribe(username, host, jid)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
229 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
230 local item = roster[jid];
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
231 if not item then return false; end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
232 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
233 return true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
234 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
235 item.ask = nil;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
236 if item.subscription == "both" then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
237 item.subscription = "from";
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
238 elseif item.subscription == "to" then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
239 item.subscription = "none";
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
240 end
1898
1ce02e2f5a3f rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents: 1897
diff changeset
241 return save_roster(username, host, roster);
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
242 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
243 function subscribed(username, host, jid)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
244 if is_contact_pending_in(username, host, jid) then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
245 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
246 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
247 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
248 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
249 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
250 end
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
251 if item.subscription == "none" then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
252 item.subscription = "from";
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
253 else -- subscription == to
177
606c433955e7 Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents: 176
diff changeset
254 item.subscription = "both";
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
255 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
256 roster.pending[jid] = nil;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
257 -- TODO maybe remove roster.pending if empty
1898
1ce02e2f5a3f rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents: 1897
diff changeset
258 return save_roster(username, host, roster);
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
259 end -- TODO else implement optional feature pre-approval (ask = subscribed)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
260 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
261 function unsubscribed(username, host, jid)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
262 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
263 local item = roster[jid];
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
264 local pending = is_contact_pending_in(username, host, jid);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
265 local changed = nil;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
266 if is_contact_pending_in(username, host, jid) then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
267 roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty?
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
268 changed = true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
269 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
270 if item then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
271 if item.subscription == "from" then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
272 item.subscription = "none";
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
273 changed = true;
267
6303b7454ad0 Some bugs fixed
Waqas Hussain <waqas20@gmail.com>
parents: 193
diff changeset
274 elseif item.subscription == "both" then
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
275 item.subscription = "to";
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
276 changed = true;
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
277 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
278 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
279 if changed then
1898
1ce02e2f5a3f rostermanager: Fixed: Roster version was not being properly updated in some edge cases.
Waqas Hussain <waqas20@gmail.com>
parents: 1897
diff changeset
280 return save_roster(username, host, roster);
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
281 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
282 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
283
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
284 function process_outbound_subscription_request(username, host, jid)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
285 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
286 local item = roster[jid];
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
287 if item and (item.subscription == "none" or item.subscription == "from") then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
288 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
289 return save_roster(username, host, roster);
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
290 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
291 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
292
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
293 --[[function process_outbound_subscription_approval(username, host, jid)
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
294 local roster = load_roster(username, host);
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
295 local item = roster[jid];
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
296 if item and (item.subscription == "none" or item.subscription == "from" then
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
297 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
298 return save_roster(username, host, roster);
176
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
299 end
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
300 end]]
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
301
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
302
e5cd2a03891d Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
303
916
f0743928ef7e core.rostermanager/mod_roster: Support for roster versioning
Matthew Wild <mwild1@gmail.com>
parents: 894
diff changeset
304 return _M;

mercurial