diff options
Diffstat (limited to 'bot/utils')
| -rw-r--r-- | bot/utils/extensions.py | 45 | ||||
| -rw-r--r-- | bot/utils/pagination.py | 3 |
2 files changed, 1 insertions, 47 deletions
diff --git a/bot/utils/extensions.py b/bot/utils/extensions.py deleted file mode 100644 index 09192ae2..00000000 --- a/bot/utils/extensions.py +++ /dev/null @@ -1,45 +0,0 @@ -import importlib -import inspect -import pkgutil -from collections.abc import Iterator -from typing import NoReturn - -from discord.ext.commands import Context - -from bot import exts - - -def unqualify(name: str) -> str: - """Return an unqualified name given a qualified module/package `name`.""" - return name.rsplit(".", maxsplit=1)[-1] - - -def walk_extensions() -> Iterator[str]: - """Yield extension names from the bot.exts subpackage.""" - - def on_error(name: str) -> NoReturn: - raise ImportError(name=name) # pragma: no cover - - for module in pkgutil.walk_packages(exts.__path__, f"{exts.__name__}.", onerror=on_error): - if unqualify(module.name).startswith("_"): - # Ignore module/package names starting with an underscore. - continue - - if module.ispkg: - imported = importlib.import_module(module.name) - if not inspect.isfunction(getattr(imported, "setup", None)): - # If it lacks a setup function, it's not an extension. - continue - - yield module.name - - -async def invoke_help_command(ctx: Context) -> None: - """Invoke the help command or default help command if help extensions is not loaded.""" - if "bot.exts.core.help" in ctx.bot.extensions: - help_command = ctx.bot.get_command("help") - await ctx.invoke(help_command, ctx.command.qualified_name) - return - await ctx.send_help(ctx.command) - -EXTENSIONS = frozenset(walk_extensions()) diff --git a/bot/utils/pagination.py b/bot/utils/pagination.py index 188b279f..b291f7db 100644 --- a/bot/utils/pagination.py +++ b/bot/utils/pagination.py @@ -5,7 +5,6 @@ from typing import Optional from discord import Embed, Member, Reaction from discord.abc import User -from discord.embeds import EmptyEmbed from discord.ext.commands import Context, Paginator from bot.constants import Emojis @@ -422,7 +421,7 @@ class ImagePaginator(Paginator): # Magic happens here, after page and reaction_type is set embed.description = paginator.pages[current_page] - image = paginator.images[current_page] or EmptyEmbed + image = paginator.images[current_page] or None embed.set_image(url=image) embed.set_footer(text=f"Page {current_page + 1}/{len(paginator.pages)}") |