1 files changed, 6 insertions, 5 deletions

diff --git a/xmppServer.hs b/xmppServer.hs
index b5d54344..64d34ff6 100644
--- a/xmppServer.hs
+++ b/xmppServer.hs
@@ -36,14 +36,15 @@ import UTmp (ProcessID,users)
 import LocalPeerCred
 import XMPPServer
 
-unsplitJID (n,h,r) = jid
- where
-    jid0 = maybe h (\n->n<>"@"<>h) n
-    jid = maybe jid0 (\r->jid0<>"/"<>r) r
-
 type UserName = Text
 type ResourceName = Text
 
+unsplitJID :: (Maybe UserName,Text,Maybe ResourceName) -> Text
+unsplitJID (n,h,r) = username <> h <> resource
+ where
+    username = maybe "" (<>"@") n
+    resource = maybe "" ("/"<>) r
+
 splitJID :: Text -> (Maybe UserName,Text,Maybe ResourceName)
 splitJID bjid = 
     let xs = splitAll '@' bjid