diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
| commit | 8862e1b27eb767c99a068d13bd15c77c2c9e1471 (patch) | |
| tree | 067f338a5f8e31a6b1fb6ca706562a044af80024 /util/jid.lua | |
| parent | 87ff54c75266ffa37f716d1c7a542e956bbe54b3 (diff) | |
| parent | 5d9b9b6b30f06a3e3aa957279357dd42ae19ddf4 (diff) | |
| download | prosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.tar.gz prosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.zip | |
Merge 0.6.2/waqas with 0.6.2/MattJ
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; |