Fix insult so that it doesn't reply to the person that called it. Also fixed

the instult tests so that the check the entire response, not just a regex
This commit is contained in:
James Vega 2003-11-04 22:51:20 +00:00
parent 4a1a662b6d
commit f6c83b38d1
2 changed files with 6 additions and 6 deletions

View File

@ -159,7 +159,7 @@ class FunDB(callbacks.Privmsg):
insultee = nick insultee = nick
insult = insult.replace("$who", insultee) insult = insult.replace("$who", insultee)
s = '%s: %s (#%s)' % (insultee, insult, id) s = '%s: %s (#%s)' % (insultee, insult, id)
irc.reply(msg, s) irc.reply(msg, s, prefixName=False)
def crossword(self, irc, msg, args): def crossword(self, irc, msg, args):
"""<word> """<word>

View File

@ -81,19 +81,19 @@ if sqlite is not None:
self.assertNotError('add insult foo') self.assertNotError('add insult foo')
self.assertRegexp('lart me', 'jabs t3st \(#1\)') self.assertRegexp('lart me', 'jabs t3st \(#1\)')
self.assertRegexp('praise me', 'pets t3st \(#1\)') self.assertRegexp('praise me', 'pets t3st \(#1\)')
self.assertRegexp('insult me', 't3st: foo \(#1\)') self.assertResponse('insult me', 't3st: foo (#1)')
self.assertRegexp('lart whamme', 'jabs whamme \(#1\)') self.assertRegexp('lart whamme', 'jabs whamme \(#1\)')
self.assertRegexp('praise whamme', 'pets whamme \(#1\)') self.assertRegexp('praise whamme', 'pets whamme \(#1\)')
self.assertRegexp('insult whamme', 'whamme: foo \(#1\)') self.assertResponse('insult whamme', 'whamme: foo (#1)')
self.assertRegexp('lart my knee', 'jabs t3st\'s knee \(#1\)') self.assertRegexp('lart my knee', 'jabs t3st\'s knee \(#1\)')
self.assertRegexp('praise my knee', 'pets t3st\'s knee \(#1\)') self.assertRegexp('praise my knee', 'pets t3st\'s knee \(#1\)')
self.assertRegexp('insult my knee', 't3st\'s knee: foo \(#1\)') self.assertResponse('insult my knee', 't3st\'s knee: foo (#1)')
self.assertRegexp('lart sammy the snake', 'jabs sammy the snake'\ self.assertRegexp('lart sammy the snake', 'jabs sammy the snake'\
' \(#1\)') ' \(#1\)')
self.assertRegexp('praise sammy the snake', 'pets sammy the snake'\ self.assertRegexp('praise sammy the snake', 'pets sammy the snake'\
' \(#1\)') ' \(#1\)')
self.assertRegexp('insult sammy the snake', 'sammy the snake: foo'\ self.assertResponse('insult sammy the snake', 'sammy the snake: '\
' \(#1\)') 'foo (#1)')
self.assertRegexp('lart me for my', 'jabs t3st for t3st\'s \(#1\)') self.assertRegexp('lart me for my', 'jabs t3st for t3st\'s \(#1\)')
self.assertRegexp('praise me for my', 'pets t3st for t3st\'s '\ self.assertRegexp('praise me for my', 'pets t3st for t3st\'s '\
'\(#1\)') '\(#1\)')