diff --git a/README.md b/README.md index ea9474b..e3b4f14 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,7 @@ SpiceBot aims to run SpiceBot as an IRC service Use at your own risk. Problems are not my faultâ„¢. # Installation -This install assumes you know that you need sopel installed, depending on how bleeding edge you want sopel to be, - -```` -pip3 install sopel>=6.0,<7 -OR -pip3 install git+https://github.com/sopel-irc/sopel@master -```` +This install assumes you want to run on Sopel master ```` git clone https://github.com/SpiceBot/SpiceBot.git diff --git a/requirements.txt b/requirements.txt index 6aabc4d..db515d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ spicemanip>=0.1.6 gitpython fake-useragent +git+https://github.com/sopel-irc/sopel@master diff --git a/sopel_modules/SpiceBot_Logs/Logs.py b/sopel_modules/SpiceBot_Logs/Logs.py index ebbb12c..c046605 100644 --- a/sopel_modules/SpiceBot_Logs/Logs.py +++ b/sopel_modules/SpiceBot_Logs/Logs.py @@ -47,6 +47,9 @@ def join_log_channel(bot, trigger): if channel not in bot.channels.keys() and bot.config.SpiceBot_Channels.operadmin: bot.write(('SAJOIN', bot.nick, channel)) + if 'SpiceBot_Logs_queue' not in bot.memory: + bot.memory['SpiceBot_Logs_queue'] = [] + while True: if len(bot.memory['SpiceBot_Logs_queue']): bot.say(str(bot.memory['SpiceBot_Logs_queue'][0]), channel) diff --git a/sopel_modules/SpiceBot_Restart/Restart.py b/sopel_modules/SpiceBot_Restart/Restart.py index e14c412..5e078e7 100644 --- a/sopel_modules/SpiceBot_Restart/Restart.py +++ b/sopel_modules/SpiceBot_Restart/Restart.py @@ -4,9 +4,16 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi # sopel imports import sopel.module -from sopel.config.types import StaticSection, ValidatedAttribute -from sopel_modules.SpiceBot_SBTools import service_manip, bot_logging, spicebot_reload +from sopel_modules.SpiceBot_SBTools import bot_logging, spicebot_reload + + +def configure(config): + pass + + +def setup(bot): + pass def shutdown(bot): diff --git a/sopel_modules/SpiceBot_SBTools/__init__.py b/sopel_modules/SpiceBot_SBTools/__init__.py index 2e3003a..9bbaa95 100644 --- a/sopel_modules/SpiceBot_SBTools/__init__.py +++ b/sopel_modules/SpiceBot_SBTools/__init__.py @@ -253,8 +253,6 @@ def channel_list_current(bot): def spicebot_reload(bot, log_from='service_manip', quitmessage='Recieved QUIT'): # service_manip(bot, bot.nick, 'restart', log_from) - # bot.reload_plugins() - # bot.write(('NOTICE', bot.nick), '001 Foo :Hello') bot.restart(quitmessage) diff --git a/sopel_modules/SpiceBot_Update/Update.py b/sopel_modules/SpiceBot_Update/Update.py index 991c54e..a6f3998 100644 --- a/sopel_modules/SpiceBot_Update/Update.py +++ b/sopel_modules/SpiceBot_Update/Update.py @@ -7,11 +7,10 @@ import sopel.module from sopel.config.types import StaticSection, ValidatedAttribute import os -import pip import spicemanip -from sopel_modules.SpiceBot_SBTools import service_manip, sopel_triggerargs, command_permissions_check, bot_logging, spicebot_reload +from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, bot_logging, spicebot_reload class SpiceBot_Update_MainSection(StaticSection):