@@ -14,7 +14,6 @@ import Data.List (nub)
14import Data.List.NonEmpty (NonEmpty (..))
14import Data.List.NonEmpty (NonEmpty (..))
15import qualified Data.List.NonEmpty as NE
15import qualified Data.List.NonEmpty as NE
16import qualified Data.Map.Strict as M
16import qualified Data.Map.Strict as M
17−import qualified Data.Maybe as MY
18import Data.Monoid
17import Data.Monoid
19import Data.Text (Text)
18import Data.Text (Text)
20import qualified Data.Text as T
19import qualified Data.Text as T
@@ -112,10 +111,14 @@ data Tweet = Tweet { user :: Text
112 , location :: Location }
111 , location :: Location }
113 deriving (Eq, Generic, Show)
112 deriving (Eq, Generic, Show)
115−instance ToJSON Tweet
114+instance ToJSON Tweet where
115+ toJSON = genericToJSON defaultOptions
116−instance FromJSON Tweet
116+instance FromJSON Tweet where
117+ parseJSON = genericParseJSON defaultOptions
117−instance ToJSON Location
118+instance ToJSON Location where
119+ toJSON = genericToJSON defaultOptions
118−instance FromJSON Location
120+instance FromJSON Location where
121+ parseJSON = genericParseJSON defaultOptions
120data ParentMapping = ParentMapping deriving (Eq, Show)
123data ParentMapping = ParentMapping deriving (Eq, Show)
@@ -315,7 +318,7 @@ instance Arbitrary a => Arbitrary (SearchHits a) where
315getSource :: EsResult a -> Maybe a
318getSource :: EsResult a -> Maybe a
316getSource = fmap _source . foundResult
319getSource = fmap _source . foundResult
318−-- grabFirst :: Either String (SearchResult a) -> Either String a
321+grabFirst :: Either String (SearchResult a) -> Either String a
319grabFirst r =
322grabFirst r =
320 case fmap (hitSource . head . hits . searchHits) r of
323 case fmap (hitSource . head . hits . searchHits) r of
321 (Left e) -> Left e
324 (Left e) -> Left e