jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix updates to use *_extension instead of *_cog

Browse source
This commit is contained in:
Zeva Rose 2022-05-30 22:53:25 -06:00
parent 4e3f168a4d
commit 7564c37f14
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
jarvis/utils/updates.py
View file

@ -151,20 +151,20 @@ async def update(bot: "Client") -> Optional[UpdateResult]:
for module in current_commands.keys(): for module in current_commands.keys():
if module not in new_commands: if module not in new_commands:
logger.debug("Module %s removed after update", module) logger.debug("Module %s removed after update", module)
bot.drop_cog(module) bot.unload_extension(module)
unloaded.append(module) unloaded.append(module)
logger.debug("Checking for new/modified commands") logger.debug("Checking for new/modified commands")
for module, commands in new_commands.items(): for module, commands in new_commands.items():
logger.debug("Processing %s", module) logger.debug("Processing %s", module)
if module not in current_commands: if module not in current_commands:
bot.load_cog(module) bot.load_extension(module)
loaded.append(module) loaded.append(module)
elif len(current_commands[module]) != len(commands): elif len(current_commands[module]) != len(commands):
try: try:
bot.reload_cog(module) bot.reload_extension(module)
except ExtensionNotFound: except ExtensionNotFound:
bot.load_cog(module) bot.load_extension(module)
reloaded.append(module) reloaded.append(module)
else: else:
for command in commands: for command in commands:
@ -187,23 +187,23 @@ async def update(bot: "Client") -> Optional[UpdateResult]:
# Check if number arguments have changed # Check if number arguments have changed
if len(old_args) != len(new_args): if len(old_args) != len(new_args):
try: try:
bot.reload_cog(module) bot.reload_extension(module)
except ExtensionNotFound: except ExtensionNotFound:
bot.load_cog(module) bot.load_extension(module)
reloaded.append(module) reloaded.append(module)
elif any(x not in old_arg_names for x in new_arg_names) or any( elif any(x not in old_arg_names for x in new_arg_names) or any(
x not in new_arg_names for x in old_arg_names x not in new_arg_names for x in old_arg_names
): ):
try: try:
bot.reload_cog(module) bot.reload_extension(module)
except ExtensionNotFound: except ExtensionNotFound:
bot.load_cog(module) bot.load_extension(module)
reloaded.append(module) reloaded.append(module)
elif any(new_args[idx].type != x.type for idx, x in enumerate(old_args)): elif any(new_args[idx].type != x.type for idx, x in enumerate(old_args)):
try: try:
bot.reload_cog(module) bot.reload_extension(module)
except ExtensionNotFound: except ExtensionNotFound:
bot.load_cog(module) bot.load_extension(module)
reloaded.append(module) reloaded.append(module)
return UpdateResult( return UpdateResult(