catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

refactor

Browse Source
This commit is contained in:
Thorsten
2015-11-28 15:43:33 +01:00
parent a2e7789e49
commit c4c59dd243
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins.py
View File

@@ -930,7 +930,7 @@ def command_dsa_watcher(argv, **_):
set_conf('persistent_locked', False) set_conf('persistent_locked', False)
msg = ( msg = (
'new Debian Security Announce found (%s): %s' % (str(package).replace(' - security update', ''), url)) 'new Debian Security Announce found (%s): %s' % (str(package).replace(' - security update', ''), url))
out.append(msg) out.append(msg)
log.info('no dsa for %d, trying again...' % dsa) log.info('no dsa for %d, trying again...' % dsa)
@@ -969,36 +969,26 @@ def recognize_bots(**args):
'new Debian Security Announce', 'new Debian Security Announce',
'I\'m a bot (highlight me', 'I\'m a bot (highlight me',
) )
if any([phrase in args['data'] for phrase in unique_standard_phrases]):
def _add_to_list(username, message):
blob = conf_load() blob = conf_load()
if 'other_bots' not in blob: if 'other_bots' not in blob:
blob['other_bots'] = [] blob['other_bots'] = []
if args['reply_user'] not in blob['other_bots']: if username not in blob['other_bots']:
blob['other_bots'].append(args['reply_user']) blob['other_bots'].append(username)
conf_save(blob) conf_save(blob)
return { return {
'event': { 'event': {
'time': time.time() + 3, 'time': time.time() + 3,
'msg': 'Making notes...' 'msg': message
} }
} }
elif 'I\'ll be back' in args['data']:
# a buddy!
blob = conf_load()
if 'other_bots' not in blob: if any([phrase in args['data'] for phrase in unique_standard_phrases]):
blob['other_bots'] = [] _add_to_list(args['reply_user'], 'Making notes...')
if args['reply_user'] not in blob['other_bots']: elif 'I\'ll be back' in args['data']:
blob['other_bots'].append(args['reply_user']) _add_to_list(args['reply_user'], 'Hey there, buddy!')
conf_save(blob)
return {
'event': {
'time': time.time() + 3,
'msg': 'Hey there, buddy!'
}
}
@pluginfunction("remove-from-botlist", "remove a user from the botlist", ptypes_COMMAND) @pluginfunction("remove-from-botlist", "remove a user from the botlist", ptypes_COMMAND)