diff options
author | Julien Dessaux | 2009-08-06 00:09:56 +0200 |
---|---|---|
committer | Julien Dessaux | 2009-08-06 00:09:56 +0200 |
commit | 45ebb68aa03ff7a292f46048141949c12cf90f91 (patch) | |
tree | fe336511aa80bcdddff64894bdb865359f6d7f18 | |
parent | Wrote a dynamic compilation stuff that works (unable to test reboot yet) (diff) | |
download | hsbot-45ebb68aa03ff7a292f46048141949c12cf90f91.tar.gz hsbot-45ebb68aa03ff7a292f46048141949c12cf90f91.tar.bz2 hsbot-45ebb68aa03ff7a292f46048141949c12cf90f91.zip |
renamed "Server" algebraic data type to "IrcServer"
-rw-r--r-- | Config.hs | 4 | ||||
-rw-r--r-- | Hsbot/Core.hs | 8 | ||||
-rw-r--r-- | Hsbot/IRC.hs | 6 |
3 files changed, 9 insertions, 9 deletions
@@ -7,7 +7,7 @@ import Hsbot.Core -- | Imported plugins goes there -- | User server -kro = Server +kro = IrcServer { address = "kro.corp" , port = 6667 , channels = ["#geek"] @@ -21,6 +21,6 @@ kro = Server config :: Config config = Config { commandPrefixes = ['@'] - , servers = [kro] + , ircServers = [kro] } diff --git a/Hsbot/Core.hs b/Hsbot/Core.hs index 153ce77..b2e34c8 100644 --- a/Hsbot/Core.hs +++ b/Hsbot/Core.hs @@ -1,7 +1,7 @@ module Hsbot.Core ( Bot(..) , Config(..) - , Server(..) + , IrcServer(..) , newbot ) where @@ -10,17 +10,17 @@ import System.IO (Handle) -- | An IRC Bot server state (socket handles) data Bot = Bot - { joinedServers :: M.Map Server Handle -- servers we are connected to + { joinedServers :: M.Map IrcServer Handle -- servers we are connected to } deriving (Eq, Show) -- | Configuration data type data Config = Config { commandPrefixes :: String, -- command prefixes, for example @[\'>\',\'@\',\'?\']@ - servers :: [Server] -- list of 'Server's to connect to + ircServers :: [IrcServer] -- list of 'Server's to connect to } deriving (Eq,Show) -- | An IRC server -data Server = Server +data IrcServer = IrcServer { address :: String -- the server's address , port :: Int -- the server's port , channels :: [String] -- a list of channels to join diff --git a/Hsbot/IRC.hs b/Hsbot/IRC.hs index 094cb3f..6ff1013 100644 --- a/Hsbot/IRC.hs +++ b/Hsbot/IRC.hs @@ -22,9 +22,9 @@ data IrcInput = Cmd User Channel (Command, Maybe String) -- a regular command -- | Data that can go over the remote channel data IrcOutput = Str String -- a regular string - | Quit (Server, Handle) -- a quit message from a server - | Join (Server, Channel) -- joined a channel - | Part (Server, Channel) -- parted the channel + | Quit (IrcServer, Handle) -- a quit message from a server + | Join (IrcServer, Channel) -- joined a channel + | Part (IrcServer, Channel) -- parted the channel | Reboot -- reboot message sent | Nil -- signifies thread death, only happens after reboot deriving (Eq,Show) |