Switch to servant 0.19

That has switched from Text to ByteString in appendToQueryString.

Co-authored-by: Nikolai Oplachko <magnickolas@gmail.com>

2 files changed, 15 insertions, 10 deletions

diff --git a/lib/Web/OpenWeatherMap/Types/Location.hs b/lib/Web/OpenWeatherMap/Types/Location.hs
index 85b4ca6..2393641 100644
--- a/lib/Web/OpenWeatherMap/Types/Location.hs
+++ b/lib/Web/OpenWeatherMap/Types/Location.hs
@@ -9,25 +9,28 @@ module Web.OpenWeatherMap.Types.Location
   ( Location(..)
   ) where
 
+import Data.ByteString (ByteString)
 import Data.Proxy (Proxy(..))
-
+import Data.Text (Text)
+import Data.Text.Encoding (encodeUtf8)
 import Servant.API ((:>))
 import Servant.Client (Client, HasClient, clientWithRoute, hoistClientMonad)
-import Servant.Client.Core.Request (appendToQueryString)
-import Web.HttpApiData (toQueryParam)
+import Servant.Client.Core.Request (Request, appendToQueryString)
+import Web.HttpApiData (ToHttpApiData, toQueryParam)
 
 -- | Various ways to specify location.
 data Location
   = Name String -- ^ City name.
   | Coord Double Double -- ^ Geographic coordinates: latitude and longitude.
 
+addParam :: ToHttpApiData a => Text -> a -> Request -> Request
+addParam name = appendToQueryString name . Just . encodeUtf8 . toQueryParam
+
 instance HasClient m api => HasClient m (Location :> api) where
   type Client m (Location :> api) = Location -> Client m api
+  hoistClientMonad pm _ f cl = hoistClientMonad pm (Proxy :: Proxy api) f . cl
   clientWithRoute pm Proxy req loc =
     clientWithRoute pm (Proxy :: Proxy api) (addParams loc req)
     where
-      addParams (Name q) = appendToQueryString "q" (Just $ toQueryParam q)
-      addParams (Coord lat lon) =
-        appendToQueryString "lat" (Just $ toQueryParam lat) .
-        appendToQueryString "lon" (Just $ toQueryParam lon)
-  hoistClientMonad pm _ f cl = hoistClientMonad pm (Proxy :: Proxy api) f . cl
+      addParams (Name q) = addParam "q" q
+      addParams (Coord lat lon) = addParam "lat" lat . addParam "lon" lon
diff --git a/openweathermap.cabal b/openweathermap.cabal
index f410d5e..6dbdfe8 100644
--- a/openweathermap.cabal
+++ b/openweathermap.cabal
@@ -47,11 +47,13 @@ library
     build-depends:
         base >=4.9 && <5,
         aeson -any,
+        bytestring -any,
         http-api-data -any,
         http-client -any,
         servant -any,
-        servant-client >=0.16,
-        servant-client-core -any
+        servant-client >=0.19,
+        servant-client-core -any,
+        text -any
 
 executable openweathermap
     main-is:          Main.hs