aeson fix

Author: gbaz

src/Distribution/Server/Features/Browse.hs

@@ -9,7 +9,7 @@ import Data.ByteString.Lazy (ByteString)
 import Data.Time (getCurrentTime)
 
 import Data.Aeson (Value(Array), eitherDecode, object, toJSON, (.=))
-import qualified Data.Text as T
+import qualified Data.Aeson.Key as Key
 import qualified Data.Vector as V
 
 import Distribution.Server.Features.Browse.ApplyFilter (applyFilter)
@@ -115,8 +115,8 @@ getNewPkgList CoreFeature{queryGetPackageIndex, coreResource} UserFeature{userRe
   let pageContents = V.slice startIndex numElems (V.fromList listOfPkgs)
   pure . toResponse $
     object
-      [ T.pack "pageContents" .= Array pageContents
-      , T.pack "numberOfResults" .= toJSON (length listOfPkgs)
+      [ Key.fromString "pageContents" .= Array pageContents
+      , Key.fromString "numberOfResults" .= toJSON (length listOfPkgs)
       ]
 
 parseBrowseOptions :: ByteString -> ExceptT ErrorResponse IO BrowseOptions

src/Distribution/Server/Features/Browse/ApplyFilter.hs

@@ -8,7 +8,8 @@ import Data.Time.Clock (UTCTime(utctDay), diffUTCTime)
 import Data.Time.Format.ISO8601 (iso8601Show)
 
 import Data.Aeson (Value, (.=), object)
-import qualified Data.Text as T
+import qualified Data.Aeson.Key as Key
+
 import qualified Data.Set as S
 
 import Distribution.Server.Features.Browse.Options (BrowseOptions(..), Direction(..), Column(..), Sort(..), NormalColumn(..), IsSearch(..))
@@ -33,30 +34,30 @@ applyFilter now isSearch coreResource userResource tagsResource DistroFeature{qu
   packageIndexInfoToValue :: PackageItem -> Value
   packageIndexInfoToValue PackageItem{..} =
     object
-      [ T.pack "name" .= renderPackage itemName
-      , T.pack "downloads" .= itemDownloads
-      , T.pack "votes" .= itemVotes
-      , T.pack "description" .= itemDesc
-      , T.pack "tags" .= map renderTag (S.toAscList itemTags)
-      , T.pack "lastUpload" .= iso8601Show itemLastUpload
-      , T.pack "maintainers" .= map renderUser itemMaintainer
+      [ Key.fromString "name" .= renderPackage itemName
+      , Key.fromString "downloads" .= itemDownloads
+      , Key.fromString "votes" .= itemVotes
+      , Key.fromString "description" .= itemDesc
+      , Key.fromString "tags" .= map renderTag (S.toAscList itemTags)
+      , Key.fromString "lastUpload" .= iso8601Show itemLastUpload
+      , Key.fromString "maintainers" .= map renderUser itemMaintainer
       ]
   renderTag :: Tag -> Value
   renderTag tag =
     object
-      [ T.pack "uri" .= tagUri tagsResource "" tag
-      , T.pack "display" .= display tag
+      [ Key.fromString "uri" .= tagUri tagsResource "" tag
+      , Key.fromString "display" .= display tag
       ]
   renderUser :: UserName -> Value
   renderUser user =
     object
-      [ T.pack "uri" .= userPageUri userResource "" user
-      , T.pack "display" .= display user
+      [ Key.fromString "uri" .= userPageUri userResource "" user
+      , Key.fromString "display" .= display user
       ]
   renderPackage pkg =
     object
-      [ T.pack "uri" .= corePackageNameUri coreResource "" pkg
-      , T.pack "display" .= display pkg
+      [ Key.fromString "uri" .= corePackageNameUri coreResource "" pkg
+      , Key.fromString "display" .= display pkg
       ]
 
   includeItem :: PackageItem -> Filter -> IO Bool