add PASS support

diff --git a/bot.config.example b/bot.config.example
index d65b693a6b2df4c627e3abeee194f0dca5d137d9..933b34b37db1c642173d23960a73cbc4efd27315 100644 (file)
--- a/bot.config.example
+++ b/bot.config.example
@@ -4,8 +4,10 @@
 
 [erebus]
 realname = Erebus r1
+
 host = irc.quakenet.org
 port = 6667
+#pass = foobar
 
 dbhost = localhost
 dbuser = erebus

diff --git a/bot.py b/bot.py
index 73115a8da034c7c3b26d22e0417d4d99ae5ce708..8b58d39b487fac0e5f0318582eb1a3139fceabbb 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -71,6 +71,7 @@ class Bot(object):
        def watchdog(self):
                if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=300))+self.lastreceived:
                        self.parse("ERROR :Fake-error from watchdog timer.")
+                       return
                if self.conn.registered():
                        self.conn.send("PING :%s" % (time.time()))
                        self._checknick()
@@ -556,6 +557,9 @@ class BotConnection(object):
                return True
        def register(self):
                if self.state == 0:
+                       pss = self.parent.parent.cfg.get('erebus', 'pass')
+                       if pss:
+                               self.send("PASS %s" % (pss))
                        self.send("NICK %s" % (self.parent.nick))
                        self.send("USER %s 0 * :%s" % (self.parent.user, self.parent.realname))
                        self.state = 1