Changes in trunk/amazonbot/amazonbot.py [28:20]

File:

• trunk/amazonbot/amazonbot.py (modified) (5 diffs)

trunk/amazonbot/amazonbot.py

@@ -3 +3 @@
 
 __version__ = '$Revision$'
-__author__ = 'Atzm WATANABE <atzm@atzm.org>'
+__author__ = 'Atzm WATANABE <sitosito@p.chan.ne.jp>'
 __date__ = '$Date$'
-__copyright__ = 'Copyright(C) 2006-2007 Atzm WATANABE, all rights reserved.'
+__copyright__ = 'Copyright(C) 2006 Atzm WATANABE, all rights reserved.'
 __license__ = 'Python'
 
 import re
-import string
 import sys
 import time
@@ -148 +147 @@
             return method(c, e, to, words[1:]) # words[0] == command name
 
-        self.message_action(msg, c, e, to)
-
         # silence
         self.silence(msg, c, e, to)
@@ -220 +217 @@
     def get_prev_time(self):
         return self._prev_time
-
-    def message_action(self, msg, c, e, to):
-        for i in xrange(100):
-            action = 'action%d' % i
-            if not config.has_section(action):
-                break
-
-            c_stime = config.get(action, 'start_time')
-            c_etime = config.get(action, 'end_time')
-
-            try:
-                if c_stime and c_etime:
-                    now = time.time()
-                    [now_y, now_m, now_d] = time.localtime(now)[:3]
-
-                    stime = '%04d/%02d/%02d %s' % (now_y, now_m, now_d, c_stime)
-                    etime = '%04d/%02d/%02d %s' % (now_y, now_m, now_d, c_etime)
-                    stime = time.mktime(time.strptime(stime, '%Y/%m/%d %H:%M'))
-                    etime = time.mktime(time.strptime(etime, '%Y/%m/%d %H:%M'))
-
-                    if not ((stime <= now) and (now <= etime)):
-                        _debug('Out of time: %s - %s' % (c_stime, c_etime))
-                        continue
-            except:
-                _debug('Invalid time: %s - %s' % (str(c_stime), str(c_etime)))
-                continue
-
-            pattern = unicoding(config.get(action, 'input_pattern'))
-            match   = None
-            try:
-                match = re.search(pattern, msg)
-            except:
-                _debug('Invalid regexp: %s', pattern)
-                continue
-
-            if not match:
-                continue
-
-            act = config.get(action, 'action')
-            fmt = config.get(action, 'message')
-            try:
-                _from   = nm_to_n(e.source())
-                message = ununicoding(fmt % _from)
-
-                if not message:
-                    _debug('No message specified')
-                    continue
-
-                if not act:
-                    c.notice(to, message)
-                    continue
-
-                method = getattr(self, 'onact_%s' % act, lambda *arg: False)
-                method(message, c, e, to)
-
-            except:
-                _debug('Action failed: %s (%s)' % (str(act), str(fmt)))
-
-        return True
 
 class AmazonBot(AmazonBotBase):
@@ -306 +244 @@
         return 'AmazonBot by %s, based on python-irclib' % __author__
 
-    def onmsg_reload(self, c, e, to, args):
-        """Syntax: !reload
-        """
-        _debug('in reload command: %s', str(args))
-        config.read()
-        c.notice(to, 'reloaded config')
-        return True
-
-    def onmsg_lt(self, c, e, to, args): return self.onmsg_localtime(c, e, to, args)
-    def onmsg_localtime(self, c, e, to, args):
-        """Syntax: !localtime <unix time>
-        """
-        _debug('in localtime command: %s', str(args))
-
-        _from = nm_to_n(e.source())
-        try:
-            sec = float(args[0])
-            c.notice(_from, time.strftime('%b %d %T', time.localtime(sec)))
-        except ValueError, e:
-            c.notice(_from, 'Invalid argument: %s' % args[0])
-            return False
-
-        return True
-
     def onmsg_s(self, c, e, to, args): return self.onmsg_status(c, e, to, args)
     def onmsg_status(self, c, e, to, args):
@@ -471 +385 @@
         return [product_name, url]
 
-    def onact_oper(self, msg, c, e, to):
-        nick = nm_to_n(e.source())
-        _debug('in oper action: %s to %s in %s' % (msg, nick, to))
-        c.notice(to, msg)
-        c.mode(to, '+o %s' % nick)
-        return True
-
-    def onact_nooper(self, msg, c, e, to):
-        nick = nm_to_n(e.source())
-        _debug('in nooper action: %s to %s in %s' % (msg, nick, to))
-        c.notice(to, msg)
-        c.mode(to, '-o %s' % nick)
-        return True
-
-    def onact_kick(self, msg, c, e, to):
-        nick = nm_to_n(e.source())
-        _debug('in kick action: %s to %s in %s' % (msg, nick, to))
-        c.kick(to, nick, msg)
-        return True
-
-    def onact_kick_and_invite(self, msg, c, e, to):
-        nick = nm_to_n(e.source())
-        _debug('in kick_and_invite action: %s to %s in %s' % (msg, nick, to))
-        c.kick(to, nick, msg)
-        c.invite(nick, to)
-        return True
-
-    NICK_TRANS_TABLE = string.maketrans('-_i1z2o0s5bdnmft', '_-1i2z0o5sdbmntf')
-    def onact_nick(self, msg, c, e, to):
-        nick   = nm_to_n(e.source())
-        nickto = nick[0] + nick[1:].translate(self.NICK_TRANS_TABLE)
-        if nick == nickto:
-            nickto = nick + '_'
-        _debug('in nick action: %s to %s in %s (%s)' % (msg, nick, to, nickto))
-        c.notice(to, msg)
-        c.nick(nickto)
-        return True
-
-    def onact_topic(self, msg, c, e, to):
-        nick = nm_to_n(e.source())
-        _debug('in topic action: %s to %s in %s' % (msg, nick, to))
-        c.topic(to, msg)
-        return True
-
 if __name__ == '__main__':
     bot = AmazonBot()