1 files changed, 15 insertions, 3 deletions

diff --git a/main.hs b/main.hs
index 04acafc..8845d3f 100755
--- a/main.hs
+++ b/main.hs
@@ -44,11 +44,23 @@ import Control.Monad
 import Control.Monad.Reader (ask)
 import Control.Monad.State (get, put)
 import Data.Maybe (isJust)
-import Data.Text (Text, pack, unpack)
+import Data.Text (Text, pack, unpack, isPrefixOf)
 import Yesod hiding (Number, Update, update, get)
 import Network.HTTP.Types.Status (status400, status200)
 import Data.Aeson hiding (Number)
 
+----------------------------------------------------------------------
+-- | Parser for standardizing phone number format
+
+-- To properly implement this, I would use libphonenumber
+parsePhoneNumber :: Text -> Text
+parsePhoneNumber = countryCode . pack . stripInvalidChars . unpack
+  where
+    stripInvalidChars :: String -> String
+    countryCode :: Text -> Text
+    stripInvalidChars cs = [ c | c <- cs, not $ elem c (".()- " :: String) ]
+    countryCode t = if (isPrefixOf "+" t) then t else ("+1" <> t)
+
 --------------------------------------------------------------------
 -- | Here be the state and data model stuff.
 
@@ -90,7 +102,7 @@ $(deriveSafeCopy 0 'base ''Context)
 instance Indexable Caller where
   empty = ixSet [ ixFun $ (:[]) . callerId
                 , ixFun $ \c -> [ Name $ name c ]
-                , ixFun $ \c -> [ PhoneNumber $ number c ]
+                , ixFun $ \c -> [ PhoneNumber $ parsePhoneNumber $ number c ]
                 , ixFun $ \c -> [ Context $ context c ]
                 ]
 
@@ -122,7 +134,7 @@ addCaller name number context = do
   db@Database{..} <- get
   let caller = Caller { callerId = nextCallerId
                       , name = name
-                      , number = number
+                      , number = parsePhoneNumber number
                       , context = context }
   put $ db { nextCallerId = succ nextCallerId
            , callers = IxSet.insert caller callers