mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.jid: Eliminate global method use

Browse source
This commit is contained in:
Waqas Hussain 2009-05-16 03:56:51 +05:00
parent 58fd907dac
commit b199ffcb60
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
util/jid.lua
View file

@ -15,7 +15,7 @@ local resourceprep = require "util.encodings".stringprep.resourceprep;
module "jid" module "jid"
function split(jid) local function _split(jid)
if not jid then return; end if not jid then return; end
local node, nodepos = match(jid, "^([^@]+)@()"); local node, nodepos = match(jid, "^([^@]+)@()");
local host, hostpos = match(jid, "^([^@/]+)()", nodepos) local host, hostpos = match(jid, "^([^@/]+)()", nodepos)
@ -24,17 +24,18 @@ function split(jid)
if (not host) or ((not resource) and #jid >= hostpos) then return nil, nil, nil; end if (not host) or ((not resource) and #jid >= hostpos) then return nil, nil, nil; end
return node, host, resource; return node, host, resource;
end end
split = _split;
function bare(jid) function bare(jid)
local node, host = split(jid); local node, host = _split(jid);
if node and host then if node and host then
return node.."@"..host; return node.."@"..host;
end end
return host; return host;
end end
function prepped_split(jid) local function _prepped_split(jid)
local node, host, resource = split(jid); local node, host, resource = _split(jid);
if host then if host then
host = nameprep(host); host = nameprep(host);
if not host then return; end if not host then return; end
@ -49,9 +50,10 @@ function prepped_split(jid)
return node, host, resource; return node, host, resource;
end end
end end
prepped_split = _prepped_split;
function prep(jid) function prep(jid)
local node, host, resource = prepped_split(jid); local node, host, resource = _prepped_split(jid);
if host then if host then
if node then if node then
host = node .. "@" .. host; host = node .. "@" .. host;