diff options
Diffstat (limited to 'Notmuch')
| -rw-r--r-- | Notmuch/Message.hs | 6 | ||||
| -rw-r--r-- | Notmuch/SearchResult.hs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Notmuch/Message.hs b/Notmuch/Message.hs index d0bb788..d08be39 100644 --- a/Notmuch/Message.hs +++ b/Notmuch/Message.hs @@ -102,7 +102,7 @@ instance FromJSON Message where <*> v .: "tags" <*> v .: "filename" parseJSON (Array _) = return $ Message (MessageID "") defTime M.empty [] True False [] "" - where defTime = UTCTime (ModifiedJulianDay 0) (fromInteger 0) + where defTime = UTCTime (ModifiedJulianDay 0) 0 parseJSON x = fail $ "Error parsing message: " ++ show x hasTag :: T.Text -> Message -> Bool @@ -110,10 +110,10 @@ hasTag tag = (tag `elem`) . messageTags -data Thread = Thread { threadForest :: TR.Forest Message } +newtype Thread = Thread { threadForest :: TR.Forest Message } instance FromJSON Thread where - parseJSON (Array vs) = Thread <$> (mapM parseTree $ V.toList vs) + parseJSON (Array vs) = Thread <$> mapM parseTree (V.toList vs) parseJSON _ = fail "Thread is not an array" parseTree :: Value -> Parser (TR.Tree Message) diff --git a/Notmuch/SearchResult.hs b/Notmuch/SearchResult.hs index 94bfecf..a59fa9c 100644 --- a/Notmuch/SearchResult.hs +++ b/Notmuch/SearchResult.hs @@ -38,7 +38,7 @@ instance HasNotmuchId SearchResult where instance FromJSON SearchResult where - parseJSON (Object v) = SearchResult <$> ((ThreadID . ("thread:"++)) <$> v .: "thread") + parseJSON (Object v) = SearchResult <$> (ThreadID . ("thread:"++) <$> v .: "thread") <*> (posixSecondsToUTCTime . fromInteger <$> v .: "timestamp") <*> v .: "date_relative" <*> v .:? "subject" .!= "" |