Change modules to use the new add_feature module API method.

[prosody.git] / util / jid.lua

diff --git a/util/jid.lua b/util/jid.lua
index 9d01e2afa4966f2b2676fda15415f06b678b268d..6c387868f5adcba7a082d16a2f9e92457b4e84b6 100644 (file)
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -1,8 +1,44 @@
+-- Prosody IM v0.1
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--
+
+
 
 local match = string.match;
 
 module "jid"
 
 function split(jid)
-       return match(jid, "^([^@]+)@([^/]+)/?(.*)$");
+       if not jid then return; end
+       local node, nodepos = match(jid, "^([^@]+)@()");
+       local host, hostpos = match(jid, "^([^@/]+)()", nodepos)
+       if node and not host then return nil, nil, nil; end
+       local resource = match(jid, "^/(.+)$", hostpos);
+       if (not host) or ((not resource) and #jid >= hostpos) then return nil, nil, nil; end
+       return node, host, resource;
 end
+
+function bare(jid)
+       local node, host = split(jid);
+       if node and host then
+               return node.."@"..host;
+       end
+       return host;
+end
+
+return _M;