diff --git a/Clckwrks/Admin/Template.hs b/Clckwrks/Admin/Template.hs --- a/Clckwrks/Admin/Template.hs +++ b/Clckwrks/Admin/Template.hs @@ -32,8 +32,8 @@ template title headers body = do siteName <- (fromMaybe "Your Site") <$> query GetSiteName p <- plugins <$> get - (Just authShowURL) <- getPluginRouteFn p (pluginName authenticatePlugin) - (Just clckShowURL) <- getPluginRouteFn p "clck" + ~(Just authShowURL) <- getPluginRouteFn p (pluginName authenticatePlugin) + ~(Just clckShowURL) <- getPluginRouteFn p "clck" -- let passwordShowURL u = authShowURL (Auth (AuthenticationMethods $ Just (passwordAuthenticationMethod, toPathSegments u))) [] toResponse <$> (unXMLGenT $ [hsx| diff --git a/Clckwrks/Authenticate/Plugin.hs b/Clckwrks/Authenticate/Plugin.hs --- a/Clckwrks/Authenticate/Plugin.hs +++ b/Clckwrks/Authenticate/Plugin.hs @@ -58,7 +58,7 @@ addAuthAdminMenu :: ClckT url IO () addAuthAdminMenu = do p <- plugins <$> get - (Just authShowURL) <- getPluginRouteFn p (pluginName authenticatePlugin) + ~(Just authShowURL) <- getPluginRouteFn p (pluginName authenticatePlugin) addAdminMenu ("Authentication", [(Set.fromList [Visitor] , "Change Password", authShowURL ChangePassword [])]) addAdminMenu ("Authentication", [(Set.fromList [Administrator], "OpenId Realm" , authShowURL OpenIdRealm [])]) @@ -66,7 +66,7 @@ :: ClckPlugins -> IO (Maybe Text) authenticateInit plugins = - do (Just authShowFn) <- getPluginRouteFn plugins (pluginName authenticatePlugin) + do ~(Just authShowFn) <- getPluginRouteFn plugins (pluginName authenticatePlugin) addNavBarCallback plugins (authMenuCallback authShowFn) -- addHandler plugins (pluginName clckPlugin) (authenticateHandler clckShowFn) cc <- getConfig plugins @@ -128,7 +128,7 @@ getUserId :: (Happstack m) => ClckT url m (Maybe UserId) getUserId = do p <- plugins <$> get - (Just (AcidStateAuthenticate authenticateState)) <- getPluginState p (pluginName authenticatePlugin) + ~(Just (AcidStateAuthenticate authenticateState)) <- getPluginState p (pluginName authenticatePlugin) mToken <- getToken authenticateState case mToken of Nothing -> return Nothing diff --git a/Clckwrks/Authenticate/Route.hs b/Clckwrks/Authenticate/Route.hs --- a/Clckwrks/Authenticate/Route.hs +++ b/Clckwrks/Authenticate/Route.hs @@ -24,7 +24,7 @@ case u of (Auth authenticateURL) -> do p <- plugins <$> get - (Just authShowFn) <- getPluginRouteFn p "authenticate" + ~(Just authShowFn) <- getPluginRouteFn p "authenticate" lift $ runRouteT routeAuthenticate (authShowFn . Auth) authenticateURL Login -> loginPage ResetPassword -> resetPasswordPage diff --git a/Clckwrks/Plugin.hs b/Clckwrks/Plugin.hs --- a/Clckwrks/Plugin.hs +++ b/Clckwrks/Plugin.hs @@ -27,7 +27,7 @@ clckInit :: ClckPlugins -> IO (Maybe Text) clckInit plugins = - do (Just clckShowFn) <- getPluginRouteFn plugins (pluginName clckPlugin) + do ~(Just clckShowFn) <- getPluginRouteFn plugins (pluginName clckPlugin) addNavBarCallback plugins clckMenuCallback addHandler plugins (pluginName clckPlugin) (clckHandler clckShowFn) return Nothing @@ -35,7 +35,7 @@ addClckAdminMenu :: ClckT url IO () addClckAdminMenu = do p <- plugins <$> get - (Just clckShowURL) <- getPluginRouteFn p (pluginName clckPlugin) + ~(Just clckShowURL) <- getPluginRouteFn p (pluginName clckPlugin) addAdminMenu ( "Profile" , [ (Set.fromList [Administrator, Visitor], "Edit Your Profile" , clckShowURL (Profile EditProfileData) []) ] diff --git a/Clckwrks/Server.hs b/Clckwrks/Server.hs --- a/Clckwrks/Server.hs +++ b/Clckwrks/Server.hs @@ -57,7 +57,7 @@ (clckState', cc') <- (clckInitHook cc) baseURI clckState cc let p = plugins clckState' hooks <- getPostHooks p - (Just clckShowFn) <- getPluginRouteFn p "clck" + ~(Just clckShowFn) <- getPluginRouteFn p "clck" let showFn = \url params -> clckShowFn url [] clckState'' <- execClckT showFn clckState' $ sequence_ hooks @@ -127,7 +127,7 @@ clckSite :: ClckwrksConfig -> ClckState -> ServerPart Response clckSite cc clckState = - do (Just clckShowFn) <- getPluginRouteFn (plugins clckState) (Text.pack "clck") + do ~(Just clckShowFn) <- getPluginRouteFn (plugins clckState) (Text.pack "clck") evalClckT clckShowFn clckState (pluginsHandler (plugins clckState)) pluginsHandler :: (Functor m, ServerMonad m, FilterMonad Response m, MonadIO m) => diff --git a/clckwrks.cabal b/clckwrks.cabal --- a/clckwrks.cabal +++ b/clckwrks.cabal @@ -1,5 +1,5 @@ Name: clckwrks -Version: 0.24.0.8 +Version: 0.24.0.10 Synopsis: A secure, reliable content management system (CMS) and blogging platform Description: clckwrks (pronounced, clockworks) aims to compete directly with popular PHP-based blogging and CMS @@ -21,7 +21,7 @@ Category: Clckwrks Build-type: Custom Cabal-version: >=1.18 -tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1 +tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1, GHC == 8.6.3 Data-Files: static/admin.css @@ -114,7 +114,7 @@ hsx2hs >= 0.13 && < 0.15, ixset >= 1.0 && < 1.2, jmacro == 0.6.*, - lens >= 4.3 && < 4.17, + lens >= 4.3 && < 4.18, mtl >= 2.0 && < 2.3, old-locale == 1.0.*, process >= 1.0 && < 1.7, @@ -124,7 +124,7 @@ reform-happstack == 0.2.*, reform-hsp >= 0.2 && < 0.3, safecopy >= 0.6, - stm >= 2.2 && <2.5, + stm >= 2.2 && < 2.6, text >= 0.11 && < 1.3, time >= 1.2 && < 1.10, time-locale-compat >= 0.1 && < 0.2,