No need to tag or's since you can't escape the |

This commit is contained in:
James Vega 2004-07-30 23:49:44 +00:00
parent c83c8c3ec3
commit a421cbcd54

View File

@ -224,8 +224,7 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
self.dunno(irc=irc, msg=msg) self.dunno(irc=irc, msg=msg)
else: else:
# XXX # XXX
if value.startswith('<or>'): value = random.choice(value.split('|'))
value = random.choice(value[4:].split('|'))
if value.startswith('<reply>'): if value.startswith('<reply>'):
self.reply('%s' % value[7:].strip(), irc=irc, msg=msg) self.reply('%s' % value[7:].strip(), irc=irc, msg=msg)
elif value.startswith('<action>'): elif value.startswith('<action>'):
@ -322,8 +321,6 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
isAre = isAre.lower() isAre = isAre.lower()
key = plugins.standardSubstitute(irc, msg, key) key = plugins.standardSubstitute(irc, msg, key)
value = plugins.standardSubstitute(irc, msg, value) value = plugins.standardSubstitute(irc, msg, value)
if '|' in value:
value = '<or>%s' % value
if isAre in ('was', 'is', 'am'): if isAre in ('was', 'is', 'am'):
if self.db.hasIs(key): if self.db.hasIs(key):
if also: if also: