Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #940 from joulez/messageparser 

Reorder: Move the id to the front of the regexp it represents.
This commit is contained in:
Valentin Lorentz 2014-12-10 10:30:55 +01:00
parent cb0a753809 b016958213
commit b9a3c01bb1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/MessageParser/plugin.py
View File

@ -404,7 +404,7 @@ class MessageParser(callbacks.Plugin, plugins.ChannelDBHandler):
irc.reply(_('There are no regexp triggers in the database.'))
return
s = [ "\"%s\" (%d)" % (regexp[0], regexp[1]) for regexp in regexps ]
s = [ "%s: %s" % (ircutils.bold('#'+str(regexp[1])), regexp[0]) for regexp in regexps ]
separator = self.registryValue('listSeparator', channel)
irc.reply(separator.join(s))
list = wrap(list, ['channelOrGlobal'])

4
plugins/MessageParser/test.py
View File

@ -133,9 +133,9 @@ class MessageParserTestCase(ChannelPluginTestCase):
self.assertRegexp('messageparser list',
'There are no regexp triggers in the database\.')
self.assertNotError('messageparser add "stuff" "echo i saw some stuff"')
self.assertRegexp('messageparser list', '"stuff" \(1\)')
self.assertRegexp('messageparser list', '\x02#1\x02: stuff')
self.assertNotError('messageparser add "aoeu" "echo vowels are nice!"')
self.assertRegexp('messageparser list', '"stuff" \(1\), "aoeu" \(2\)')
self.assertRegexp('messageparser list', '\x02#1\x02: stuff, \x02#2\x02: aoeu')
def testRemove(self):
self.assertError('messageparser remove "stuff"')