From 289fdd44145e8bfb4ea6f56c71b152ac4d846718 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 10 Jul 2019 08:47:00 -0400 Subject: [PATCH 01/34] upsidedown --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index e8bbe17..4474ebc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ fake-useragent google-api-python-client num2words word2number +upsidedown From 77bcf630766d0fe6d5f1a3a4dc6c89df03834b8e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 15 Jul 2019 07:51:44 -0400 Subject: [PATCH 02/34] todo --- sopel_modules/SpiceBot_Core_Extra/flip.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sopel_modules/SpiceBot_Core_Extra/flip.py b/sopel_modules/SpiceBot_Core_Extra/flip.py index 577a97b..0a4c82a 100644 --- a/sopel_modules/SpiceBot_Core_Extra/flip.py +++ b/sopel_modules/SpiceBot_Core_Extra/flip.py @@ -10,6 +10,7 @@ import sopel.module from upsidedown import transform # TODO add upsidedown to spicemanip +# TODO add prerun functionality as well as command handling @sopel.module.rule('^flips (.+)') From 2e37fc5c593b3fe6463fbc414b85ee4d6993d07f Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 15 Jul 2019 07:53:43 -0400 Subject: [PATCH 03/34] prepare for action_commands decorator --- sopel_modules/SpiceBot/Commands.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sopel_modules/SpiceBot/Commands.py b/sopel_modules/SpiceBot/Commands.py index 1563262..6f124e2 100644 --- a/sopel_modules/SpiceBot/Commands.py +++ b/sopel_modules/SpiceBot/Commands.py @@ -291,6 +291,10 @@ class BotCommands(): line = str(line).split("commands")[-1] line = "commands" + line detected_lines.append(line) + elif str(line).startswith(tuple(["action_commands", "module.action_commands", "sopel.module.action_commands"])): + line = str(line).split("action_commands")[-1] + line = "action_commands" + line + detected_lines.append(line) elif str(line).startswith(tuple(["nickname_commands", "module.nickname_commands", "sopel.module.nickname_commands"])): line = str(line).split("nickname_commands")[-1] line = "nickname_commands" + line @@ -326,6 +330,13 @@ class BotCommands(): except Exception as e: validcoms = e validcoms = [] + elif str(detected_line).startswith("action_commands"): + comtype = "action" + try: + validcoms = eval(str(detected_line).split("action_commands")[-1]) + except Exception as e: + validcoms = e + validcoms = [] elif str(detected_line).startswith("nickname_commands"): comtype = "nickname" try: From 3504bfa16686e757e508d62190c095c617b388b2 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 08:42:48 -0400 Subject: [PATCH 04/34] version check sopel --- sopel_modules/SpiceBot/Update.py | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sopel_modules/SpiceBot/Update.py b/sopel_modules/SpiceBot/Update.py index 227f5fd..b9409e9 100644 --- a/sopel_modules/SpiceBot/Update.py +++ b/sopel_modules/SpiceBot/Update.py @@ -4,9 +4,43 @@ from __future__ import unicode_literals, absolute_import, division, print_functi This is the SpiceBot Update system. """ +import sopel from sopel.config.types import StaticSection, ValidatedAttribute +import requests + +from .Config import config as botconfig + class SpiceBot_Update_MainSection(StaticSection): gitrepo = ValidatedAttribute('gitrepo', default="https://github.com/SpiceBot/SpiceBot") gitbranch = ValidatedAttribute('gitbranch', default="master") + + +class BotUpdates(): + + def __init__(self): + self.sopel = { + "version_local": sopel.version_info, + "version_url": 'https://sopel.chat/latest.json', + "version_online": None, + } + self.spicebot = False + + self.check_sopel() + + def check_sopel(self): + info = requests.get(self.sopel["version_url"], verify=botconfig.core.verify_ssl).json() + if self.sopel["version_local"].releaselevel == 'final': + latest = info['version'] + else: + latest = info['unstable'] + + self.sopel["version_online"] = sopel._version_info(latest) + + def check_spicebot(self): + return + self.sopel = True + + +version = BotUpdates() From 3c992ede46b4ce4d0be37b472f660f466a6d4114 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 09:08:56 -0400 Subject: [PATCH 05/34] sopel version dialogue --- sopel_modules/SpiceBot/Update.py | 13 ++++++--- sopel_modules/SpiceBot/setup.py | 1 + .../StartupMonologue.py | 10 +++++++ .../Updates_Available.py | 27 +++++++++++++++++++ .../SpiceBot_Core_Processing/__init__.py | 1 + 5 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 sopel_modules/SpiceBot_Core_Processing/Updates_Available.py diff --git a/sopel_modules/SpiceBot/Update.py b/sopel_modules/SpiceBot/Update.py index b9409e9..a6c445c 100644 --- a/sopel_modules/SpiceBot/Update.py +++ b/sopel_modules/SpiceBot/Update.py @@ -22,8 +22,10 @@ class BotUpdates(): def __init__(self): self.sopel = { "version_local": sopel.version_info, + "version_local_num": sopel.__version__, "version_url": 'https://sopel.chat/latest.json', "version_online": None, + "version_online_num": None, } self.spicebot = False @@ -32,15 +34,20 @@ class BotUpdates(): def check_sopel(self): info = requests.get(self.sopel["version_url"], verify=botconfig.core.verify_ssl).json() if self.sopel["version_local"].releaselevel == 'final': - latest = info['version'] + self.sopel["version_online_num"] = info['version'] + self.sopel["notes"] = info['release_notes'] else: - latest = info['unstable'] + self.sopel["version_online_num"] = info['unstable'] + self.sopel["notes"] = info.get('unstable_notes', '') + if self.sopel["notes"]: + self.sopel["notes"] = 'Full release notes at ' + self.sopel["notes"] - self.sopel["version_online"] = sopel._version_info(latest) + self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): return self.sopel = True + # get actual version number, and commit count, and assemble a version version = BotUpdates() diff --git a/sopel_modules/SpiceBot/setup.py b/sopel_modules/SpiceBot/setup.py index 71c61ad..0988780 100644 --- a/sopel_modules/SpiceBot/setup.py +++ b/sopel_modules/SpiceBot/setup.py @@ -103,6 +103,7 @@ def setup_startupmonologue(bot): botevents.BOT_STARTUPMONOLOGUE_CHANNELS, botevents.BOT_STARTUPMONOLOGUE_COMMANDS, botevents.BOT_STARTUPMONOLOGUE_AI, + botevents.BOT_STARTUPMONOLOGUE_SOPEL_VERSION, ]) diff --git a/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py b/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py index ec49264..f62722c 100644 --- a/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py +++ b/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py @@ -19,6 +19,16 @@ def bot_startup_monologue_start(bot, trigger): SpiceBot.events.trigger(bot, SpiceBot.events.BOT_STARTUPMONOLOGUE_CONNECTED, "SpiceBot_StartupMonologue") +@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 + + @sopel.module.event(SpiceBot.events.BOT_CHANNELS) @sopel.module.rule('.*') def bot_startup_monologue_channels(bot, trigger): diff --git a/sopel_modules/SpiceBot_Core_Processing/Updates_Available.py b/sopel_modules/SpiceBot_Core_Processing/Updates_Available.py new file mode 100644 index 0000000..3213eb1 --- /dev/null +++ b/sopel_modules/SpiceBot_Core_Processing/Updates_Available.py @@ -0,0 +1,27 @@ +# coding=utf8 +from __future__ import unicode_literals, absolute_import, division, print_function + +import sopel + +import sopel_modules.SpiceBot as SpiceBot + +wait_time = 24 * 60 * 60 # check once per day + +message = ( + 'A new Sopel version, {}, is available. I am running {}. Please update ' + 'me. Full release notes at {}' +) + + +@sopel.module.interval(wait_time) +def check_updates_sopel_interval(bot): + SpiceBot.version.check_sopel() + + msg = message.format( + SpiceBot.version.sopel["version_online_num"], + SpiceBot.version.sopel["version_local_num"], + SpiceBot.version.sopel["notes"] + ) + + if SpiceBot.version.sopel["version_local"] < SpiceBot.version.sopel["version_online"]: + bot.osd(msg, bot.config.core.owner) diff --git a/sopel_modules/SpiceBot_Core_Processing/__init__.py b/sopel_modules/SpiceBot_Core_Processing/__init__.py index 108492b..58eabad 100644 --- a/sopel_modules/SpiceBot_Core_Processing/__init__.py +++ b/sopel_modules/SpiceBot_Core_Processing/__init__.py @@ -17,6 +17,7 @@ from .osd import * from .StartupMonologue import * from .Logs import * from .Kick import * +from .Updates_Available import * # from .Watch_URL import * From 46ae0aa7db0e61e01c78e3b7205603a7aa8d6aa5 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 11:46:52 -0400 Subject: [PATCH 06/34] add version command --- .../SpiceBot_Core_Commands/Version.py | 24 +++++++++++++++++++ .../SpiceBot_Core_Commands/__init__.py | 1 + 2 files changed, 25 insertions(+) create mode 100644 sopel_modules/SpiceBot_Core_Commands/Version.py diff --git a/sopel_modules/SpiceBot_Core_Commands/Version.py b/sopel_modules/SpiceBot_Core_Commands/Version.py new file mode 100644 index 0000000..8091816 --- /dev/null +++ b/sopel_modules/SpiceBot_Core_Commands/Version.py @@ -0,0 +1,24 @@ +# coding=utf8 +from __future__ import unicode_literals, absolute_import, division, print_function +""" +This is the SpiceBot Users system. +""" +import sopel + +import sopel_modules.SpiceBot as SpiceBot + + +@SpiceBot.prerun('nickname') +@sopel.module.nickname_commands('version') +def nickname_comand_version(bot, trigger, botcom): + fulldisp = [] + + # sopel + 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"] + fulldisp.append(displayval) + + # SpiceBot + + bot.osd(fulldisp) diff --git a/sopel_modules/SpiceBot_Core_Commands/__init__.py b/sopel_modules/SpiceBot_Core_Commands/__init__.py index 83d0712..9235bb6 100644 --- a/sopel_modules/SpiceBot_Core_Commands/__init__.py +++ b/sopel_modules/SpiceBot_Core_Commands/__init__.py @@ -22,6 +22,7 @@ from .BotPrivs import * from .AI import * from .DictComs import * from .TODO import * +from .Version import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' From 1a62196216a4fa2fb7f7160f8c50786623384a20 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 11:49:06 -0400 Subject: [PATCH 07/34] seperation --- sopel_modules/SpiceBot/Update.py | 42 +------------------------- sopel_modules/SpiceBot/Version.py | 47 ++++++++++++++++++++++++++++++ sopel_modules/SpiceBot/__init__.py | 10 ++++--- 3 files changed, 54 insertions(+), 45 deletions(-) create mode 100644 sopel_modules/SpiceBot/Version.py diff --git a/sopel_modules/SpiceBot/Update.py b/sopel_modules/SpiceBot/Update.py index a6c445c..058002a 100644 --- a/sopel_modules/SpiceBot/Update.py +++ b/sopel_modules/SpiceBot/Update.py @@ -4,50 +4,10 @@ from __future__ import unicode_literals, absolute_import, division, print_functi This is the SpiceBot Update system. """ -import sopel + from sopel.config.types import StaticSection, ValidatedAttribute -import requests - -from .Config import config as botconfig - class SpiceBot_Update_MainSection(StaticSection): gitrepo = ValidatedAttribute('gitrepo', default="https://github.com/SpiceBot/SpiceBot") gitbranch = ValidatedAttribute('gitbranch', default="master") - - -class BotUpdates(): - - def __init__(self): - self.sopel = { - "version_local": sopel.version_info, - "version_local_num": sopel.__version__, - "version_url": 'https://sopel.chat/latest.json', - "version_online": None, - "version_online_num": None, - } - self.spicebot = False - - self.check_sopel() - - def check_sopel(self): - info = requests.get(self.sopel["version_url"], verify=botconfig.core.verify_ssl).json() - if self.sopel["version_local"].releaselevel == 'final': - self.sopel["version_online_num"] = info['version'] - self.sopel["notes"] = info['release_notes'] - else: - self.sopel["version_online_num"] = info['unstable'] - self.sopel["notes"] = info.get('unstable_notes', '') - if self.sopel["notes"]: - self.sopel["notes"] = 'Full release notes at ' + self.sopel["notes"] - - self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) - - def check_spicebot(self): - return - self.sopel = True - # get actual version number, and commit count, and assemble a version - - -version = BotUpdates() diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py new file mode 100644 index 0000000..048db7c --- /dev/null +++ b/sopel_modules/SpiceBot/Version.py @@ -0,0 +1,47 @@ +# coding=utf8 +from __future__ import unicode_literals, absolute_import, division, print_function +""" +This is the SpiceBot Update system. +""" + +import sopel + +import requests + +from .Config import config as botconfig + + +class BotVersion(): + + def __init__(self): + self.sopel = { + "version_local": sopel.version_info, + "version_local_num": sopel.__version__, + "version_url": 'https://sopel.chat/latest.json', + "version_online": None, + "version_online_num": None, + } + self.spicebot = False + + self.check_sopel() + + def check_sopel(self): + info = requests.get(self.sopel["version_url"], verify=botconfig.core.verify_ssl).json() + if self.sopel["version_local"].releaselevel == 'final': + self.sopel["version_online_num"] = info['version'] + self.sopel["notes"] = info['release_notes'] + else: + self.sopel["version_online_num"] = info['unstable'] + self.sopel["notes"] = info.get('unstable_notes', '') + if self.sopel["notes"]: + self.sopel["notes"] = 'Full release notes at ' + self.sopel["notes"] + + self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) + + def check_spicebot(self): + return + self.sopel = True + # get actual version number, and commit count, and assemble a version + + +version = BotVersion() diff --git a/sopel_modules/SpiceBot/__init__.py b/sopel_modules/SpiceBot/__init__.py index e0836fa..fa35c97 100644 --- a/sopel_modules/SpiceBot/__init__.py +++ b/sopel_modules/SpiceBot/__init__.py @@ -7,6 +7,11 @@ This module contains references only for other modules to utilize. """ # pylama:ignore=W0401,W0611 + +from .configure import * +from .setup import * +from .shutdown import * + from .Config import * from .Logs import * from .Database import * @@ -32,12 +37,9 @@ from .Reddit import * from .DictComs import * from .Read import * from .Translate import * +from .Version import * -from .configure import * -from .setup import * -from .shutdown import * - __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' __version__ = '0.1.1' From 08b08d5b5e4572f9d121273596d090160d614a77 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 11:57:54 -0400 Subject: [PATCH 08/34] test --- sopel_modules/SpiceBot/Version.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 048db7c..dac9d7c 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -7,6 +7,7 @@ This is the SpiceBot Update system. import sopel import requests +import pkg_resources from .Config import config as botconfig @@ -21,7 +22,10 @@ class BotVersion(): "version_online": None, "version_online_num": None, } - self.spicebot = False + self.spicebot = { + "version_local": None, + "version_local_num": None, + } self.check_sopel() @@ -39,8 +43,7 @@ class BotVersion(): self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): - return - self.sopel = True + self.spicebot["version_local_num"] = pkg_resources.get_distribution("SpiceBot").version # get actual version number, and commit count, and assemble a version From 438244fea24848b91d745198fc05764e5d4e73de Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 11:59:40 -0400 Subject: [PATCH 09/34] test --- sopel_modules/SpiceBot/Version.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index dac9d7c..635b409 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -28,6 +28,7 @@ class BotVersion(): } self.check_sopel() + self.check_spicebot() def check_sopel(self): info = requests.get(self.sopel["version_url"], verify=botconfig.core.verify_ssl).json() From 618e40c9b5daf9321995ad83d446c8875d65d0ca Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:01:11 -0400 Subject: [PATCH 10/34] test --- sopel_modules/SpiceBot/Version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 635b409..c756b7b 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -44,7 +44,7 @@ class BotVersion(): self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): - self.spicebot["version_local_num"] = pkg_resources.get_distribution("SpiceBot").version + self.spicebot["version_local_num"] = pkg_resources.get_distribution("sopel-modules.SpiceBot").version # get actual version number, and commit count, and assemble a version From 84b9ead52fe6ee5439a82a49ed34902265ad67e9 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:03:46 -0400 Subject: [PATCH 11/34] update version number --- setup.py | 2 +- sopel_modules/SpiceBot/__init__.py | 2 +- sopel_modules/SpiceBot_Core_Commands/__init__.py | 2 +- sopel_modules/SpiceBot_Core_Extra/__init__.py | 2 +- sopel_modules/SpiceBot_Core_Processing/__init__.py | 2 +- sopel_modules/SpiceBot_Core_Tools/__init__.py | 2 +- sopel_modules/SpiceBot_SopelPatches/__init__.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 188e5a5..bd97c3b 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ with open('dev-requirements.txt') as dev_requirements_file: setup( name='sopel_modules.SpiceBot', - version='0.1.1', + version='0.3.0', description='SpiceBot aims to run SpiceBot as an IRC service', long_description=readme + '\n\n' + history, author='Sam Zick', diff --git a/sopel_modules/SpiceBot/__init__.py b/sopel_modules/SpiceBot/__init__.py index fa35c97..e5c42bc 100644 --- a/sopel_modules/SpiceBot/__init__.py +++ b/sopel_modules/SpiceBot/__init__.py @@ -42,4 +42,4 @@ from .Version import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' -__version__ = '0.1.1' +__version__ = '0.3.0' diff --git a/sopel_modules/SpiceBot_Core_Commands/__init__.py b/sopel_modules/SpiceBot_Core_Commands/__init__.py index 9235bb6..009efa8 100644 --- a/sopel_modules/SpiceBot_Core_Commands/__init__.py +++ b/sopel_modules/SpiceBot_Core_Commands/__init__.py @@ -26,4 +26,4 @@ from .Version import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' -__version__ = '0.1.1' +__version__ = '0.3.0' diff --git a/sopel_modules/SpiceBot_Core_Extra/__init__.py b/sopel_modules/SpiceBot_Core_Extra/__init__.py index cfa65c7..95f1381 100644 --- a/sopel_modules/SpiceBot_Core_Extra/__init__.py +++ b/sopel_modules/SpiceBot_Core_Extra/__init__.py @@ -6,4 +6,4 @@ from .flip import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' -__version__ = '0.1.1' +__version__ = '0.3.0' diff --git a/sopel_modules/SpiceBot_Core_Processing/__init__.py b/sopel_modules/SpiceBot_Core_Processing/__init__.py index 58eabad..c588af8 100644 --- a/sopel_modules/SpiceBot_Core_Processing/__init__.py +++ b/sopel_modules/SpiceBot_Core_Processing/__init__.py @@ -23,4 +23,4 @@ from .Updates_Available import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' -__version__ = '0.1.1' +__version__ = '0.3.0' diff --git a/sopel_modules/SpiceBot_Core_Tools/__init__.py b/sopel_modules/SpiceBot_Core_Tools/__init__.py index 4a70f4b..b8a59da 100644 --- a/sopel_modules/SpiceBot_Core_Tools/__init__.py +++ b/sopel_modules/SpiceBot_Core_Tools/__init__.py @@ -9,4 +9,4 @@ from .Search import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' -__version__ = '0.1.1' +__version__ = '0.3.0' diff --git a/sopel_modules/SpiceBot_SopelPatches/__init__.py b/sopel_modules/SpiceBot_SopelPatches/__init__.py index 076aae5..b23744a 100644 --- a/sopel_modules/SpiceBot_SopelPatches/__init__.py +++ b/sopel_modules/SpiceBot_SopelPatches/__init__.py @@ -6,4 +6,4 @@ from .Patches import * __author__ = 'Sam Zick' __email__ = 'sam@deathbybandaid.net' -__version__ = '0.1.1' +__version__ = '0.3.0' From 403202b0e033cb509b3d81017e79f9c0b87e1237 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:16:42 -0400 Subject: [PATCH 12/34] test --- sopel_modules/SpiceBot/Version.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index c756b7b..e17b25d 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -7,6 +7,8 @@ This is the SpiceBot Update system. import sopel import requests +import json +from restkit import request import pkg_resources from .Config import config as botconfig @@ -25,6 +27,9 @@ class BotVersion(): self.spicebot = { "version_local": None, "version_local_num": None, + "version_url": 'https://api.github.com/users/SpiceBot/repos', + "version_online": None, + "version_online_num": None, } self.check_sopel() @@ -45,7 +50,29 @@ class BotVersion(): def check_spicebot(self): self.spicebot["version_local_num"] = pkg_resources.get_distribution("sopel-modules.SpiceBot").version + self.sopel["version_online_num"] = self.count_repo_commits() # get actual version number, and commit count, and assemble a version + def count_repo_commits(self, _acc=0): + r = request("https://api.github.com/repos/SpiceBot/SpiceBot/commits/master") + commits = json.loads(r.body_string()) + n = len(commits) + if n == 0: + return _acc + link = r.headers.get('link') + if link is None: + return _acc + n + next_url = self.find_next(r.headers['link']) + if next_url is None: + return _acc + n + # try to be tail recursive, even when it doesn't matter in CPython + return self.count_repo_commits(next_url, _acc + n) + + def find_next(self, link): + for l in link.split(','): + a, b = l.split(';') + if b.strip() == 'rel="next"': + return a.strip()[1:-1] + version = BotVersion() From 58b8320d6d5f2e8a0e0692bdcf4d1ad37dbf98d8 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:18:32 -0400 Subject: [PATCH 13/34] update req --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 4474ebc..d85bc6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ google-api-python-client num2words word2number upsidedown +restkit From 70d83d4dd8e11e1492fab50fe040420d8dcb701b Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:19:50 -0400 Subject: [PATCH 14/34] remove req --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d85bc6b..4474ebc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,3 @@ google-api-python-client num2words word2number upsidedown -restkit From 89a2b316e09ff0f31538c1b285ff336fb7cc15d2 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:21:39 -0400 Subject: [PATCH 15/34] request method --- sopel_modules/SpiceBot/Version.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index e17b25d..af7062b 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -7,8 +7,6 @@ This is the SpiceBot Update system. import sopel import requests -import json -from restkit import request import pkg_resources from .Config import config as botconfig @@ -54,19 +52,8 @@ class BotVersion(): # get actual version number, and commit count, and assemble a version def count_repo_commits(self, _acc=0): - r = request("https://api.github.com/repos/SpiceBot/SpiceBot/commits/master") - commits = json.loads(r.body_string()) - n = len(commits) - if n == 0: - return _acc - link = r.headers.get('link') - if link is None: - return _acc + n - next_url = self.find_next(r.headers['link']) - if next_url is None: - return _acc + n - # try to be tail recursive, even when it doesn't matter in CPython - return self.count_repo_commits(next_url, _acc + n) + info = requests.get(self.spicebot["version_url"], verify=botconfig.core.verify_ssl).json() + return len(info) def find_next(self, link): for l in link.split(','): From 36437199548851fa132368ccf03de4c0a10efc0d Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:40:44 -0400 Subject: [PATCH 16/34] test --- sopel_modules/SpiceBot/Version.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index af7062b..712ba39 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -7,6 +7,7 @@ This is the SpiceBot Update system. import sopel import requests +import json import pkg_resources from .Config import config as botconfig @@ -25,7 +26,7 @@ class BotVersion(): self.spicebot = { "version_local": None, "version_local_num": None, - "version_url": 'https://api.github.com/users/SpiceBot/repos', + "version_url": "https://api.github.com/repos/SpiceBot/SpiceBot/commits/master", "version_online": None, "version_online_num": None, } @@ -51,15 +52,16 @@ class BotVersion(): self.sopel["version_online_num"] = self.count_repo_commits() # get actual version number, and commit count, and assemble a version - def count_repo_commits(self, _acc=0): - info = requests.get(self.spicebot["version_url"], verify=botconfig.core.verify_ssl).json() - return len(info) - - def find_next(self, link): - for l in link.split(','): - a, b = l.split(';') - if b.strip() == 'rel="next"': - return a.strip()[1:-1] + def count_repo_commits(self): + commitcount = 0 + try: + page = requests.get(self.spicebot["version_url"]) + result = page.content + jsoncommits = json.loads(result.decode('utf-8')) + commitcount = len(jsoncommits) + except Exception as e: + commitcount = str(e) + return commitcount version = BotVersion() From b4b806c77cba1410f157b9300ac2436ffbf385bf Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 12:55:47 -0400 Subject: [PATCH 17/34] test --- sopel_modules/SpiceBot/Version.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 712ba39..c595d09 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -7,7 +7,7 @@ This is the SpiceBot Update system. import sopel import requests -import json +import feedparser import pkg_resources from .Config import config as botconfig @@ -25,7 +25,7 @@ class BotVersion(): } self.spicebot = { "version_local": None, - "version_local_num": None, + "version_local_num": pkg_resources.get_distribution("sopel-modules.SpiceBot").version, "version_url": "https://api.github.com/repos/SpiceBot/SpiceBot/commits/master", "version_online": None, "version_online_num": None, @@ -48,20 +48,8 @@ class BotVersion(): self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): - self.spicebot["version_local_num"] = pkg_resources.get_distribution("sopel-modules.SpiceBot").version - self.sopel["version_online_num"] = self.count_repo_commits() - # get actual version number, and commit count, and assemble a version - - def count_repo_commits(self): - commitcount = 0 - try: - page = requests.get(self.spicebot["version_url"]) - result = page.content - jsoncommits = json.loads(result.decode('utf-8')) - commitcount = len(jsoncommits) - except Exception as e: - commitcount = str(e) - return commitcount + feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") + self.sopel["version_online_num"] = len(feedjson) version = BotVersion() From cdc4961ee40069440712bbfdaafd8720f21eb1e5 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 13:02:51 -0400 Subject: [PATCH 18/34] test --- sopel_modules/SpiceBot/Version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index c595d09..a861e3c 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -49,7 +49,7 @@ class BotVersion(): def check_spicebot(self): feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") - self.sopel["version_online_num"] = len(feedjson) + self.sopel["version_online_num"] = feedjson version = BotVersion() From a07e7338ada793089d73cf27ce1c511e56f70cec Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 13:22:19 -0400 Subject: [PATCH 19/34] test --- sopel_modules/SpiceBot/Version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index a861e3c..d6e10f7 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -49,7 +49,7 @@ class BotVersion(): def check_spicebot(self): feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") - self.sopel["version_online_num"] = feedjson + self.sopel["version_online_num"] = len(feedjson.entries) version = BotVersion() From f2facf3bcfac4900700cca8c24943afaab3709f7 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 13:47:57 -0400 Subject: [PATCH 20/34] test --- sopel_modules/SpiceBot/Version.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index d6e10f7..f3fa21e 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -48,8 +48,7 @@ class BotVersion(): self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): - feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") - self.sopel["version_online_num"] = len(feedjson.entries) + self.sopel["version_online_num"] = pkg_resources.get_distribution("sopel-modules.SpiceBot").version version = BotVersion() From f1513fdef919479c910553ed5582fc2e52ee5ba9 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 13:49:31 -0400 Subject: [PATCH 21/34] test --- sopel_modules/SpiceBot/Version.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index f3fa21e..39b3b12 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -48,7 +48,8 @@ class BotVersion(): self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): - self.sopel["version_online_num"] = pkg_resources.get_distribution("sopel-modules.SpiceBot").version + feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") + self.spicebot["version_online_num"] = len(feedjson.entries) version = BotVersion() From 2f317c0c54ef51eed64a373768184f54898475cd Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:05:09 -0400 Subject: [PATCH 22/34] fetch online number --- sopel_modules/SpiceBot/Version.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 39b3b12..55d7e60 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -9,6 +9,8 @@ import sopel import requests import feedparser import pkg_resources +from fake_useragent import UserAgent +import urllib from .Config import config as botconfig @@ -16,6 +18,7 @@ from .Config import config as botconfig class BotVersion(): def __init__(self): + self.header = {'User-Agent': str(UserAgent().chrome)} self.sopel = { "version_local": sopel.version_info, "version_local_num": sopel.__version__, @@ -48,8 +51,19 @@ class BotVersion(): self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) def check_spicebot(self): + + htmlfile = urllib.request.urlopen("https://raw.githubusercontent.com/SpiceBot/SpiceBot/master/setup.py") + lines = htmlfile.read().splitlines() + self.spicebot["version_online_num"] = self.spicebot["version_local_num"] + for line in lines: + if "version=" in line: + line = line.replace("version=", '') + line = line.replace("'", '') + self.spicebot["version_online_num"] = line + continue + feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") - self.spicebot["version_online_num"] = len(feedjson.entries) + self.spicebot["version_online_num"] = str(self.spicebot["version_online_num"]) + "." + str(len(feedjson.entries)) version = BotVersion() From 7643b13c2236a59afa54b99023828357c61db387 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:07:44 -0400 Subject: [PATCH 23/34] test --- sopel_modules/SpiceBot/Version.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 55d7e60..613cfdc 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -56,6 +56,7 @@ class BotVersion(): lines = htmlfile.read().splitlines() self.spicebot["version_online_num"] = self.spicebot["version_local_num"] for line in lines: + line = str(line) if "version=" in line: line = line.replace("version=", '') line = line.replace("'", '') @@ -65,5 +66,8 @@ class BotVersion(): feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") self.spicebot["version_online_num"] = str(self.spicebot["version_online_num"]) + "." + str(len(feedjson.entries)) + self.spicebot["version_local"] = sopel._version_info(self.spicebot["version_local_num"]) + self.spicebot["version_online"] = sopel._version_info(self.spicebot["version_online_num"]) + version = BotVersion() From 642cd0aba6ab0601372173edfae57d64bad86ffc Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:11:19 -0400 Subject: [PATCH 24/34] test --- sopel_modules/SpiceBot/Version.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 613cfdc..643cb0f 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -27,10 +27,8 @@ class BotVersion(): "version_online_num": None, } self.spicebot = { - "version_local": None, "version_local_num": pkg_resources.get_distribution("sopel-modules.SpiceBot").version, "version_url": "https://api.github.com/repos/SpiceBot/SpiceBot/commits/master", - "version_online": None, "version_online_num": None, } @@ -58,6 +56,8 @@ class BotVersion(): for line in lines: line = str(line) if "version=" in line: + line = line.replace("'b\" ", '') + line = line.replace(",\"", '') line = line.replace("version=", '') line = line.replace("'", '') self.spicebot["version_online_num"] = line @@ -66,8 +66,5 @@ class BotVersion(): feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") self.spicebot["version_online_num"] = str(self.spicebot["version_online_num"]) + "." + str(len(feedjson.entries)) - self.spicebot["version_local"] = sopel._version_info(self.spicebot["version_local_num"]) - self.spicebot["version_online"] = sopel._version_info(self.spicebot["version_online_num"]) - version = BotVersion() From ae67103152912988ae474549724d9798168ed226 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:13:26 -0400 Subject: [PATCH 25/34] test --- sopel_modules/SpiceBot/Version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 643cb0f..bf12a14 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -56,11 +56,11 @@ class BotVersion(): for line in lines: line = str(line) if "version=" in line: - line = line.replace("'b\" ", '') + line = line.replace("'b\"", '') line = line.replace(",\"", '') line = line.replace("version=", '') line = line.replace("'", '') - self.spicebot["version_online_num"] = line + self.spicebot["version_online_num"] = line.strip() continue feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") From c647a4eca61547d1c027ac5b78ae62bd5c8b98b6 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:15:17 -0400 Subject: [PATCH 26/34] test --- sopel_modules/SpiceBot/Version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index bf12a14..c83b669 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -54,13 +54,13 @@ class BotVersion(): lines = htmlfile.read().splitlines() self.spicebot["version_online_num"] = self.spicebot["version_local_num"] for line in lines: - line = str(line) + line = str(line).strip() if "version=" in line: line = line.replace("'b\"", '') line = line.replace(",\"", '') line = line.replace("version=", '') line = line.replace("'", '') - self.spicebot["version_online_num"] = line.strip() + self.spicebot["version_online_num"] = line continue feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") From 9912014bfb42ce1d6f61e14bf0a54124e0a60d50 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:20:03 -0400 Subject: [PATCH 27/34] test --- sopel_modules/SpiceBot/Version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index c83b669..7f46a3c 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -54,7 +54,7 @@ class BotVersion(): lines = htmlfile.read().splitlines() self.spicebot["version_online_num"] = self.spicebot["version_local_num"] for line in lines: - line = str(line).strip() + line = str(line).decode("utf-8").strip() if "version=" in line: line = line.replace("'b\"", '') line = line.replace(",\"", '') From 355826450bac45a02a13705a37622665e1ba15df Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:21:46 -0400 Subject: [PATCH 28/34] test --- sopel_modules/SpiceBot/Version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 7f46a3c..1a0ebb3 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -54,7 +54,7 @@ class BotVersion(): lines = htmlfile.read().splitlines() self.spicebot["version_online_num"] = self.spicebot["version_local_num"] for line in lines: - line = str(line).decode("utf-8").strip() + line = str(line).encode("utf-8").decode("utf-8") if "version=" in line: line = line.replace("'b\"", '') line = line.replace(",\"", '') From 4e98a3555cde14b9a0bae59674851245d28ec599 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:24:03 -0400 Subject: [PATCH 29/34] test --- sopel_modules/SpiceBot/Version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 1a0ebb3..abf104d 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -54,9 +54,9 @@ class BotVersion(): lines = htmlfile.read().splitlines() self.spicebot["version_online_num"] = self.spicebot["version_local_num"] for line in lines: - line = str(line).encode("utf-8").decode("utf-8") + line = str(line) if "version=" in line: - line = line.replace("'b\"", '') + line = line.replace("\" ", '') line = line.replace(",\"", '') line = line.replace("version=", '') line = line.replace("'", '') From ef13e7b60593a2073df8efc3f4b7d44b4d3c8aba Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:25:39 -0400 Subject: [PATCH 30/34] test --- sopel_modules/SpiceBot/Version.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index abf104d..7804cd6 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -60,6 +60,7 @@ class BotVersion(): line = line.replace(",\"", '') line = line.replace("version=", '') line = line.replace("'", '') + line = line.replace("b", '') self.spicebot["version_online_num"] = line continue From 9a82cdef887f55a0a66c5da58812029254cc12eb Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:30:30 -0400 Subject: [PATCH 31/34] 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) From a0313a7a97721223e42866209e527e85d28aaa80 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 14:57:58 -0400 Subject: [PATCH 32/34] oops --- sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py b/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py index bed30d3..6000cd0 100644 --- a/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py +++ b/sopel_modules/SpiceBot_Core_Processing/StartupMonologue.py @@ -24,7 +24,7 @@ def bot_startup_monologue_start(bot, trigger): def bot_startup_monologue_sopel_version(bot, trigger): 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"]) + SpiceBot.startupmonologue.dict["spicebot_version"] = "SpiceBot " + str(SpiceBot.version.spicebot["version_local_num"]) @sopel.module.event(SpiceBot.events.BOT_CHANNELS) From 8a626c5d946a9f8936f0547b83c252a06e2ce5e5 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 16 Jul 2019 16:16:28 -0400 Subject: [PATCH 33/34] fix --- sopel_modules/SpiceBot_Core_Commands/Version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot_Core_Commands/Version.py b/sopel_modules/SpiceBot_Core_Commands/Version.py index b8b66a6..28b7727 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Version.py +++ b/sopel_modules/SpiceBot_Core_Commands/Version.py @@ -20,6 +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"])) + fulldisp.append("I am running SpiceBot " + str(SpiceBot.version.spicebot["version_local_num"])) bot.osd(fulldisp) From a4d40e11df0edbcb36a0f01a7df698c475f8f86f Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 17 Jul 2019 08:21:15 -0400 Subject: [PATCH 34/34] todo later --- sopel_modules/SpiceBot/Version.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sopel_modules/SpiceBot/Version.py b/sopel_modules/SpiceBot/Version.py index 7804cd6..ad308de 100644 --- a/sopel_modules/SpiceBot/Version.py +++ b/sopel_modules/SpiceBot/Version.py @@ -7,7 +7,7 @@ This is the SpiceBot Update system. import sopel import requests -import feedparser +# import feedparser import pkg_resources from fake_useragent import UserAgent import urllib @@ -64,8 +64,9 @@ class BotVersion(): self.spicebot["version_online_num"] = line continue - feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") - self.spicebot["version_online_num"] = str(self.spicebot["version_online_num"]) + "." + str(len(feedjson.entries)) + # TODO + # feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom") + # self.spicebot["version_online_num"] = str(self.spicebot["version_online_num"]) + "." + str(len(feedjson.entries)) version = BotVersion()