minor refactors

src/Foundation.hs

@@ -226,7 +226,7 @@ knownTags = -- should not throw exceptions, i.e. no getBy404 or requireAuthId
                  E.&&. course E.^. CourseTerm E.==. E.val tid
                  E.&&. course E.^. CourseShorthand E.==. E.val csh
             return (E.countRows :: E.SqlExpr (E.Value Int64))
-          guardMExceptT (unauthorizedI MsgUnauthorizedLecturer) (c > 0)
+          guardMExceptT (c>0) (unauthorizedI MsgUnauthorizedLecturer)
           return Authorized
       _ -> exceptT return return $ do
           authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
@@ -259,7 +259,7 @@ knownTags = -- should not throw exceptions, i.e. no getBy404 or requireAuthId
            guard $ cid `Set.member` Map.keysSet resMap
            return Authorized
          _ -> do
-           guardMExceptT (unauthorizedI MsgUnauthorizedCorrectorAny) . not $ Map.null resMap
+           guardMExceptT (not $ Map.null resMap) (unauthorizedI MsgUnauthorizedCorrectorAny)
            return Authorized
    )
   ,("time", APDB $ \case
@@ -286,7 +286,7 @@ knownTags = -- should not throw exceptions, i.e. no getBy404 or requireAuthId
                 E.&&. course E.^. CourseTerm E.==. E.val tid
                 E.&&. course E.^. CourseShorthand E.==. E.val csh
            return (E.countRows :: E.SqlExpr (E.Value Int64))
-         guardMExceptT (unauthorizedI MsgUnauthorizedParticipant) (c > 0)
+         guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedParticipant)
          return Authorized
        r -> do
          $logErrorS "AccessControl" $ "'!registered' used on route that doesn't support it: " <> tshow r

src/Utils.hs

@@ -85,7 +85,7 @@ maybeT :: Monad m => m a -> MaybeT m a -> m a
 maybeT x m = runMaybeT m >>= maybe x return
 
 catchIfMaybeT :: (MonadCatch m, Exception e) => (e -> Bool) -> m a -> MaybeT m a
-catchIfMaybeT pred act = catchIf pred (lift act) (const mzero)
+catchIfMaybeT p act = catchIf p (lift act) (const mzero)
 
 ---------------
 -- Exception --
@@ -113,7 +113,7 @@ exceptT :: Monad m => (e -> m b) -> (a -> m b) -> ExceptT e m a -> m b
 exceptT f g = either f g <=< runExceptT
 
 catchIfMExceptT :: (MonadCatch m, Exception e) => (e -> m e') -> (e -> Bool) -> m a -> ExceptT e' m a
-catchIfMExceptT err pred act = catchIf pred (lift act) (throwE <=< lift . err)
+catchIfMExceptT err p act = catchIf p (lift act) (throwE <=< lift . err)
 
 
 ------------

src/Utils/Common.hs

@@ -5,10 +5,10 @@ module Utils.Common where
 -- Common Utility Functions
 
 import Language.Haskell.TH
-import Control.Monad
-import Control.Monad.Trans.Class
-import Control.Monad.Trans.Maybe
-import Control.Monad.Trans.Except
+-- import Control.Monad
+-- import Control.Monad.Trans.Class
+-- import Control.Monad.Trans.Maybe
+-- import Control.Monad.Trans.Except
 
 ------------
 -- Tuples --