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

util.jid: Use existing join function in jid.prep

Browse source
This commit is contained in:
Kim Alvefur 2014-08-07 17:35:11 +02:00
parent 16dbe1e350
commit 2fc4e2dd51
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
util/jid.lua
View file

@ -65,21 +65,8 @@ local function _prepped_split(jid)
end
prepped_split = _prepped_split;
function prep(jid)
local node, host, resource = _prepped_split(jid);
if host then
if node then
host = node .. "@" .. host;
end
if resource then
host = host .. "/" .. resource;
end
end
return host;
end
function join(node, host, resource)
if not host then return end -- Invalid JID
local function _join(node, host, resource)
if not host then return end
if node and resource then
return node.."@"..host.."/"..resource;
elseif node then
@ -89,6 +76,12 @@ function join(node, host, resource)
end
return host;
end
join = _join;
function prep(jid)
local node, host, resource = _prepped_split(jid);
return _join(node, host, resource);
end
function compare(jid, acl)
-- compare jid to single acl rule