aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2008-10-25 02:38:24 +0500
committerWaqas Hussain <waqas20@gmail.com>2008-10-25 02:38:24 +0500
commit2ab824859d622653d405e8ea0515e3acca9180f4 (patch)
tree73fe3823eff8a15ce74fabbb36dd18c7f573084e /core
parent6c822abf42a548865e7907f1f02c8e3344580b4d (diff)
downloadprosody-2ab824859d622653d405e8ea0515e3acca9180f4.tar.gz
prosody-2ab824859d622653d405e8ea0515e3acca9180f4.zip
Inbound unsubscribe
Diffstat (limited to 'core')
-rw-r--r--core/rostermanager.lua14
-rw-r--r--core/stanza_router.lua4
2 files changed, 17 insertions, 1 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 3cdbbd3a..83bb379e 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -121,4 +121,18 @@ function process_inbound_subscription_cancellation(username, host, jid)
end
end
+function process_inbound_unsubscribe(username, host, jid)
+ local roster = load_roster(username, host);
+ local item = roster[jid];
+ if item and (item.subscription == "from" or item.subscription == "both") then
+ if item.subscription == "from" then
+ item.subscription = "none";
+ else
+ item.subscription = "to";
+ end
+ item.ask = nil;
+ return datamanager.store(username, host, "roster", roster);
+ end
+end
+
return _M; \ No newline at end of file
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 3126bb75..16658f30 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -209,7 +209,9 @@ function core_route_stanza(origin, stanza)
elseif stanza.attr.type == "subscribe" then
-- TODO
elseif stanza.attr.type == "unsubscribe" then
- -- TODO
+ if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
+ rostermanager.roster_push(node, host, from_bare);
+ end
elseif stanza.attr.type == "subscribed" then
if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
rostermanager.roster_push(node, host, from_bare);