Clean up compiler warnings.

[dead/halcyon.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index f42f2ce57738a4899005d146bf0700b46c88a377..f6fd170ed1c2073827e33522b675747581b9af83 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -26,13 +26,14 @@ thread_sleep seconds = do
   threadDelay microseconds
 
 
--- |Given a 'Message' and a 'Status', update that message's body and
--- subject with the information contained in the status. Returns the
--- updated message.
-message_from_status :: Message -> Status -> Message
-message_from_status message status =
+-- |Given a 'Message', 'Status', and date, update that message's body
+-- and subject with the information contained in the status. Adds a
+-- /Date: / header, and returns the updated message.
+message_from_status :: Message -> String -> Status -> Message
+message_from_status message date status =
     message { subject = "Twat: " ++ (screen_name (user status)),
-              body    = (pretty_print status) }
+              body    = (pretty_print status),
+              headers = ((headers message) ++ ["Date: " ++ date])}
 
 
 -- |This is the main recursive loop. It takes a username, a
@@ -57,16 +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
-             let messages = map (message_from_status message) 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 ()
 
@@ -136,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.