From 9a82cdef887f55a0a66c5da58812029254cc12eb Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:30:30 -0400 Subject: [PATCH] monologue --- sopel_modules/SpiceBot/setup.py | 2 +- sopel_modules/SpiceBot_Core_Commands/Version.py | 1 + .../SpiceBot_Core_Processing/StartupMonologue.py | 8 +++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sopel_modules/SpiceBot/setup.py b/sopel_modules/SpiceBot/setup.py index 0988780..f67bbcc 100644 --- a/sopel_modules/SpiceBot/setup.py +++ b/sopel_modules/SpiceBot/setup.py @@ -103,7 +103,7 @@ def setup_startupmonologue(bot): botevents.BOT_STARTUPMONOLOGUE_CHANNELS, botevents.BOT_STARTUPMONOLOGUE_COMMANDS, botevents.BOT_STARTUPMONOLOGUE_AI, - botevents.BOT_STARTUPMONOLOGUE_SOPEL_VERSION, + botevents.BOT_STARTUPMONOLOGUE_VERSION, ]) diff --git a/sopel_modules/SpiceBot_Core_Commands/Version.py b/sopel_modules/SpiceBot_Core_Commands/Version.py index 8091816..b8b66a6 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Version.py +++ b/sopel_modules/SpiceBot_Core_Commands/Version.py @@ -20,5 +20,6 @@ def nickname_comand_version(bot, trigger, botcom): fulldisp.append(displayval) # SpiceBot + fulldisp.append("I am running Sopel " + str(SpiceBot.version.spicebot["version_local_num"])) bot.osd(fulldisp) diff --git a/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py b/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py index f62722c..bed30d3 100644 --- a/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py +++ b/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py @@ -22,11 +22,9 @@ def bot_startup_monologue_start(bot, trigger): @sopel.module.event(SpiceBot.events.BOT_CONNECTED) @sopel.module.rule('.*') def bot_startup_monologue_sopel_version(bot, trigger): - SpiceBot.events.trigger(bot, SpiceBot.events.BOT_STARTUPMONOLOGUE_SOPEL_VERSION, "SpiceBot_StartupMonologue") - displayval = "I am running Sopel " + str(SpiceBot.version.sopel["version_local_num"]) - if SpiceBot.version.sopel["version_local"] < SpiceBot.version.sopel["version_online"]: - displayval += " Update Available to " + SpiceBot.version.sopel["version_online_num"] - SpiceBot.startupmonologue.dict["sopel_version"] = displayval + SpiceBot.events.trigger(bot, SpiceBot.events.BOT_STARTUPMONOLOGUE_VERSION, "SpiceBot_StartupMonologue") + SpiceBot.startupmonologue.dict["sopel_version"] = "Sopel " + str(SpiceBot.version.sopel["version_local_num"]) + SpiceBot.startupmonologue.dict["sopel_version"] = "SpiceBot " + str(SpiceBot.version.spicebot["version_local_num"]) @sopel.module.event(SpiceBot.events.BOT_CHANNELS)