X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FMain.hs;h=b7d7f716a32722431b6d27eee617e9aaa69b31a1;hp=942b512f78716aaf2b62907fd19ec36e6a32809c;hb=d7c6b5499c0969b6e488d9fc583f93bbb4e3d4c7;hpb=4f1ecbb17ed0e0a9506187630374468a46179514

diff --git a/src/Main.hs b/src/Main.hs
index 942b512..b7d7f71 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,31 +1,35 @@
 module Main
 where
 
-import Control.Concurrent (forkIO, threadDelay)
-import Control.Monad (forever, when)
-import Data.Aeson (decode)
-import Data.List ((\\))
-import Data.Maybe (fromMaybe, isNothing)
-import Data.Monoid ((<>))
-import Data.Time.LocalTime (TimeZone, getCurrentTimeZone)
-import System.Exit (ExitCode(..), exitWith)
-import System.IO (hPutStrLn, stderr)
-
-import CommandLine
-import Configuration (Cfg(..), default_config, merge_optional)
-import ExitCodes (exit_no_usernames)
-import qualified OptionalConfiguration as OC
+import Control.Concurrent ( forkIO, threadDelay )
+import Control.Monad ( forever, when )
+import Data.Aeson ( decode )
+import Data.List ( (\\) )
+import Data.Maybe ( fromMaybe, isNothing )
+import Data.Monoid ( (<>) )
+import Data.Time.LocalTime ( TimeZone, getCurrentTimeZone )
+import System.Exit ( ExitCode(..), exitWith )
+import System.IO ( hPutStrLn, stderr )
+
+import CommandLine ( get_args, show_help )
+import Configuration ( Cfg(..), default_config, merge_optional )
+import ExitCodes ( exit_no_usernames )
+import qualified OptionalConfiguration as OC ( from_rc )
 import Mail (
   Message(..),
   default_headers,
   print_sendmail_result,
   rfc822_now,
-  sendmail
-  )
-import Twitter.Http
-import Twitter.Status
-import Twitter.User
-import Usernames (Usernames(..))
+  sendmail )
+import Twitter.Http ( get_user_new_statuses, get_user_timeline )
+import Twitter.Status (
+  Status(..),
+  Timeline,
+  get_max_status_id,
+  pretty_print,
+  utc_time_to_rfc822 )
+import Twitter.User ( User(..) )
+import Usernames ( Usernames(..) )
 
 -- | A wrapper around threadDelay which takes seconds instead of
 --   microseconds as its argument.
@@ -135,7 +139,7 @@ recurse cfg username latest_status_id maybe_message = do
 
       tz <- getCurrentTimeZone
       let mtz = Just tz
-      mapM_ (putStrLn . (pretty_print mtz)) good_statuses
+      mapM_ (putStr . (pretty_print mtz)) good_statuses
 
       send_messages cfg mtz maybe_message good_statuses
 
@@ -210,7 +214,7 @@ main :: IO ()
 main = do
   -- And a Cfg object.
   rc_cfg  <- OC.from_rc
-  cmd_cfg <- apply_args
+  cmd_cfg <- get_args
 
   -- Merge the config file options with the command-line ones,
   -- prefering the command-line ones.