Merge with waqas

[prosody.git] / core / discomanager.lua

diff --git a/core/discomanager.lua b/core/discomanager.lua
index 0082343b733851e4b5891f94cda4a1dfa4d28d7b..742907dd5a62cb89d7ec05286a585b9400a108b4 100644 (file)
--- a/core/discomanager.lua
+++ b/core/discomanager.lua
@@ -1,66 +1,66 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
-\r
-local helper = require "util.discohelper".new();\r
-local hosts = hosts;\r
-local jid_split = require "util.jid".split;\r
-local jid_bare = require "util.jid".bare;\r
-local usermanager_user_exists = require "core.usermanager".user_exists;\r
-local rostermanager_is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;\r
-local print = print;\r
-\r
-do\r
-       helper:addDiscoInfoHandler("*host", function(reply, to, from, node)\r
-               if hosts[to] then\r
-                       reply:tag("identity", {category="server", type="im", name="Prosody"}):up();\r
-                       return true;\r
-               end\r
-       end);\r
-       helper:addDiscoInfoHandler("*node", function(reply, to, from, node)\r
-               local node, host = jid_split(to);\r
-               if hosts[host] and rostermanager_is_contact_subscribed(node, host, jid_bare(from)) then\r
-                       reply:tag("identity", {category="account", type="registered"}):up();\r
-                       return true;\r
-               end\r
-       end);\r
+
+local helper = require "util.discohelper".new();
+local hosts = hosts;
+local jid_split = require "util.jid".split;
+local jid_bare = require "util.jid".bare;
+local usermanager_user_exists = require "core.usermanager".user_exists;
+local rostermanager_is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
+local print = print;
+
+do
+       helper:addDiscoInfoHandler("*host", function(reply, to, from, node)
+               if hosts[to] then
+                       reply:tag("identity", {category="server", type="im", name="Prosody"}):up();
+                       return true;
+               end
+       end);
+       helper:addDiscoInfoHandler("*node", function(reply, to, from, node)
+               local node, host = jid_split(to);
+               if hosts[host] and rostermanager_is_contact_subscribed(node, host, jid_bare(from)) then
+                       reply:tag("identity", {category="account", type="registered"}):up();
+                       return true;
+               end
+       end);
        helper:addDiscoItemsHandler("*host", function(reply, to, from, node)
                if hosts[to] and hosts[to].type == "local" then
                        return true;
                end
        end);
-end\r
-\r
-module "discomanager"\r
-\r
-function handle(stanza)\r
-       return helper:handle(stanza);\r
-end\r
-\r
-function addDiscoItemsHandler(jid, func)\r
-       return helper:addDiscoItemsHandler(jid, func);\r
-end\r
-\r
-function addDiscoInfoHandler(jid, func)\r
-       return helper:addDiscoInfoHandler(jid, func);\r
-end\r
-\r
-function set(plugin, var, origin)\r
-       -- TODO handle origin and host based on plugin.\r
-       local handler = function(reply, to, from, node) -- service discovery\r
-               if #node == 0 then\r
-                       reply:tag("feature", {var = var}):up();\r
-                       return true;\r
-               end\r
-       end\r
-       addDiscoInfoHandler("*node", handler);\r
-       addDiscoInfoHandler("*host", handler);\r
-end\r
-\r
-return _M;\r
+end
+
+module "discomanager"
+
+function handle(stanza)
+       return helper:handle(stanza);
+end
+
+function addDiscoItemsHandler(jid, func)
+       return helper:addDiscoItemsHandler(jid, func);
+end
+
+function addDiscoInfoHandler(jid, func)
+       return helper:addDiscoInfoHandler(jid, func);
+end
+
+function set(plugin, var, origin)
+       -- TODO handle origin and host based on plugin.
+       local handler = function(reply, to, from, node) -- service discovery
+               if #node == 0 then
+                       reply:tag("feature", {var = var}):up();
+                       return true;
+               end
+       end
+       addDiscoInfoHandler("*node", handler);
+       addDiscoInfoHandler("*host", handler);
+end
+
+return _M;