Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

Remove self.replied in favor of checking msg.repliedTo

Browse Source
This commit is contained in:
James Vega 2005-01-03 04:58:19 +00:00
parent 0d6761f1c6
commit d9e4838410
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Infobot.py
View File

@ -470,7 +470,6 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
self.db = InfobotDB() self.db = InfobotDB()
self.irc = None self.irc = None
self.msg = None self.msg = None
self.replied = True
self.changed = False self.changed = False
self.added = False self.added = False
@ -481,14 +480,17 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
def reset(self): def reset(self):
self.db.close() self.db.close()
def _error(self, s): def error(self, s):
if msg.repliedTo:
self.log.debug('Already replied, not replying again.')
return
if msg.addressed: if msg.addressed:
self.irc.error(s) self.irc.error(s)
else: else:
self.log.warning(s) self.log.warning(s)
def reply(self, s, irc=None, msg=None, action=False, substitute=True): def reply(self, s, irc=None, msg=None, action=False, substitute=True):
if self.replied: if msg.repliedTo:
self.log.debug('Already replied, not replying again.') self.log.debug('Already replied, not replying again.')
return return
if irc is None: if irc is None:
@ -497,7 +499,6 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
if msg is None: if msg is None:
assert self.msg is not None assert self.msg is not None
msg = self.msg msg = self.msg
self.replied = True
if substitute: if substitute:
s = ircutils.standardSubstitute(irc, msg, s) s = ircutils.standardSubstitute(irc, msg, s)
irc.reply(s, prefixName=False, action=action, msg=msg) irc.reply(s, prefixName=False, action=action, msg=msg)
@ -557,7 +558,7 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
self.log.debug('Returning early: Got a bad isAre value.') self.log.debug('Returning early: Got a bad isAre value.')
return return
except dbi.InvalidDBError, e: except dbi.InvalidDBError, e:
self._error('Unable to access db: %s' % e) self.error('Unable to access db: %s' % e)
return return
if isAre is None: if isAre is None:
if msg.addressed: if msg.addressed:
@ -602,8 +603,6 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
_karmaRe = re.compile(r'(?:\+\+|--)(?:\s+)?$') _karmaRe = re.compile(r'(?:\+\+|--)(?:\s+)?$')
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
try: try:
if msg.repliedTo:
self.replied = True
if ircmsgs.isCtcp(msg): if ircmsgs.isCtcp(msg):
self.log.debug('Returning early from doPrivmsg: isCtcp(msg).') self.log.debug('Returning early from doPrivmsg: isCtcp(msg).')
return return
@ -619,7 +618,6 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
msg = ircmsgs.IrcMsg(args=(msg.args[0], payload), msg=msg) msg = ircmsgs.IrcMsg(args=(msg.args[0], payload), msg=msg)
self.__parent.doPrivmsg(irc, msg) self.__parent.doPrivmsg(irc, msg)
finally: finally:
self.replied = False
self.changed = False self.changed = False
self.added = False self.added = False