Commit 6074fc23 authored by Mart Lubbers's avatar Mart Lubbers
Browse files

Merge branch 'master' of

parents fb92f01e 06274599
definition module GenIRC
import StdGeneric
from IRC import :: IRCCommand, :: CSepList
from Data.Either import :: Either
from Data.Maybe import :: Maybe
......@@ -20,7 +20,7 @@ import System.Time
import Control.Applicative
import qualified Control.Monad as CM
import qualified Data.Map as DM
from Control.Monad import class Monad, instance Monad Maybe, >>=
from Control.Monad import class Monad(bind), instance Monad Maybe, >>=
from Text.Encodings.UrlEncoding import urlEncode
import System.CommandLine
import Internet.HTTP
......@@ -115,7 +115,7 @@ Start w
//| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
# (Ok bs) = bs
# (merr, io, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown io (process bs.bs_strftime) w
= (Nothing, w)//= (merr, snd $ fclose io w)
= (merr, snd $ fclose io w)
parseCLI :: [String] -> MaybeErrorString BotSettings
parseCLI [] = Ok
Subproject commit d85bd3c5ccf6fdb82c8f62a08228cc8b6a0ac84f
Subproject commit c4b1f32588aa2c3227e8b369bbd823c1a8b549ca
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment