From c8be560387183883ac2b7d7289d0a3b130000799 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 4 Jul 2019 09:02:43 -0400 Subject: [PATCH] test --- sopel_modules/SpiceBot/Server.py | 48 ++++++++++--------- .../SpiceBot_Core_Processing/Server.py | 5 +- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/sopel_modules/SpiceBot/Server.py b/sopel_modules/SpiceBot/Server.py index df1789d..926119e 100644 --- a/sopel_modules/SpiceBot/Server.py +++ b/sopel_modules/SpiceBot/Server.py @@ -38,29 +38,33 @@ class BotServer(): parameters = trigger.args[1:-1] for param in parameters: + + # check for value associated with the parameter if '=' in param: - if param.startswith("TARGMAX"): - param = str(param).split('=')[1] - settings = str(param).split(',') - for setting in settings: - settingname = str(setting).split(':')[0] - if settingname.upper() in ['NOTICE', 'PRIVMSG']: - try: - value = str(setting).split(':')[1] or None - except IndexError: - value = None - if value: - if settingname.upper() == 'NOTICE': - botconfig.SpiceBot_OSD.notice = int(value) - elif settingname.upper() == 'PRIVMSG': - botconfig.SpiceBot_OSD.privmsg = int(value) - if settingname.upper() in ['KICK']: - try: - value = str(setting).split(':')[1] or None - except IndexError: - value = None - if value: - botconfig.SpiceBot_Kick.kick = int(value) + paramname = str(param).split('=')[0] + if param in list(self.isupport.keys()): + if param.startswith("TARGMAX"): + param = str(param).split('=')[1] + settings = str(param).split(',') + for setting in settings: + settingname = str(setting).split(':')[0] + if settingname.upper() in ['NOTICE', 'PRIVMSG']: + try: + value = str(setting).split(':')[1] or None + except IndexError: + value = None + if value: + if settingname.upper() == 'NOTICE': + botconfig.SpiceBot_OSD.notice = int(value) + elif settingname.upper() == 'PRIVMSG': + botconfig.SpiceBot_OSD.privmsg = int(value) + if settingname.upper() in ['KICK']: + try: + value = str(setting).split(':')[1] or None + except IndexError: + value = None + if value: + botconfig.SpiceBot_Kick.kick = int(value) server = BotServer() diff --git a/sopel_modules/SpiceBot_Core_Processing/Server.py b/sopel_modules/SpiceBot_Core_Processing/Server.py index c438b87..8fedef1 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Server.py +++ b/sopel_modules/SpiceBot_Core_Processing/Server.py @@ -23,4 +23,7 @@ def parse_event_005(bot, trigger): SpiceBot.server.linenumber += 1 parameters = trigger.args[1:-1] for param in parameters: - bot.osd(str(param), "#deathbybandaid") + if '=' in param: + paramname = str(param).split('=')[0] + paramvalue = str(param).split('=')[1] + bot.osd([str(paramname), "=", str(paramvalue)], "#deathbybandaid")