Compare commits

..

No commits in common. "6cb2a7a4f1bae935a20d1b6bc528bb3be213426f" and "8e28d83af41f6d9d2469fcfcaac574a5d53fe81e" have entirely different histories.

4 changed files with 3 additions and 8 deletions

5
bot.py
View File

@ -106,9 +106,6 @@ class Fulvia(irc.IRCClient):
the URL module. the URL module.
""" """
self._disabled_modules = self.config.core.disabled_modules.split(",")
"""These modules will NOT be loaded when load_modules() is called."""
self.load_modules() self.load_modules()
@ -129,8 +126,6 @@ class Fulvia(irc.IRCClient):
failed = 0 failed = 0
for name, path in modules.items(): for name, path in modules.items():
try: try:
if name in self._disabled_modules:
continue
loader.load_module(self, path) loader.load_module(self, path)
loaded += 1 loaded += 1
except Exception as e: except Exception as e:

View File

@ -11,7 +11,7 @@ from tools.calculation import eval_equation
BASE_TUMBOLIA_URI = 'https://tumbolia-two.appspot.com/' BASE_TUMBOLIA_URI = 'https://tumbolia-two.appspot.com/'
@commands('calc', 'c') @commands('c', 'calc')
@example('.c 5 + 3', '8') @example('.c 5 + 3', '8')
def c(bot, trigger): def c(bot, trigger):
"""Evaluate some calculation.""" """Evaluate some calculation."""

View File

@ -44,7 +44,7 @@ class MonitorThread(threading.Thread):
delete_reminder(self._bot, oldtime) delete_reminder(self._bot, oldtime)
if not self._bot.memory["remind"] or not self._bot.stillConnected(): if not self._bot.memory["remind"] or not self._bot.stillConnected():
self.stop.set() self.stop.set()
self.stop.wait(2.5) time.sleep(2.5)
del self._bot.memory["remind_monitor"] del self._bot.memory["remind_monitor"]

View File

@ -35,7 +35,7 @@ def title_auto(bot, trigger):
if broken: if broken:
continue continue
try: try:
res = requests.get(url, headers=HEADERS, verify=True, timeout=10) res = requests.get(url, headers=HEADERS, verify=True)
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
continue continue
try: try: