catdog2/urlbot-native-trex
1
0
Fork 0
mirror of http://aero2k.de/t/repos/urlbot-native.git synced 2017-09-06 15:25:38 +02:00
Code Issues Releases Activity

parse_moin(): mv user matching after moin detection

Browse Source
This commit is contained in:
urlbot
2015-06-21 01:35:56 +02:00
parent 3f6c478586
commit 629e2b6865
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins.py
View File

@@ -121,10 +121,6 @@ def parse_skynet(**args):
@pluginfunction('moin', 'parse moin/bye', ptypes_PARSE) @pluginfunction('moin', 'parse moin/bye', ptypes_PARSE)
def parse_moin_bye(**args): def parse_moin_bye(**args):
if args['reply_user'] in conf('moin-disabled-user'):
log.plugin('moin blacklist match')
return
moin = [ moin = [
'Hi', 'Hi',
'Guten Morgen', 'Morgen', 'Guten Morgen', 'Morgen',
@@ -148,6 +144,10 @@ def parse_moin_bye(**args):
for w in words: for w in words:
if d.lower() == w.lower(): if d.lower() == w.lower():
if args['reply_user'] in conf('moin-disabled-user'):
log.plugin('moin blacklist match')
return
if args['reply_user'] in conf('moin-modified-user'): if args['reply_user'] in conf('moin-modified-user'):
log.plugin('being "quiet" for %s' % w) log.plugin('being "quiet" for %s' % w)
return { return {