From 600fb00c6372439918617ec75ab509810aa6f7f7 Mon Sep 17 00:00:00 2001 From: nek0 Date: Fri, 15 Apr 2022 21:06:18 +0200 Subject: [PATCH] fix last errors --- src/Control/Journal.hs | 2 +- src/Control/Product.hs | 2 +- src/Util.hs | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Control/Journal.hs b/src/Control/Journal.hs index 84e758d..1d925f8 100644 --- a/src/Control/Journal.hs +++ b/src/Control/Journal.hs @@ -10,7 +10,7 @@ import Control.Monad.Reader (asks) import Types import Model.Journal -import Control.Role (checkCapability) +import Util journalShow :: Maybe (Int, AuthMethod) diff --git a/src/Control/Product.hs b/src/Control/Product.hs index 74b665f..7b94adb 100644 --- a/src/Control/Product.hs +++ b/src/Control/Product.hs @@ -15,7 +15,7 @@ import Data.Maybe (fromMaybe, isJust) import Types import Model -import Control.Role (checkCapability) +import Util productNew :: Maybe (Int, AuthMethod) diff --git a/src/Util.hs b/src/Util.hs index d4bd3dd..8f00829 100644 --- a/src/Util.hs +++ b/src/Util.hs @@ -9,7 +9,7 @@ import Opaleye import Data.ByteString.Lazy (fromStrict) -import Data.Maybe (fromMaybe) +import Data.Maybe (fromMaybe, fromJust) import Data.Profunctor.Product.Default (Default) @@ -21,7 +21,7 @@ import qualified Data.Text.Encoding as E import Database.PostgreSQL.Simple -import Control.Monad (void) +import Control.Monad (void, filterM) import Control.Monad.Reader (asks) import Control.Monad.IO.Class (liftIO) @@ -111,17 +111,17 @@ sendAdminNotification sendAdminNotification subject message = do conn <- asks rsConnection allUsers <- userDetailsSelectAll conn - admins <- mapM - (\uid -> checkCapability uid roleCanManageSettings. userDetailsId) + admins <- filterM + ((`checkCapability` roleCanManageSettings) . userDetailsId) allUsers mapM_ - (\ UserDetails {..} -> + (\ UserDetails{..} -> let mail = Mail { mailFrom = Address Nothing "noreply" , mailTo = [ Address (Just userDetailsIdent) - userDetailsEmail + (fromJust userDetailsEmail) ] , mailCc = [] , mailBcc =[] @@ -132,7 +132,7 @@ sendAdminNotification subject message = do , partEncoding = None , partDisposition = DefaultDisposition , partHeaders = [] - , partContent = PartContent (fromString $ E.encodeUtf8 message) + , partContent = PartContent (fromString $ T.unpack message) } ]] }