some renaming

zachary822 · Nov 29, 2023 · 157c527 · 157c527
1 parent 67b3485
commit 157c527
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/Lib/Types.hs b/app/Lib/Types.hs
@@ -15,13 +15,14 @@ import Database.MongoDB qualified as M
 import GHC.Generics
 import Web.Scotty.Trans
 
-newtype Config = Config
+newtype AppConfig = AppConfig
   { getPool :: Pool Pipe
   }
 
-type ConfigReader = ReaderT Config IO
-type ScottyM = ScottyT ConfigReader
-type ActionM = ActionT ConfigReader
+type AppConfigReaderM m = ReaderT AppConfig m
+type AppConfigReader = AppConfigReaderM IO
+type ScottyM = ScottyT AppConfigReader
+type ActionM = ActionT AppConfigReader
 
 newtype Oid = Oid ObjectId
 

diff --git a/app/Main.hs b/app/Main.hs
@@ -84,7 +84,7 @@ mdToHtml =
           <=< readMarkdown def{readerExtensions = extensionsFromList [Ext_backtick_code_blocks, Ext_raw_html]}
       )
 
-scottySocketT' :: Maybe FilePath -> Options -> (ConfigReader Response -> IO Response) -> ScottyM () -> IO ()
+scottySocketT' :: Maybe FilePath -> Options -> (AppConfigReader Response -> IO Response) -> ScottyM () -> IO ()
 scottySocketT' mpath opts pool app = case mpath of
   Nothing -> do
     scottyOptsT opts pool app
@@ -177,7 +177,7 @@ getCurrentPage page = pageOffset page `div` pageLimit page + 1
 getMaxPage :: (Integral a, Integral b) => a -> Page -> b
 getMaxPage total page = ceiling (fromIntegral total / fromIntegral (pageLimit page) :: Double)
 
-runDb :: (MonadIO m) => Database -> Action IO b -> ActionT (ReaderT Config m) b
+runDb :: (MonadIO m) => Database -> Action IO b -> ActionT (AppConfigReaderM m) b
 runDb dbname q = do
   pool <- getPool <$> lift ask
   liftAndCatchIO $
@@ -203,7 +203,7 @@ main = do
 
   pool <- newPool (defaultPoolConfig (getPipe rs uname passwd) M.close 10 5)
 
-  let f = flip runReaderT Config{getPool = pool}
+  let f = flip runReaderT AppConfig{getPool = pool}
       opts =
         defaultOptions
           { settings =