Merge 0.6->0.7

[prosody.git] / plugins / mod_pubsub.lua

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 09845962c8144eccc318c56d5382288fa5026aa9..fd307583c94ca1ad077e22d9e6ce9bd1cf05fc84 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -3,14 +3,14 @@ local st = require "util.stanza";
 local jid_bare = require "util.jid".bare;
 local uuid_generate = require "util.uuid".generate;
 
-require "core.modulemanager".load(module.host, "iq");
-
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
 
 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false);
 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false);
+local pubsub_disco_name = module:get_option("name");
+if type(pubsub_disco_name) ~= "string" then pubsub_disco_name = "Prosody PubSub Service"; end
 
 local service;
 
@@ -67,6 +67,21 @@ function handlers.get_items(origin, stanza, items)
        return origin.send(reply);
 end
 
+function handlers.get_subscriptions(origin, stanza, subscriptions)
+       local node = subscriptions.attr.node;
+       local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from);
+       if not ok then
+               return origin.send(pubsub_error_reply(stanza, ret));
+       end
+       local reply = st.reply(stanza)
+               :tag("pubsub", { xmlns = xmlns_pubsub })
+                       :tag("subscriptions");
+       for _, sub in ipairs(ret) do
+               reply:tag("subscription", { node = sub.node, jid = sub.jid, subscription = 'subscribed' }):up();
+       end
+       return origin.send(reply);
+end
+
 function handlers.set_create(origin, stanza, create)
        local node = create.attr.node;
        local ok, ret, reply;
@@ -95,9 +110,6 @@ end
 
 function handlers.set_subscribe(origin, stanza, subscribe)
        local node, jid = subscribe.attr.node, subscribe.attr.jid;
-       if jid_bare(jid) ~= jid_bare(stanza.attr.from) then
-               return origin.send(pubsub_error_reply(stanza, "invalid-jid"));
-       end
        local ok, ret = service:add_subscription(node, stanza.attr.from, jid);
        local reply;
        if ok then
@@ -116,9 +128,6 @@ end
 
 function handlers.set_unsubscribe(origin, stanza, unsubscribe)
        local node, jid = unsubscribe.attr.node, unsubscribe.attr.jid;
-       if jid_bare(jid) ~= jid_bare(stanza.attr.from) then
-               return origin.send(pubsub_error_reply(stanza, "invalid-jid"));
-       end
        local ok, ret = service:remove_subscription(node, stanza.attr.from, jid);
        local reply;
        if ok then
@@ -210,15 +219,30 @@ end
 
 local function build_disco_info(service)
        local disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" })
-               :tag("identity", { category = "pubsub", type = "service" }):up()
+               :tag("identity", { category = "pubsub", type = "service", name = pubsub_disco_name }):up()
                :tag("feature", { var = "http://jabber.org/protocol/pubsub" }):up();
        add_disco_features_from_service(disco_info, service);
        return disco_info;
 end
 
 module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function (event)
-       event.origin.send(st.reply(event.stanza):add_child(disco_info));
-       return true;
+       local origin, stanza = event.origin, event.stanza;
+       local node = stanza.tags[1].attr.node;
+       if not node then
+               return origin.send(st.reply(stanza):add_child(disco_info));
+       else
+               local ok, ret = service:get_nodes(stanza.attr.from);
+               if ok and not ret[node] then
+                       ok, ret = false, "item-not-found";
+               end
+               if not ok then
+                       return origin.send(pubsub_error_reply(stanza, ret));
+               end
+               local reply = st.reply(stanza)
+                       :tag("query", { xmlns = "http://jabber.org/protocol/disco#info", node = node })
+                               :tag("identity", { category = "pubsub", type = "leaf" });
+               return origin.send(reply);
+       end
 end);
 
 local function handle_disco_items_on_node(event)
@@ -231,7 +255,7 @@ local function handle_disco_items_on_node(event)
        end
        
        local reply = st.reply(stanza)
-               :tag("query", { xmlns = xmlns_disco_items });
+               :tag("query", { xmlns = "http://jabber.org/protocol/disco#items", node = node });
        
        for id, item in pairs(ret) do
                reply:tag("item", { jid = module.host, name = id }):up();
@@ -292,11 +316,13 @@ set_service(pubsub.new({
                        subscribe = true;
                        unsubscribe = true;
                        get_subscription = true;
+                       get_subscriptions = true;
                        get_items = true;
                        
                        subscribe_other = false;
                        unsubscribe_other = false;
                        get_subscription_other = false;
+                       get_subscriptions_other = false;
                        
                        be_subscribed = true;
                        be_unsubscribed = true;
@@ -312,12 +338,14 @@ set_service(pubsub.new({
                        subscribe = true;
                        unsubscribe = true;
                        get_subscription = true;
+                       get_subscriptions = true;
                        get_items = true;
                        
                        
                        subscribe_other = true;
                        unsubscribe_other = true;
                        get_subscription_other = true;
+                       get_subscriptions_other = true;
                        
                        be_subscribed = true;
                        be_unsubscribed = true;
@@ -333,4 +361,4 @@ set_service(pubsub.new({
        get_affiliation = get_affiliation;
        
        normalize_jid = jid_bare;
-}));
+}));
\ No newline at end of file