diff options
Diffstat (limited to 'src/Reaktor')
-rw-r--r-- | src/Reaktor/Config.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Internal.hs (renamed from src/Reaktor/Types.hs) | 2 | ||||
-rw-r--r-- | src/Reaktor/Message.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Parser.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Plugins.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Plugins/Mention.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Plugins/NickServ.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Plugins/Ping.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Plugins/Register.hs | 2 | ||||
-rw-r--r-- | src/Reaktor/Plugins/System.hs | 4 | ||||
-rw-r--r-- | src/Reaktor/Plugins/System/Internal.hs (renamed from src/Reaktor/Plugins/System/Types.hs) | 4 | ||||
-rw-r--r-- | src/Reaktor/Utils.hs | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/src/Reaktor/Config.hs b/src/Reaktor/Config.hs index 8330be9..908f9a8 100644 --- a/src/Reaktor/Config.hs +++ b/src/Reaktor/Config.hs @@ -4,8 +4,8 @@ module Reaktor.Config where import Data.Aeson import qualified Data.HashMap.Lazy as HML import qualified Data.Text as T +import Reaktor.Internal import qualified Reaktor.Plugins -import Reaktor.Types instance FromJSON Config where diff --git a/src/Reaktor/Types.hs b/src/Reaktor/Internal.hs index 7b5e8fa..d3ac9cf 100644 --- a/src/Reaktor/Types.hs +++ b/src/Reaktor/Internal.hs @@ -1,5 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} -module Reaktor.Types (module Reaktor.Types, module X) where +module Reaktor.Internal (module Reaktor.Internal, module X) where import Blessings (Blessings) import Control.Monad.Trans.Class as X (lift) diff --git a/src/Reaktor/Message.hs b/src/Reaktor/Message.hs index c1c7ced..c679d78 100644 --- a/src/Reaktor/Message.hs +++ b/src/Reaktor/Message.hs @@ -2,7 +2,7 @@ module Reaktor.Message where import qualified Data.ByteString.Char8.Extended as BS -import Reaktor.Types +import Reaktor.Internal privmsg :: BS.ByteString -> [BS.ByteString] -> Message diff --git a/src/Reaktor/Parser.hs b/src/Reaktor/Parser.hs index 3baaad7..12d5ace 100644 --- a/src/Reaktor/Parser.hs +++ b/src/Reaktor/Parser.hs @@ -5,7 +5,7 @@ import Control.Applicative import Data.Attoparsec.ByteString.Char8 import qualified Data.ByteString.Char8.Extended as BS import qualified Data.Char -import Reaktor.Types +import Reaktor.Internal prefix :: Parser Prefix diff --git a/src/Reaktor/Plugins.hs b/src/Reaktor/Plugins.hs index 83677bb..86e1f2a 100644 --- a/src/Reaktor/Plugins.hs +++ b/src/Reaktor/Plugins.hs @@ -9,7 +9,7 @@ import qualified Reaktor.Plugins.NickServ import qualified Reaktor.Plugins.Ping import qualified Reaktor.Plugins.Register import qualified Reaktor.Plugins.System -import Reaktor.Types (Plugin) +import Reaktor.Internal (Plugin) get :: T.Text -> Value -> IO Plugin diff --git a/src/Reaktor/Plugins/Mention.hs b/src/Reaktor/Plugins/Mention.hs index a08604c..75de87c 100644 --- a/src/Reaktor/Plugins/Mention.hs +++ b/src/Reaktor/Plugins/Mention.hs @@ -6,8 +6,8 @@ import Control.Monad (when) import Data.Aeson import qualified Data.ByteString.Char8.Extended as BS import qualified Data.Char +import Reaktor.Internal import Reaktor.Message -import Reaktor.Types plugin :: Value -> IO Plugin diff --git a/src/Reaktor/Plugins/NickServ.hs b/src/Reaktor/Plugins/NickServ.hs index caa2301..36b8917 100644 --- a/src/Reaktor/Plugins/NickServ.hs +++ b/src/Reaktor/Plugins/NickServ.hs @@ -9,8 +9,8 @@ import Data.Aeson import Data.Aeson.Types (parseEither) import qualified Data.ByteString.Char8.Extended as BS import GHC.Generics +import Reaktor.Internal import Reaktor.Message -import Reaktor.Types import Reaktor.Utils (randomNick) diff --git a/src/Reaktor/Plugins/Ping.hs b/src/Reaktor/Plugins/Ping.hs index 83b3ac4..de3fe53 100644 --- a/src/Reaktor/Plugins/Ping.hs +++ b/src/Reaktor/Plugins/Ping.hs @@ -3,7 +3,7 @@ module Reaktor.Plugins.Ping (plugin) where import Control.Monad (when) import Data.Aeson (Value(Null)) -import Reaktor.Types +import Reaktor.Internal plugin :: Value -> IO Plugin diff --git a/src/Reaktor/Plugins/Register.hs b/src/Reaktor/Plugins/Register.hs index 48c3ff2..5e987a7 100644 --- a/src/Reaktor/Plugins/Register.hs +++ b/src/Reaktor/Plugins/Register.hs @@ -8,7 +8,7 @@ import Control.Monad (when) import Data.Aeson import qualified Data.ByteString.Char8.Extended as BS import GHC.Generics -import Reaktor.Types +import Reaktor.Internal import Reaktor.Utils (nextNick,randomNick) diff --git a/src/Reaktor/Plugins/System.hs b/src/Reaktor/Plugins/System.hs index 4e659d1..781409b 100644 --- a/src/Reaktor/Plugins/System.hs +++ b/src/Reaktor/Plugins/System.hs @@ -12,8 +12,8 @@ import Data.Aeson import qualified Data.ByteString.Char8.Extended as BS import qualified Data.Map as M import Reaktor.Message -import Reaktor.Plugins.System.Types -import Reaktor.Types +import Reaktor.Internal +import Reaktor.Plugins.System.Internal import System.Environment (getEnvironment) import System.FilePath.Posix (takeBaseName) import System.IO (Handle,hClose,hPutStr,hIsEOF) diff --git a/src/Reaktor/Plugins/System/Types.hs b/src/Reaktor/Plugins/System/Internal.hs index 39d2f75..4a64e0b 100644 --- a/src/Reaktor/Plugins/System/Types.hs +++ b/src/Reaktor/Plugins/System/Internal.hs @@ -1,10 +1,10 @@ {-# LANGUAGE OverloadedStrings #-} -module Reaktor.Plugins.System.Types where +module Reaktor.Plugins.System.Internal where import Data.Aeson import qualified Data.ByteString.Char8.Extended as BS import qualified Data.Map as M -import Reaktor.Types () +import Reaktor.Internal () -- TODO this needs better names :) diff --git a/src/Reaktor/Utils.hs b/src/Reaktor/Utils.hs index 725775e..a31cd15 100644 --- a/src/Reaktor/Utils.hs +++ b/src/Reaktor/Utils.hs @@ -3,7 +3,7 @@ module Reaktor.Utils where import qualified Data.ByteString.Char8.Extended as BS import Data.Char (chr) import Data.Char (isDigit) -import Reaktor.Types +import Reaktor.Internal import System.Random (getStdRandom, randomR) |