diff options
| author | Kim Alvefur <zash@zash.se> | 2014-08-09 21:48:52 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-08-09 21:48:52 +0200 |
| commit | 8bbf7d4e1f76626a4859167500b5bf287ef3a2c6 (patch) | |
| tree | 24154d31350e9324ccd72bdbc2e102bb48fa13cc /util | |
| parent | edd380b6cd178d2b0eb11b44c659874420393e4c (diff) | |
| parent | 503aba403d99eeedf2cc8ebb6c7df50e983f538d (diff) | |
| download | prosody-8bbf7d4e1f76626a4859167500b5bf287ef3a2c6.tar.gz prosody-8bbf7d4e1f76626a4859167500b5bf287ef3a2c6.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/jid.lua | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/util/jid.lua b/util/jid.lua index 08e63335..27afab3e 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -37,11 +37,7 @@ end split = _split; function bare(jid) - local node, host = _split(jid); - if node and host then - return node.."@"..host; - end - return host; + return jid and match(jid, "^[^/]+"); end local function _prepped_split(jid) @@ -65,30 +61,22 @@ 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 node and host and resource then +local function _join(node, host, resource) + if not host then return end + if node and resource then return node.."@"..host.."/"..resource; - elseif node and host then + elseif node then return node.."@"..host; - elseif host and resource then + elseif resource then return host.."/"..resource; - elseif host then - return host; end - return nil; -- Invalid JID + 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) |