mirror of https://github.com/Mikaela/Limnoria.git
Fixed a small buggeeeeh where lart and praise work without a victim.
This commit is contained in:
parent
5b1026e1f9
commit
69c214785b
|
@ -383,6 +383,7 @@ class FunDB(callbacks.Privmsg):
|
||||||
number <id> from the database when <id> is given.
|
number <id> from the database when <id> is given.
|
||||||
"""
|
"""
|
||||||
(optlist, rest) = getopt.getopt(args, '', ['id='])
|
(optlist, rest) = getopt.getopt(args, '', ['id='])
|
||||||
|
privmsgs.getArgs(rest)
|
||||||
try:
|
try:
|
||||||
(nick, reason) = map(' '.join,
|
(nick, reason) = map(' '.join,
|
||||||
utils.itersplit('for'.__eq__, rest, 1))
|
utils.itersplit('for'.__eq__, rest, 1))
|
||||||
|
@ -430,6 +431,7 @@ class FunDB(callbacks.Privmsg):
|
||||||
praise number <id> from the database when <id> is given.
|
praise number <id> from the database when <id> is given.
|
||||||
"""
|
"""
|
||||||
(optlist, rest) = getopt.getopt(args, '', ['id='])
|
(optlist, rest) = getopt.getopt(args, '', ['id='])
|
||||||
|
privmsgs.getArgs(rest)
|
||||||
try:
|
try:
|
||||||
(nick, reason) = map(' '.join,
|
(nick, reason) = map(' '.join,
|
||||||
utils.itersplit('for'.__eq__, rest, 1))
|
utils.itersplit('for'.__eq__, rest, 1))
|
||||||
|
|
|
@ -50,12 +50,14 @@ if sqlite is not None:
|
||||||
|
|
||||||
def testLart(self):
|
def testLart(self):
|
||||||
self.assertNotError('dbadd lart jabs $who')
|
self.assertNotError('dbadd lart jabs $who')
|
||||||
|
self.assertRegexp('lart', '^lart [--id=<id>]')
|
||||||
self.assertResponse('lart jemfinch for being dumb',
|
self.assertResponse('lart jemfinch for being dumb',
|
||||||
'\x01ACTION jabs jemfinch for being dumb (#1)\x01')
|
'\x01ACTION jabs jemfinch for being dumb (#1)\x01')
|
||||||
self.assertResponse('lart jemfinch',
|
self.assertResponse('lart jemfinch',
|
||||||
'\x01ACTION jabs jemfinch (#1)\x01')
|
'\x01ACTION jabs jemfinch (#1)\x01')
|
||||||
self.assertNotError('dbnum lart')
|
self.assertNotError('dbnum lart')
|
||||||
self.assertNotError('dbadd lart shoots $who')
|
self.assertNotError('dbadd lart shoots $who')
|
||||||
|
self.assertRegexp('lart --id=1', '^lart [--id=<id>]')
|
||||||
self.assertResponse('lart --id=1 jemfinch',
|
self.assertResponse('lart --id=1 jemfinch',
|
||||||
'\x01ACTION jabs jemfinch (#1)\x01')
|
'\x01ACTION jabs jemfinch (#1)\x01')
|
||||||
self.assertResponse('lart --id=2 jemfinch for being dumb',
|
self.assertResponse('lart --id=2 jemfinch for being dumb',
|
||||||
|
@ -87,12 +89,14 @@ if sqlite is not None:
|
||||||
|
|
||||||
def testPraise(self):
|
def testPraise(self):
|
||||||
self.assertNotError('dbadd praise pets $who')
|
self.assertNotError('dbadd praise pets $who')
|
||||||
|
self.assertRegexp('praise', '^praise [--id=<id>]')
|
||||||
self.assertResponse('praise jemfinch for being him',
|
self.assertResponse('praise jemfinch for being him',
|
||||||
'\x01ACTION pets jemfinch for being him (#1)\x01')
|
'\x01ACTION pets jemfinch for being him (#1)\x01')
|
||||||
self.assertResponse('praise jemfinch',
|
self.assertResponse('praise jemfinch',
|
||||||
'\x01ACTION pets jemfinch (#1)\x01')
|
'\x01ACTION pets jemfinch (#1)\x01')
|
||||||
self.assertNotError('dbnum praise')
|
self.assertNotError('dbnum praise')
|
||||||
self.assertNotError('dbadd praise gives $who a cookie')
|
self.assertNotError('dbadd praise gives $who a cookie')
|
||||||
|
self.assertRegexp('praise --id=1', '^praise [--id=<id>]')
|
||||||
self.assertResponse('praise --id=1 jemfinch',
|
self.assertResponse('praise --id=1 jemfinch',
|
||||||
'\x01ACTION pets jemfinch (#1)\x01')
|
'\x01ACTION pets jemfinch (#1)\x01')
|
||||||
self.assertResponse('praise --id=2 jemfinch for being him',
|
self.assertResponse('praise --id=2 jemfinch for being him',
|
||||||
|
|
Loading…
Reference in New Issue