val/ubuntu-bots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Bantracker: trim messages so they are more to the point.

Browse Source
This commit is contained in:
Elián Hanisch
2011-05-31 03:39:28 -03:00
parent f71a3c9929
commit e69ac691c6
2 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Bantracker/plugin.py
View File

@ -503,23 +503,23 @@ class Bantracker(callbacks.Plugin):
if type == 'quiet':
mask = mask[1:]
if nickMatch(nick, self.registryValue('review.forward', channel)):
s = "Hi, please somebody review the %s '%s' set by %s on %s in"\
" %s, link: %s/bans.cgi?log=%s" % (type,
mask,
nick,
ban.ascwhen,
channel,
self.registryValue('bansite'),
ban.id)
s = "Review: %s '%s' set by %s on %s in %s, link: %s/bans.cgi?log=%s" \
% (type,
mask,
nick,
ban.ascwhen,
channel,
self.registryValue('bansite'),
ban.id)
self._sendForward(irc, s, 'review', channel)
else:
s = "Hi, please review the %s '%s' that you set on %s in %s, link:"\
" %s/bans.cgi?log=%s" % (type,
mask,
ban.ascwhen,
channel,
self.registryValue('bansite'),
ban.id)
s = "Review: %s '%s' set on %s in %s, link: %s/bans.cgi?log=%s" \
% (type,
mask,
ban.ascwhen,
channel,
self.registryValue('bansite'),
ban.id)
msg = ircmsgs.privmsg(nick, s)
if host in self.pendingReviews \
and (nick, msg) not in self.pendingReviews[host]:

39
Bantracker/test.py
View File

@ -198,13 +198,11 @@ class BantrackerTestCase(ChannelPluginTestCase):
self.assertTrue(cb.pendingReviews)
# send msg if a user with a matching host says something
self.feedMsg('Hi!', frm='op!user@fakehost.net')
msg = self.irc.takeMsg()
self.assertEqual(msg, None)
self.assertEqual(self.irc.takeMsg(), None)
self.feedMsg('Hi!', frm='op_!user@host.net')
msg = self.irc.takeMsg()
self.assertEqual(str(msg).strip(),
"PRIVMSG op_ :Hi, please review the ban 'asd!*@*' that you set on %s in #test, link: "\
"%s/bans.cgi?log=1" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
self.assertEqual(str(self.irc.takeMsg()).strip(),
"PRIVMSG op_ :Review: ban 'asd!*@*' set on %s in #test, link: "\
"%s/bans.cgi?log=1" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
# don't ask again
cb.reviewBans()
self.assertFalse(cb.pendingReviews)
@ -217,20 +215,17 @@ class BantrackerTestCase(ChannelPluginTestCase):
cb.reviewBans()
self.assertTrue(len(cb.pendingReviews) == 2)
self.feedMsg('Hi!', frm='op!user@fakehost.net')
msg = self.irc.takeMsg()
self.assertEqual(msg, None)
self.assertEqual(self.irc.takeMsg(), None)
self.assertResponse('banreview', 'Pending ban reviews (2): otherop:1 op:1')
self.feedMsg('Hi!', frm='mynickissocreative!user@home.net')
msg = self.irc.takeMsg()
self.assertEqual(str(msg).strip(),
"PRIVMSG mynickissocreative :Hi, please review the quiet 'qwe!*@*' that you set on %s in #test, link: "\
"%s/bans.cgi?log=3" %(cb.bans['#test'][2].ascwhen, pluginConf.bansite()))
self.assertEqual(str(self.irc.takeMsg()).strip(),
"PRIVMSG mynickissocreative :Review: quiet 'qwe!*@*' set on %s in #test, link: "\
"%s/bans.cgi?log=3" %(cb.bans['#test'][2].ascwhen, pluginConf.bansite()))
self.feedMsg('ping', to='test', frm='op!user@host.net') # in a query
self.irc.takeMsg() # drop pong reply
msg = self.irc.takeMsg()
self.assertEqual(str(msg).strip(),
"PRIVMSG op :Hi, please review the ban 'asd2!*@*' that you set on %s in #test, link: "\
"%s/bans.cgi?log=2" %(cb.bans['#test'][1].ascwhen, pluginConf.bansite()))
self.assertEqual(str(self.irc.takeMsg()).strip(),
"PRIVMSG op :Review: ban 'asd2!*@*' set on %s in #test, link: "\
"%s/bans.cgi?log=2" %(cb.bans['#test'][1].ascwhen, pluginConf.bansite()))
def testReviewForward(self):
pluginConf.review.setValue(True)
@ -247,11 +242,11 @@ class BantrackerTestCase(ChannelPluginTestCase):
# since it's a forward, it was sent already
self.assertFalse(cb.pendingReviews)
self.assertEqual(str(self.irc.takeMsg()).strip(),
"NOTICE #channel :Hi, please somebody review the ban 'asd!*@*' set by bot on %s in #test, link: "\
"%s/bans.cgi?log=1" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
"NOTICE #channel :Review: ban 'asd!*@*' set by bot on %s in #test, link: "\
"%s/bans.cgi?log=1" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
self.assertEqual(str(self.irc.takeMsg()).strip(),
"NOTICE #channel :Hi, please somebody review the quiet 'asd!*@*' set by bot on %s in #test, link: "\
"%s/bans.cgi?log=2" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
"NOTICE #channel :Review: quiet 'asd!*@*' set by bot on %s in #test, link: "\
"%s/bans.cgi?log=2" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
def testReviewIgnore(self):
pluginConf.review.setValue(True)
@ -286,8 +281,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
self.feedMsg('Hi!', frm='op!user@host.net')
msg = self.irc.takeMsg()
self.assertEqual(str(msg).strip(),
"PRIVMSG op :Hi, please review the ban 'asd!*@*' that you set on %s in #test, link: "\
"%s/bans.cgi?log=1" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
"PRIVMSG op :Review: ban 'asd!*@*' set on %s in #test, link: "\
"%s/bans.cgi?log=1" %(cb.bans['#test'][0].ascwhen, pluginConf.bansite()))
# check not pending anymore
self.assertFalse(cb.pendingReviews)