diff options
author | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
commit | f91009f78a46ad74aa62ff487fa297c06a1ae6a3 (patch) | |
tree | 8ef6302fc66fdc48b4f34f58c3bea877d7ee6bee /util/jid.lua | |
parent | 8db68f17623ad29b25c6b5d757a2fb0b3d3005c6 (diff) | |
parent | 8fcbba4b0fccb299121083d97cab065e51fba9d1 (diff) | |
download | prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.tar.gz prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.zip |
Merge with tip.
Diffstat (limited to 'util/jid.lua')
-rw-r--r-- | util/jid.lua | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/util/jid.lua b/util/jid.lua index ccc8309c..b43247cc 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -65,4 +65,17 @@ function prep(jid) return host; end +function join(node, host, resource) + if node and host and resource then + return node.."@"..host.."/"..resource; + elseif node and host then + return node.."@"..host; + elseif host and resource then + return host.."/"..resource; + elseif host then + return host; + end + return nil; -- Invalid JID +end + return _M; |