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

add plugin argv; add user-settable teatimer timeout

Browse Source
This commit is contained in:
urlbot
2014-10-29 13:01:32 +01:00
parent 02105b7f13
commit 76fd48485c
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins.py
View File

@@ -15,10 +15,17 @@ plugins = {}
plugins['parse'] = [] plugins['parse'] = []
plugins['command'] = [] plugins['command'] = []
def get_reply_user(data): def get_reply_data(data, field=0):
# FIXME: we can't determine if a user named 'foo> ' just wrote ' > bar' # FIXME: we can't determine if a user named 'foo> ' just wrote ' > bar'
# or a user 'foo' just wrote '> > bar' # or a user 'foo' just wrote '> > bar'
return data.split(' ')[0].strip('<>') f = data.split(' ')
if 0 == field:
return f[0].strip('<>')
else:
if field > len(f):
return None
return f[field]
def register_event(t, callback, args): def register_event(t, callback, args):
joblist.append((t, callback, args)) joblist.append((t, callback, args))
@@ -66,7 +73,7 @@ def parse_skynet(args):
} }
def data_parse_other(data): def data_parse_other(data):
reply_user = get_reply_user(data) reply_user = get_reply_data(data)
for p in plugins['parse']: for p in plugins['parse']:
if ratelimit_exceeded(p['ratelimit_class']): if ratelimit_exceeded(p['ratelimit_class']):
@@ -289,13 +296,25 @@ def command_teatimer(args):
if 'register' == args: if 'register' == args:
return { return {
'name': 'teatimer', 'name': 'teatimer',
'desc': 'sets a tea timer to currently %d seconds' % conf('tea_steep_time'), 'desc': 'sets a tea timer to $1 or currently %d seconds' % conf('tea_steep_time'),
'args': ('data', 'reply_user'), 'args': ('data', 'reply_user', 'argv1'),
'ratelimit_class': RATE_GLOBAL 'ratelimit_class': RATE_GLOBAL
} }
if 'teatimer' in args['data']: if 'teatimer' in args['data']:
ready = time.time() + conf('tea_steep_time') steep = conf('tea_steep_time')
if None != args['argv1']:
try:
steep = int(args['argv1'])
except Exception as e:
return {
'msg': args['reply_user'] + ': error when parsing int(%s): %s' % (
args['argv1'], str(e)
)
}
ready = time.time() + steep
logger('plugin', 'tea timer set to %s' % time.strftime('%F.%T', time.localtime(ready))) logger('plugin', 'tea timer set to %s' % time.strftime('%F.%T', time.localtime(ready)))
register_event(ready, chat_write, args['reply_user'] + ': Your tea is ready!') register_event(ready, chat_write, args['reply_user'] + ': Your tea is ready!')
@@ -378,7 +397,8 @@ def data_parse_commands(data):
logger('warn', 'received hangup: ' + data) logger('warn', 'received hangup: ' + data)
return None return None
reply_user = get_reply_user(data) reply_user = get_reply_data(data)
argv1 = get_reply_data(data, field=2)
for p in plugins['command']: for p in plugins['command']:
if ratelimit_exceeded(p['ratelimit_class']): if ratelimit_exceeded(p['ratelimit_class']):
@@ -398,6 +418,8 @@ def data_parse_commands(data):
args['cmd_list'] = cmds args['cmd_list'] = cmds
elif 'reply_user' == a: elif 'reply_user' == a:
args['reply_user'] = reply_user args['reply_user'] = reply_user
elif 'argv1' == a:
args['argv1'] = argv1
else: else:
logger('warn', 'unknown required arg for %s: %s' %(p['name'], a)) logger('warn', 'unknown required arg for %s: %s' %(p['name'], a))