Tidy

Author: isovector

src/Distribution/Server/Features/PackageCandidates.hs

@@ -285,11 +285,11 @@ candidatesFeature ServerEnv{serverBlobStore = store}
 
         let pvs = [ object [ Key.fromString "version"  .= (T.pack . display . packageVersion . candInfoId) p
                            , Key.fromString "sha256"   .= (blobInfoHashSHA256 . pkgTarballGz) tarball
-                           , Key.fromString "time"     .= (fst) uploadInfo
-                           , Key.fromString "uploader" .= (lupUserName . snd) uploadInfo
+                           , Key.fromString "time"     .= time
+                           , Key.fromString "uploader" .= lupUserName uploader
                            ]
                   | p <- pkgs
-                  , (tarball, uploadInfo, _) <- maybeToList $ pkgLatestTarball $ candPkgInfo p
+                  , (tarball, (time, uploader), _) <- maybeToList $ pkgLatestTarball $ candPkgInfo p
                   ]
 
         return . toResponse . toJSON $ pvs

src/Distribution/Server/Features/Sitemap.hs

@@ -232,9 +232,7 @@ generateSitemap serverBaseURI pageBuildDate alltags pkgIndex docIndex cachedTarI
         [ ( prefixPkgURI ++ display (packageName pkg)
           , uploadtime)
         | pkg <- map head pkgss
-        , let (uploadtime, _user) =
-                -- NOTE this used to be head but now is last
-                pkgLatestUploadInfo pkg
+        , let (uploadtime, _user) = pkgLatestUploadInfo pkg
         ]
         Daily 1.0