1 files changed, 103 insertions, 103 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index e3dfd32e..f9938570 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -1243,112 +1243,112 @@ applyStanza :: Server PeerAddress ConnectionData releaseKey Event
                      -> XMPPServerParameters
                      -> StanzaWrap (LockedChan Event)
                      -> IO ()
-applyStanza sv quitVar xmpp stanza = do
-            case stanzaOrigin stanza of
-                ClientOrigin k replyto ->
-                    case stanzaType stanza of
-                        RequestResource clientsNameForMe wanted -> do
-                            sockaddr <- socketFromKey sv k
-                            rsc0 <- xmppChooseResourceName xmpp k sockaddr clientsNameForMe wanted
-                            hostname <- xmppTellMyNameToClient xmpp k
-                            let rsc = unsplitJID (n,hostname,r) where (n,_,r) = splitJID rsc0
-                            let reply = iq_bind_reply (stanzaId stanza) rsc
-                            -- sendReply quitVar SetResource reply replyto
-                            let requestVersion :: ConduitT i XML.Event IO ()
-                                requestVersion = do
-                                  yield $ EventBeginElement "{jabber:client}iq"
-                                              [ attr "to" rsc
-                                              , attr "from" hostname
-                                              , attr "type" "get"
-                                              , attr "id" "version"]
-                                  yield $ EventBeginElement "{jabber:iq:version}query" []
-                                  yield $ EventEndElement "{jabber:iq:version}query"
-                                  yield $ EventEndElement "{jabber:client}iq"
-                                  {-
-                                  -- XXX Debug chat:
-                                  yield $ EventBeginElement "{jabber:client}message"
-                                          [ attr "from" $ eventContent (Just [ContentText rsc])
-                                          , attr "type" "normal" ] -- "blackbird" ]
-                                  yield $ EventBeginElement "{jabber:client}body" []
-                                  yield $ EventContent $ ContentText ("hello?")
-                                  yield $ EventEndElement "{jabber:client}body"
-                                  yield $ EventEndElement "{jabber:client}message"
-                                  -}
-                            sendReply quitVar SetResource reply replyto
-                            conduitToStanza (UnrecognizedQuery "{jabber:iq:version}query")
-                                  Nothing -- id
-                                  (Just hostname) -- from
-                                  (Just rsc) -- to
-                                  requestVersion
-                              >>= ioWriteChan replyto
-                        SessionRequest -> do
-                            me <- xmppTellMyNameToClient xmpp k
-                            let reply = iq_session_reply (stanzaId stanza) me
-                            sendReply quitVar Pong reply replyto
-                        RequestRoster -> do
-                            sendRoster stanza xmpp k replyto
-                            xmppSubscribeToRoster xmpp k
-                        PresenceStatus {} -> do
-                            xmppInformClientPresence xmpp k stanza
-                        PresenceRequestSubscription {} -> do
-                            let fail = return () -- todo
-                            xmppClientSubscriptionRequest xmpp fail k stanza replyto
-                        PresenceInformSubscription {} -> do
-                            let fail = return () -- todo
-                            xmppClientInformSubscription xmpp fail k stanza
-                        NotifyClientVersion name version -> do
-                            enableClientHacks name version replyto
-                        UnrecognizedQuery query -> do
-                            me <- xmppTellMyNameToClient xmpp k
-                            let reply = iq_service_unavailable (stanzaId stanza) me query
-                            sendReply quitVar (Error ServiceUnavailable (head reply)) reply replyto
-                        Message {} -> do
-                            -- wlog $ "LANGMAP "++show (stanzaId stanza, msgLangMap (stanzaType stanza))
-                            maybe (return ()) (flip cacheMessageId replyto) $ do
-                                guard . not . null . mapMaybe (msgBody . snd) $ msgLangMap (stanzaType stanza)
-                                stanzaId stanza
-                        _ -> return ()
-                PeerOrigin k replyto ->
-                    case stanzaType stanza of
-                        PresenceRequestStatus {} -> do
-                            xmppAnswerProbe xmpp k stanza replyto
-                        PresenceStatus {} -> do
-                            xmppInformPeerPresence xmpp k stanza
-                        PresenceRequestSubscription {} -> do
-                            let fail = return () -- todo
-                            xmppPeerSubscriptionRequest xmpp fail k stanza replyto
-                        PresenceInformSubscription {} -> do
-                            let fail = return () -- todo
-                            xmppPeerInformSubscription xmpp fail k stanza
-                        _ -> return ()
-                _ -> return ()
+
+applyStanza sv quitVar xmpp stanza = case stanzaOrigin stanza of
+    ClientOrigin k replyto ->
+        case stanzaType stanza of
+            RequestResource clientsNameForMe wanted -> do
+                sockaddr <- socketFromKey sv k
+                rsc0 <- xmppChooseResourceName xmpp k sockaddr clientsNameForMe wanted
+                hostname <- xmppTellMyNameToClient xmpp k
+                let rsc = unsplitJID (n,hostname,r) where (n,_,r) = splitJID rsc0
+                let reply = iq_bind_reply (stanzaId stanza) rsc
+                -- sendReply quitVar SetResource reply replyto
+                let requestVersion :: ConduitT i XML.Event IO ()
+                    requestVersion = do
+                      yield $ EventBeginElement "{jabber:client}iq"
+                                  [ attr "to" rsc
+                                  , attr "from" hostname
+                                  , attr "type" "get"
+                                  , attr "id" "version"]
+                      yield $ EventBeginElement "{jabber:iq:version}query" []
+                      yield $ EventEndElement "{jabber:iq:version}query"
+                      yield $ EventEndElement "{jabber:client}iq"
+                      {-
+                      -- XXX Debug chat:
+                      yield $ EventBeginElement "{jabber:client}message"
+                              [ attr "from" $ eventContent (Just [ContentText rsc])
+                              , attr "type" "normal" ] -- "blackbird" ]
+                      yield $ EventBeginElement "{jabber:client}body" []
+                      yield $ EventContent $ ContentText ("hello?")
+                      yield $ EventEndElement "{jabber:client}body"
+                      yield $ EventEndElement "{jabber:client}message"
+                      -}
+                sendReply quitVar SetResource reply replyto
+                conduitToStanza (UnrecognizedQuery "{jabber:iq:version}query")
+                      Nothing -- id
+                      (Just hostname) -- from
+                      (Just rsc) -- to
+                      requestVersion
+                  >>= ioWriteChan replyto
+            SessionRequest -> do
+                me <- xmppTellMyNameToClient xmpp k
+                let reply = iq_session_reply (stanzaId stanza) me
+                sendReply quitVar Pong reply replyto
+            RequestRoster -> do
+                sendRoster stanza xmpp k replyto
+                xmppSubscribeToRoster xmpp k
+            PresenceStatus {} -> do
+                xmppInformClientPresence xmpp k stanza
+            PresenceRequestSubscription {} -> do
+                let fail = return () -- todo
+                xmppClientSubscriptionRequest xmpp fail k stanza replyto
+            PresenceInformSubscription {} -> do
+                let fail = return () -- todo
+                xmppClientInformSubscription xmpp fail k stanza
+            NotifyClientVersion name version -> do
+                enableClientHacks name version replyto
+            UnrecognizedQuery query -> do
+                me <- xmppTellMyNameToClient xmpp k
+                let reply = iq_service_unavailable (stanzaId stanza) me query
+                sendReply quitVar (Error ServiceUnavailable (head reply)) reply replyto
+            Message {} -> do
+                -- wlog $ "LANGMAP "++show (stanzaId stanza, msgLangMap (stanzaType stanza))
+                maybe (return ()) (flip cacheMessageId replyto) $ do
+                    guard . not . null . mapMaybe (msgBody . snd) $ msgLangMap (stanzaType stanza)
+                    stanzaId stanza
+            _ -> return ()
+    PeerOrigin k replyto ->
+        case stanzaType stanza of
+            PresenceRequestStatus {} -> do
+                xmppAnswerProbe xmpp k stanza replyto
+            PresenceStatus {} -> do
+                xmppInformPeerPresence xmpp k stanza
+            PresenceRequestSubscription {} -> do
+                let fail = return () -- todo
+                xmppPeerSubscriptionRequest xmpp fail k stanza replyto
+            PresenceInformSubscription {} -> do
+                let fail = return () -- todo
+                xmppPeerInformSubscription xmpp fail k stanza
+            _ -> return ()
+    _ -> return ()
 
 forwardStanza :: TMVar () -> XMPPServerParameters -> StanzaWrap (LockedChan Event) -> IO ()
 forwardStanza quitVar xmpp stanza = do
-            let deliver replyto = do
-                    -- TODO: Issuing RecipientUnavailable for all errors is a presence leak
-                    --          and protocol violation
-                    let fail = do
-                            wlog $ "Failed delivery id="++show (stanzaId stanza) -- TODO
-                            reply <- makeErrorStanza stanza
-                            tag <- stanzaFirstTag stanza
-                            sendReply quitVar (Error RecipientUnavailable tag) reply replyto
-                    xmppDeliverMessage xmpp fail stanza
-                    -- -- bad idea:
-                    -- let newStream = greet'' "jabber:client" "blackbird"
-                    -- sendReply quitVar Error newStream replyto
-            case stanzaType stanza of
-                Message {} -> do
-                  case stanzaOrigin stanza of
-                    LocalPeer {} -> return ()
-                    ClientOrigin _ replyto -> deliver replyto
-                    PeerOrigin   _ replyto -> deliver replyto
-                Error {} -> do
-                  case stanzaOrigin stanza of
-                    LocalPeer {} -> return ()
-                    ClientOrigin _ replyto -> deliver replyto
-                    PeerOrigin   _ replyto -> deliver replyto
-                _ -> return ()
+    let deliver replyto = do
+            -- TODO: Issuing RecipientUnavailable for all errors is a presence leak
+            --          and protocol violation
+            let fail = do
+                    wlog $ "Failed delivery id="++show (stanzaId stanza) -- TODO
+                    reply <- makeErrorStanza stanza
+                    tag <- stanzaFirstTag stanza
+                    sendReply quitVar (Error RecipientUnavailable tag) reply replyto
+            xmppDeliverMessage xmpp fail stanza
+            -- -- bad idea:
+            -- let newStream = greet'' "jabber:client" "blackbird"
+            -- sendReply quitVar Error newStream replyto
+    case stanzaType stanza of
+        Message {} -> do
+          case stanzaOrigin stanza of
+            LocalPeer {} -> return ()
+            ClientOrigin _ replyto -> deliver replyto
+            PeerOrigin   _ replyto -> deliver replyto
+        Error {} -> do
+          case stanzaOrigin stanza of
+            LocalPeer {} -> return ()
+            ClientOrigin _ replyto -> deliver replyto
+            PeerOrigin   _ replyto -> deliver replyto
+        _ -> return ()
 
 data ConnectionType = XMPP | Tox
     deriving (Eq,Ord,Enum,Show,Read)