oops, fixed body & subject tag namespaces for client.

1 files changed, 12 insertions, 6 deletions

diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index df19f211..2545e063 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -1131,13 +1131,16 @@ xmlifyMessageForClient msg = do
     let mk_str ns jid = toStrict . L.decodeUtf8 $ name jid <$++> "@" <?++> L.fromChunks [head ns] <++?> "/" <++$> resource jid
         to_str   = mk_str tonames   tojid
         from_str = mk_str fromnames fromjid
+        tags = ( "{jabber:client}subject"
+               , "{jabber:client}body" 
+               )
     return $
         [ EventBeginElement "{jabber:client}message" 
             [ attr "from" from_str
             , attr "to"   to_str
             ]
         ]
-        ++ xmlifyMsgElements (msgLangMap msg) ++
+        ++ xmlifyMsgElements tags (msgLangMap msg) ++
         [ EventEndElement "{jabber:client}message" ]
     
 
@@ -1152,22 +1155,25 @@ xmlifyMessageForPeer sock msg = do
                   $ name (msgTo msg) <$++> "@" 
                     <?++> showPeer (RemotePeer remote) <++?> "/" 
                     <++$> resource (msgTo msg)
+        tags = ( "{jabber:server}subject"
+               , "{jabber:server}body" 
+               )
     return $
         [ EventBeginElement "{jabber:server}message" 
             [ attr "from" jidstr
             , attr "to"   tostr
             ]
         ]
-        ++ xmlifyMsgElements (msgLangMap msg) ++
+        ++ xmlifyMsgElements tags (msgLangMap msg) ++
         [ EventEndElement "{jabber:server}message" ]
 
-xmlifyMsgElements langmap = concatMap (uncurry langElements) . Map.toList $ langmap
+xmlifyMsgElements tags langmap = concatMap (uncurry (langElements tags)) . Map.toList $ langmap
 
-langElements lang msg = 
+langElements (subjecttag,bodytag) lang msg = 
     ( maybeToList (msgSubject msg)
-         >>= wrap "{jabber:server}subject" )
+         >>= wrap subjecttag )
     ++ ( maybeToList (msgBody msg)
-         >>= wrap "{jabber:server}body" )
+         >>= wrap bodytag )
     ++ ( Set.toList (msgElements msg)
          >>= wrapTriple )
  where