Merge pull request softwarefactory-project#23 from TristanCacqueray/aeson2

Support aeson-2.0

Author: TristanCacqueray

matrix-client/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.4.1
+
+- Support aeson-2.0
+
 ## 0.1.4.0
 
 - Completes The Room API

matrix-client/matrix-client.cabal

@@ -31,7 +31,7 @@ source-repository head
 common common-options
   build-depends:       base                   >= 4.11.0.0 && < 5
                      , aeson-casing           >= 0.2.0.0  && < 0.3.0.0
-                     , aeson                  >= 1.0.0.0  && < 1.6
+                     , aeson                  >= 1.0.0.0  && < 2.1
   ghc-options:         -Wall
                        -Wcompat
                        -Widentities

matrix-client/src/Network/Matrix/Identity.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 
@@ -40,6 +41,9 @@ import Data.Aeson (FromJSON (..), Value (Object, String), encode, object, (.:),
 import Data.ByteString.Lazy (fromStrict)
 import Data.ByteString.Lazy.Base64.URL (encodeBase64Unpadded)
 import Data.Digest.Pure.SHA (bytestringDigest, sha256)
+#if MIN_VERSION_aeson(2,0,0)
+import qualified Data.Aeson.KeyMap as KeyMap
+#endif
 import qualified Data.HashMap.Strict as HM
 import Data.List (lookup)
 import Data.List.NonEmpty (NonEmpty)
@@ -50,6 +54,14 @@ import Data.Text.Lazy (toStrict)
 import qualified Network.HTTP.Client as HTTP
 import Network.Matrix.Internal
 
+#if MIN_VERSION_aeson(2,0,0)
+toKVList :: KeyMap.KeyMap v -> [(Text, v)]
+toKVList = HM.toList . KeyMap.toHashMapText
+#else
+toKVList :: HM.HashMap Text v -> [(Text, v)]
+toKVList = HM.toList
+#endif
+
 -- $setup
 -- >>> import Data.Aeson (decode)
 
@@ -123,7 +135,7 @@ instance FromJSON IdentityLookupResponse where
   parseJSON (Object v) = do
     mappings <- v .: "mappings"
     case mappings of
-      (Object kv) -> pure . IdentityLookupResponse $ mapMaybe toTuple (HM.toList kv)
+      (Object kv) -> pure . IdentityLookupResponse $ mapMaybe toTuple (toKVList kv)
       _ -> mzero
     where
       toTuple (k, String s) = Just (HashedAddress k, UserID s)