From 7d10c19ee5f56da516f252d353f74e82c3d4f8fa Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Mon, 7 Feb 2022 12:59:07 -0700 Subject: [PATCH] swap arguments for loadIcon --- src/Handler/Marketplace.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Handler/Marketplace.hs b/src/Handler/Marketplace.hs index dadd33b..46e7424 100644 --- a/src/Handler/Marketplace.hs +++ b/src/Handler/Marketplace.hs @@ -360,7 +360,7 @@ getPackageListR = do let pkgId = unPkgRecordKey pkgKey manifest <- flip runReaderT settings $ (snd <$> getManifest pkgId pkgVersion) >>= \bs -> runConduit $ bs .| CL.foldMap LBS.fromStrict - icon <- loadIcon pkgVersion pkgId + icon <- loadIcon pkgId pkgVersion deps <- constructDependenciesApiRes dependencies pure $ PackageRes { packageResIcon = encodeBase64 icon -- pass through raw JSON Value, we have checked its correct parsing above @@ -377,12 +377,12 @@ getPackageListR = do constructDependenciesApiRes deps = traverse (\(depKey, depTitle, depVersion) -> do let depId = unPkgRecordKey depKey - icon <- loadIcon depVersion depId + icon <- loadIcon depId depVersion pure (depId, DependencyRes { dependencyResTitle = depTitle, dependencyResIcon = encodeBase64 icon }) ) deps - loadIcon :: (Monad m, MonadResource m, MonadReader r m, Has PkgRepo r) => Version -> PkgId -> m ByteString - loadIcon version pkg = do + loadIcon :: (Monad m, MonadResource m, MonadReader r m, Has PkgRepo r) => PkgId -> Version -> m ByteString + loadIcon pkg version = do (_, _, src) <- getIcon pkg version runConduit $ src .| CL.foldMap id