Debug prints when a console message should be written.

1 files changed, 13 insertions, 14 deletions

diff --git a/Presence/main.hs b/Presence/main.hs
index f0dfc9bd..9d359292 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -541,20 +541,19 @@ instance JabberPeerSession PeerSession where
             (good_rs,other_rs) = partition (\((_,r),_)->r==rsc') goodtos
 
         -- new behavior that sends to all available resources
-        mapM_ send good_rs
-        mapM_ send other_rs 
-        -- TODO: test good_rs and other_rs for null and handle appropriately
-        {-
-        -- Old behavior that only sends to a single resource
-        case Map.lookup (nto,rsc') cmap of
-            Just (ttypid,clients) -> 
-                forM_ (Map.toList clients) $ \(pid,client) -> do
-                    atomically $ writeTChan (clientChan client) (Chat msg)
-            Nothing            -> 
-                -- todo: fallback
-                return () 
-        -}
-
+        mapM_ send good_rs  -- prefered destination (exact resource match)
+        mapM_ send other_rs -- other clients
+        let msgHere = localizedBody msg
+            msgElsewhere = "you have chat on "++show (snd . fst . head $ other_rs)
+            localizedBody msg = "TODO"
+        case (good_rs,other_rs) of
+            ([],[]) -> consoleMessage rsc' msgHere      -- dump message to console
+            ([],_)  -> consoleMessage rsc' msgElsewhere -- notify: was sent to other tty
+            _       -> return ()
+
+consoleMessage tty str = do
+    debugStr $ L.unpack tty ++ ": "++ str
+    return ()
 
 type RefCount = Int