X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;fp=src%2FOptionalConfiguration.hs;h=77b3a06d2c42bef78908bdc09827cad73e91988d;hp=600647f7fa37fafff795d9dfee1721cb0ca43d9c;hb=dd4abc21674b98bc55a3775291a8667dffec2863;hpb=93577603f6df06e4627ca13a6f5fe412b28dc817

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 600647f..77b3a06 100644
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -16,12 +16,15 @@ module OptionalConfiguration (
 where
 
 import qualified Data.Configurator as DC
-import qualified Data.Configurator.Types as DCT
+
 import Data.Data (Data)
 import Data.Maybe (fromMaybe)
 import Data.Monoid (Monoid(..))
 import Data.Typeable (Typeable)
 
+import Usernames
+
+
 -- | The same as Cfg, except everything is optional. It's easy to
 --   merge two of these by simply dropping the Nothings in favor of
 --   the Justs. The 'usernames' are left un-maybed so that cmdargs
@@ -39,7 +42,7 @@ data OptionalCfg =
                 from_address :: Maybe String,
                 to_address :: Maybe String,
                 verbose :: Maybe Bool,
-                usernames :: [String] }
+                usernames :: Usernames }
     deriving (Show, Data, Typeable)
 
 instance Monoid OptionalCfg where
@@ -55,7 +58,7 @@ instance Monoid OptionalCfg where
              Nothing
              Nothing
              Nothing
-             []
+             (Usernames [])
 
   cfg1 `mappend` cfg2 =
     OptionalCfg
@@ -80,19 +83,10 @@ instance Monoid OptionalCfg where
 
       -- Use only the latter usernames if there are any.
       all_usernames =
-        usernames $ if (null (usernames cfg2))
+        usernames $ if (null (get_usernames (usernames cfg2)))
                     then cfg1
                     else cfg2
 
-instance DCT.Configured [String] where
-  convert (DCT.List xs) =
-    mapM convert_string xs
-    where
-      convert_string :: DCT.Value -> Maybe String
-      convert_string = DCT.convert
-
-  convert _ = Nothing
-
 from_rc :: IO OptionalCfg
 from_rc = do
   cfg <- DC.load [ DC.Optional "$(HOME)/.twatrc" ]
@@ -121,4 +115,4 @@ from_rc = do
              cfg_from_address
              cfg_to_address
              cfg_verbose
-             (fromMaybe [] cfg_usernames)
+             (fromMaybe (Usernames []) cfg_usernames)