summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Dessaux2010-07-04 01:35:47 +0200
committerJulien Dessaux2010-07-04 01:35:47 +0200
commit116c655fdc9ad68124cffd4d4d99585597f1f8a4 (patch)
treecff25e9f1ce8fd2e6abdca5c3324afc27d1d76ac
parentMoved files around as a preliminary for architectural changes. (diff)
downloadhsbot-116c655fdc9ad68124cffd4d4d99585597f1f8a4.tar.gz
hsbot-116c655fdc9ad68124cffd4d4d99585597f1f8a4.tar.bz2
hsbot-116c655fdc9ad68124cffd4d4d99585597f1f8a4.zip
Made some slight changes in order to make the bot's core "compile".
Diffstat (limited to '')
-rw-r--r--HsbotMaster/.gitignore1
-rw-r--r--HsbotMaster/Hsbot/Types.hs3
-rw-r--r--HsbotMaster/LICENSE30
-rw-r--r--HsbotMaster/hsbot.cabal90
4 files changed, 66 insertions, 58 deletions
diff --git a/HsbotMaster/.gitignore b/HsbotMaster/.gitignore
index a5aa1b9..feb4e56 100644
--- a/HsbotMaster/.gitignore
+++ b/HsbotMaster/.gitignore
@@ -1,2 +1,3 @@
.*.swp
Session.vim
+dist
diff --git a/HsbotMaster/Hsbot/Types.hs b/HsbotMaster/Hsbot/Types.hs
index 66b4d6b..ce1432b 100644
--- a/HsbotMaster/Hsbot/Types.hs
+++ b/HsbotMaster/Hsbot/Types.hs
@@ -19,8 +19,6 @@ import qualified Data.Map as M
import Data.Time
import System.IO
-import Hsbot.Config
-
-- | The Bot monad
type Bot = StateT BotState IO
@@ -29,7 +27,6 @@ data BotState = BotState
{ botStartTime :: UTCTime -- the bot's uptime
, botPlugins :: M.Map String (PluginState, MVar (), ThreadId) -- Loaded plugins
, botChan :: Chan BotMsg -- the bot's communication channel
- , botConfig :: [BotConfig] -- the bot's starting config
, botResumeData :: MVar BotResumeData -- the necessary data to resume the bot's operations on reboot
}
diff --git a/HsbotMaster/LICENSE b/HsbotMaster/LICENSE
new file mode 100644
index 0000000..a280988
--- /dev/null
+++ b/HsbotMaster/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c)2010, Julien Dessaux
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Julien Dessaux nor the names of other
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/HsbotMaster/hsbot.cabal b/HsbotMaster/hsbot.cabal
index fcf5533..d3ee0ce 100644
--- a/HsbotMaster/hsbot.cabal
+++ b/HsbotMaster/hsbot.cabal
@@ -1,63 +1,43 @@
-name: hsbot
-version: 0.2.1
-cabal-version: >= 1.8
-build-type: Simple
-license: BSD3
-license-file: LICENSE
-copyright: Copyright (c) 2010 Julien Dessaux
-author: Julien Dessaux
-maintainer: judessaux@gmail.com
-homepage: http://code.adyxax.org/hsbot
-bug-reports: http://code.adyxax.org/hsbot/tracker
-category: Hsbot
-synopsis: An multi-purpose bot, mainly an IRC bot
-description:
+Name: hsbot
+Version: 0.3
+Cabal-version: >=1.2
+Synopsis: A multi-purposes bot.
+Description:
hsbot is a multi-purpose bot, written slowly, as long as I learned more
haskell. It features IRC integration and some plugins. I tried to design
a bot architecture as modular and as flexible as possible.
+Homepage: http://hsbot.adyxax.org/
+License: BSD3
+License-file: LICENSE
+Author: Julien Dessaux
+Maintainer: judessaux@gmail.com
+Copyright: Copyright (c) 2010 Julien Dessaux
+Category: Hsbot
+Build-type: Simple
+
Executable hsbot
- Main-Is: Main.hs
- ghc-options: -Wall
- extensions: DeriveDataTypeable ScopedTypeVariables
- build-depends: base >= 4.1 && < 5,
- directory >= 1.0,
- filepath >= 1.1,
- process >= 1.0,
- unix >= 2.4
+ Main-is: Main.hs
+ Ghc-options: -Wall
+ Extensions: DeriveDataTypeable ScopedTypeVariables
+ Build-depends: base >= 4.1 && < 5,
+ directory >= 1.0,
+ filepath >= 1.1,
+ process >= 1.0,
+ unix >= 2.4
Library
- exposed-modules:
- Hsbot.Config
- Hsbot.Core
- Hsbot.Irc.Command
- Hsbot.Irc.Config
- Hsbot.Irc.Core
- Hsbot.Irc.Message
- Hsbot.Irc.Plugin
- Hsbot.Irc.Plugin.Core
- Hsbot.Irc.Plugin.Dummy
- Hsbot.Irc.Plugin.Ping
- Hsbot.Irc.Plugin.Quote
- Hsbot.Irc.Plugin.Utils
- Hsbot.Irc.Server
- Hsbot.Irc.Types
- Hsbot.Message
- Hsbot.Plugin
- Hsbot.PluginUtils
- Hsbot.Types
- ghc-options: -Wall
- extensions: DeriveDataTypeable ScopedTypeVariables
- build-depends: base >= 4.1 && < 5,
- containers >= 0.3,
- directory >= 1.0,
- filepath >= 1.1,
- haskell98 >= 1.0,
- mtl >= 1.1,
- network >= 2.2,
- parsec >= 3.1,
- random >= 1.0,
- text >= 0.7,
- time >= 1.1,
- unix >= 2.4
+ Ghc-options: -Wall
+ Extensions: DeriveDataTypeable ScopedTypeVariables
+ Exposed-modules: Hsbot.Message,
+ Hsbot.PluginUtils,
+ Hsbot.Types
+ Build-depends: base >= 4.1 && < 5,
+ containers >= 0.3,
+ mtl >= 1.1,
+ time >= 1.1
+
+-- Extra files to be distributed with the package, such as examples or
+-- a README.
+-- Extra-source-files: