From a41f01d88bc30c9a26b2558789566d9f8e661fa8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 10 Nov 2012 01:40:50 -0400 Subject: refactor --- Assistant/Threads/XMPPClient.hs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'Assistant') diff --git a/Assistant/Threads/XMPPClient.hs b/Assistant/Threads/XMPPClient.hs index ef97d653a..4d34e7eb8 100644 --- a/Assistant/Threads/XMPPClient.hs +++ b/Assistant/Threads/XMPPClient.hs @@ -96,17 +96,15 @@ xmppClient urlrenderer d = do handle _ (GotNetMessage (NotifyPush us)) = void $ inAssistant $ pull us handle selfjid (GotNetMessage (PairingNotification stage c u)) = maybe noop (inAssistant . pairMsgReceived urlrenderer stage u selfjid) (parseJID c) - handle _ (GotNetMessage m@(CanPush _)) = handlepushmsg m - handle _ (GotNetMessage m@(PushRequest _)) = handlepushmsg m - handle _ (GotNetMessage m@(StartingPush _)) = handlepushmsg m - handle _ (GotNetMessage m) = void $ inAssistant $ queueNetPushMessage m + handle _ (GotNetMessage pushmsg) + | isPushInitiationMessage pushmsg = inAssistant $ + unlessM (queueNetPushMessage pushmsg) $ + void $ forkIO <~> handlePushMessage pushmsg + | otherwise = void $ inAssistant $ queueNetPushMessage pushmsg handle _ (Ignorable _) = noop handle _ (Unknown _) = noop handle _ (ProtocolError _) = noop - handlepushmsg m = inAssistant $ - unlessM (queueNetPushMessage m) $ - void $ forkIO <~> handlePushMessage m data XMPPEvent = GotNetMessage NetMessage -- cgit v1.2.3