GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 12:12:53 +01:00
Code Issues Projects Releases Wiki Activity

relay_clientbot: handle errors if the relay: or clientbot_styles: blocks are empty

Browse Source
This commit is contained in:
James Lu 2017-10-21 13:19:31 -07:00
parent 472b73cf65
commit 26b8292564
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/relay_clientbot.py
View File

@ -47,7 +47,7 @@ def cb_relay_core(irc, source, command, args):
except KeyError: # User has left due to /quit except KeyError: # User has left due to /quit
sourcename = args['userdata'].nick sourcename = args['userdata'].nick
relay_conf = conf.conf.get('relay', {}) relay_conf = conf.conf.get('relay') or {}
# Be less floody on startup: don't relay non-PRIVMSGs for the first X seconds after connect. # Be less floody on startup: don't relay non-PRIVMSGs for the first X seconds after connect.
startup_delay = relay_conf.get('clientbot_startup_delay', 20) startup_delay = relay_conf.get('clientbot_startup_delay', 20)
@ -80,7 +80,7 @@ def cb_relay_core(irc, source, command, args):
# Try to fetch the format for the given command from the relay:clientbot_styles:$command # Try to fetch the format for the given command from the relay:clientbot_styles:$command
# key, falling back to one defined in default_styles above, and then nothing if not found # key, falling back to one defined in default_styles above, and then nothing if not found
# there. # there.
text_template = relay_conf.get('clientbot_styles', {}).get(real_command, text_template = (relay_conf.get('clientbot_styles') or {}).get(real_command,
default_styles.get(real_command, '')) default_styles.get(real_command, ''))
text_template = string.Template(text_template) text_template = string.Template(text_template)