Cleanup
This commit is contained in:
parent
092bde3987
commit
2d1098c1cd
@ -34,10 +34,13 @@ library
|
||||
, exceptions
|
||||
hs-source-dirs: src
|
||||
default-language: Haskell2010
|
||||
ghc-options: -Wall
|
||||
|
||||
executable demobot
|
||||
main-is: Main.hs
|
||||
other-modules: Extensions
|
||||
, Extension.Hello
|
||||
, AppM
|
||||
-- other-extensions:
|
||||
build-depends: base >=4.11 && <4.12
|
||||
, demobot
|
||||
@ -49,3 +52,4 @@ executable demobot
|
||||
, exceptions
|
||||
hs-source-dirs: src
|
||||
default-language: Haskell2010
|
||||
ghc-options: -Wall
|
||||
|
@ -9,6 +9,7 @@ let
|
||||
ghcid
|
||||
cabal-install
|
||||
hasktags
|
||||
hlint
|
||||
(ghcWithPackages (_: demobot.buildInputs ++ demobot.propagatedBuildInputs))
|
||||
nixpkgs.binutils-unwrapped
|
||||
];
|
||||
|
@ -8,7 +8,6 @@ import Bot.DSL
|
||||
import Control.Monad.Catch (MonadCatch, MonadThrow)
|
||||
import Control.Monad.Logger
|
||||
import Control.Monad.Trans (MonadIO, liftIO)
|
||||
import Data.Text (Text)
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.Text.IO as T
|
||||
import qualified Data.Time as Time
|
||||
@ -23,7 +22,7 @@ instance MonadNetwork AppM where
|
||||
putMsg Response{..} = liftIO . T.putStrLn $ content
|
||||
|
||||
instance MonadData AppM where
|
||||
putData key val = liftIO $ T.putStrLn $ "Would put " <> T.pack key <> " = " <> (T.pack $ show val)
|
||||
putData key val = liftIO $ T.putStrLn $ "Would put " <> T.pack key <> " = " <> T.pack (show val)
|
||||
getData key = liftIO (T.putStrLn $ "Would fetch " <> T.pack key) >> return Nothing
|
||||
|
||||
instance MonadTime AppM where
|
||||
|
@ -1,6 +1,6 @@
|
||||
{-# Language Safe #-}
|
||||
{-# Language RankNTypes #-}
|
||||
{-# Language GADTs #-}
|
||||
{-# LANGUAGE GADTs #-}
|
||||
{-# LANGUAGE RankNTypes #-}
|
||||
{-# LANGUAGE Safe #-}
|
||||
module Bot.Extension where
|
||||
|
||||
import Bot.DSL
|
||||
|
@ -1,4 +1,3 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE Safe #-}
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
{-# LANGUAGE TypeFamilies #-}
|
||||
@ -9,10 +8,9 @@ import Bot.DSL
|
||||
import Bot.Extension
|
||||
import Bot.Log
|
||||
import Control.Monad (forever)
|
||||
import Control.Monad.Catch (MonadCatch, SomeException, catch, try)
|
||||
import Control.Monad.Catch (MonadCatch, SomeException, catch)
|
||||
import Data.Maybe (catMaybes)
|
||||
import qualified Data.Text as T
|
||||
import GHC.Stack
|
||||
|
||||
tshow :: Show a => a -> T.Text
|
||||
tshow = T.pack . show
|
||||
@ -25,5 +23,5 @@ mainLoop extensions = forever $ catch go handleFail
|
||||
go :: m ()
|
||||
go = do
|
||||
msg <- recvMsg
|
||||
responses <- catMaybes <$> mapM (\ext -> (act ext) msg) extensions
|
||||
responses <- catMaybes <$> mapM (`act` msg) extensions
|
||||
mapM_ putMsg responses
|
||||
|
@ -1,10 +1,10 @@
|
||||
{-# Language RecordWildCards #-}
|
||||
{-# Language OverloadedStrings #-}
|
||||
{-# Language ScopedTypeVariables #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE RecordWildCards #-}
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
module Extension.Hello where
|
||||
|
||||
import Bot.Extension
|
||||
import Bot.DSL
|
||||
import Bot.Extension
|
||||
import qualified Data.Text as T
|
||||
|
||||
extension :: Extension ()
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
module Extensions where
|
||||
|
||||
import Bot.DSL
|
||||
import Bot.Extension
|
||||
import qualified Extension.Hello as Hello
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user