From f5a270b357a76bbbdab6f5bdf4e6c69aad371240 Mon Sep 17 00:00:00 2001
From: John Millikin <jmillikin@gmail.com>
Date: Sat, 20 Jun 2009 22:54:15 +0000
Subject: [PATCH] Change JIDs to be unformatted when shown -- turns out using
 show for formatting was a dumb idea, because it would typecheck even if the
 value was no longer a JID.

---
 Network/Protocol/XMPP/Client.hs | 4 ++--
 Network/Protocol/XMPP/JID.hs    | 5 +----
 Network/Protocol/XMPP/Stream.hs | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Network/Protocol/XMPP/Client.hs b/Network/Protocol/XMPP/Client.hs
index 0d0c546..72f2d58 100644
--- a/Network/Protocol/XMPP/Client.hs
+++ b/Network/Protocol/XMPP/Client.hs
@@ -33,7 +33,7 @@ import qualified Text.XML.HXT.Arrow as A
 import Text.XML.HXT.DOM.TypeDefs (XmlTree)
 import qualified Text.XML.HXT.DOM.XmlNode as XN
 
-import Network.Protocol.XMPP.JID (JID, jidParse)
+import Network.Protocol.XMPP.JID (JID, jidParse, jidFormat)
 import Network.Protocol.XMPP.SASL (Mechanism, bestMechanism)
 import qualified Network.Protocol.XMPP.Stream as S
 import Network.Protocol.XMPP.Util (mkElement, mkQName)
@@ -63,7 +63,7 @@ clientAuthenticate (ConnectedClient serverJID stream) jid username password = do
 		Just m -> m
 	
 	-- TODO: use detected mechanism
-	let saslText = concat [(show jid), "\x00", username, "\x00", password]
+	let saslText = concat [(jidFormat jid), "\x00", username, "\x00", password]
 	let b64Text = encode saslText
 	
 	S.putTree stream $ mkElement ("", "auth")
diff --git a/Network/Protocol/XMPP/JID.hs b/Network/Protocol/XMPP/JID.hs
index c8f48ee..05588d9 100644
--- a/Network/Protocol/XMPP/JID.hs
+++ b/Network/Protocol/XMPP/JID.hs
@@ -33,10 +33,7 @@ module Network.Protocol.XMPP.JID (
 	) where
 
 data JID = JID (Maybe JIDNode) JIDDomain (Maybe JIDResource)
-	deriving (Eq)
-
-instance Show JID where
-	show = jidFormat
+	deriving (Eq, Show)
 
 newtype JIDNode = JIDNode String
 	deriving (Eq, Show)
diff --git a/Network/Protocol/XMPP/Stream.hs b/Network/Protocol/XMPP/Stream.hs
index 700dfbc..7c8948f 100644
--- a/Network/Protocol/XMPP/Stream.hs
+++ b/Network/Protocol/XMPP/Stream.hs
@@ -48,7 +48,7 @@ import qualified Network.GnuTLS as GnuTLS
 import Foreign (allocaBytes)
 import Foreign.C (peekCAStringLen)
 
-import Network.Protocol.XMPP.JID (JID)
+import Network.Protocol.XMPP.JID (JID, jidFormat)
 import Network.Protocol.XMPP.SASL (Mechanism, findMechanism)
 import qualified Network.Protocol.XMPP.Util as Util
 
@@ -116,7 +116,7 @@ beginStream' jid h = do
 	let xmlHeader =
 		"<?xml version='1.0'?>\n" ++
 		"<stream:stream xmlns='jabber:client'" ++
-		" to='" ++ (DOM.attrEscapeXml . show) jid ++ "'" ++
+		" to='" ++ (DOM.attrEscapeXml . jidFormat) jid ++ "'" ++
 		" version='1.0'" ++
 		" xmlns:stream='http://etherx.jabber.org/streams'>"
 	
-- 
2.38.4