X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FMain.hs;h=f6fd170ed1c2073827e33522b675747581b9af83;hp=53c3f905e863e9c98537e4b62d5307335b573939;hb=5f1220bd5d1b6893a4e2c0a179b3244a12eae6c8;hpb=76af720585a173aa47e7858964b581fdbf7a01e6

diff --git a/src/Main.hs b/src/Main.hs
index 53c3f90..f6fd170 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -4,7 +4,6 @@ where
 import Control.Concurrent (forkIO, threadDelay)
 import Control.Monad (forever, when)
 import System.Exit (ExitCode(..), exitWith)
-import System.Time (getClockTime)
 import System.IO (hPutStrLn, stderr)
 
 import CommandLine
@@ -59,17 +58,17 @@ recurse username latest_status_id maybe_message = do
         recurse username latest_status_id maybe_message
       _ -> do
         let new_latest_status_id = get_max_status_id new_statuses
-        mapM (putStrLn . pretty_print) new_statuses
+        _ <- mapM (putStrLn . pretty_print) new_statuses
 
         case maybe_message of
           Nothing -> do
              recurse username new_latest_status_id maybe_message
              return ()
           Just message -> do
-             date <- getClockTime
-             let messages = map (message_from_status message (show date)) new_statuses
+             date_header <- construct_date_header
+             let messages = map (message_from_status message (date_header)) new_statuses
              sendmail_results <- mapM sendmail messages
-             mapM print_sendmail_result sendmail_results
+             _ <- mapM print_sendmail_result sendmail_results
              recurse username new_latest_status_id maybe_message
              return ()
 
@@ -139,16 +138,16 @@ main = do
                       case from_address of
                         Nothing -> Nothing
                         Just fromaddr ->
-                            Just (Message { headers = [],
+                            Just (Message { headers = default_headers,
                                             body = "",
                                             subject = "",
                                             to = toaddr,
                                             from = fromaddr })
 
   -- Execute run_twat on each username in a new thread.
-  mapM (forkIO . (run_twat message)) usernames
+  _ <- mapM (forkIO . (run_twat message)) usernames
 
-  forever $ do
+  _ <- forever $ do
     -- This thread (the one executing main) doesn't do anything,
     -- but when it terminates, so do all the threads we forked.
     -- As a result, we need to keep this thread on life support.