Merge 0.6->0.7

[prosody.git] / plugins / mod_pubsub.lua

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index b8f7a882ccaf43ce86368899af6fca0794e56a87..fd307583c94ca1ad077e22d9e6ce9bd1cf05fc84 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -9,6 +9,8 @@ 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;
 
@@ -108,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
@@ -129,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
@@ -223,7 +219,7 @@ 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;
@@ -365,4 +361,4 @@ set_service(pubsub.new({
        get_affiliation = get_affiliation;
        
        normalize_jid = jid_bare;
-}));
+}));
\ No newline at end of file