CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-07 11:48:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Optimize config calls in few places (#3766)

Browse Source 
* Just a tiny PR improving config call in a lot of places (Specially events and Help)

Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>

* missed this one

Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>

* welp

Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>

* welp

Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>

* welp

Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>

* jack

Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>

* Update redbot/cogs/mod/kickban.py

Co-Authored-By: jack1142 <6032823+jack1142@users.noreply.github.com>

* jack

Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>
This commit is contained in:
Draper 2020-04-20 18:29:36 +01:00 committed by GitHub
parent e4018ec677
commit f59e77002b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 153 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
redbot/cogs/bank/bank.py
View File

@ -48,15 +48,16 @@ class Bank(commands.Cog):
"""Base command for bank settings.""" """Base command for bank settings."""
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
if await bank.is_global(): if await bank.is_global():
bank_name = await bank._config.bank_name() group = bank._config
currency_name = await bank._config.currency()
default_balance = await bank._config.default_balance()
else: else:
if not ctx.guild: if not ctx.guild:
return return
bank_name = await bank._config.guild(ctx.guild).bank_name() group = bank._config.guild(ctx.guild)
currency_name = await bank._config.guild(ctx.guild).currency() group_data = await group.all()
default_balance = await bank._config.guild(ctx.guild).default_balance() bank_name = group_data["bank_name"]
currency_name = group_data["currency"]
default_balance = group_data["default_balance"]
max_balance = group_data["max_balance"]
settings = _( settings = _(
"Bank settings:\n\nBank name: {bank_name}\nCurrency: {currency_name}\n" "Bank settings:\n\nBank name: {bank_name}\nCurrency: {currency_name}\n"
@ -65,7 +66,7 @@ class Bank(commands.Cog):
bank_name=bank_name, bank_name=bank_name,
currency_name=currency_name, currency_name=currency_name,
default_balance=humanize_number(default_balance), default_balance=humanize_number(default_balance),
maximum_bal=humanize_number(await bank.get_max_balance(ctx.guild)), maximum_bal=humanize_number(max_balance),
) )
await ctx.send(box(settings)) await ctx.send(box(settings))

16
redbot/cogs/downloader/downloader.py
View File

@ -195,8 +195,9 @@ class Downloader(commands.Cog):
The modules to check off. The modules to check off.
""" """
installed_cogs = await self.config.installed_cogs() async with self.config.all() as global_data:
installed_libraries = await self.config.installed_libraries() installed_cogs = global_data["installed_cogs"]
installed_libraries = global_data["installed_libraries"]
for module in modules: for module in modules:
if module.type == InstallableType.COG: if module.type == InstallableType.COG:
installed = installed_cogs installed = installed_cogs
@ -208,9 +209,6 @@ class Downloader(commands.Cog):
repo_json = installed.setdefault(module.repo_name, {}) repo_json = installed.setdefault(module.repo_name, {})
repo_json[module.name] = module_json repo_json[module.name] = module_json
await self.config.installed_cogs.set(installed_cogs)
await self.config.installed_libraries.set(installed_libraries)
async def _remove_from_installed(self, modules: Iterable[InstalledModule]) -> None: async def _remove_from_installed(self, modules: Iterable[InstalledModule]) -> None:
"""Remove modules from the saved list """Remove modules from the saved list
of installed modules (corresponding to type of module). of installed modules (corresponding to type of module).
@ -221,8 +219,9 @@ class Downloader(commands.Cog):
The modules to remove. The modules to remove.
""" """
installed_cogs = await self.config.installed_cogs() async with self.config.all() as global_data:
installed_libraries = await self.config.installed_libraries() installed_cogs = global_data["installed_cogs"]
installed_libraries = global_data["installed_libraries"]
for module in modules: for module in modules:
if module.type == InstallableType.COG: if module.type == InstallableType.COG:
installed = installed_cogs installed = installed_cogs
@ -233,9 +232,6 @@ class Downloader(commands.Cog):
with contextlib.suppress(KeyError): with contextlib.suppress(KeyError):
installed[module._json_repo_name].pop(module.name) installed[module._json_repo_name].pop(module.name)
await self.config.installed_cogs.set(installed_cogs)
await self.config.installed_libraries.set(installed_libraries)
async def _shared_lib_load_check(self, cog_name: str) -> Optional[Repo]: async def _shared_lib_load_check(self, cog_name: str) -> Optional[Repo]:
# remove in Red 3.4 # remove in Red 3.4
is_installed, cog = await self.is_installed(cog_name) is_installed, cog = await self.is_installed(cog_name)

45
redbot/cogs/filter/filter.py
View File

@ -83,12 +83,14 @@ class Filter(commands.Cog):
) )
return return
elif count == 0 and timeframe == 0: elif count == 0 and timeframe == 0:
await self.config.guild(ctx.guild).filterban_count.set(0) async with self.config.guild(ctx.guild).all() as guild_data:
await self.config.guild(ctx.guild).filterban_time.set(0) guild_data["filterban_count"] = 0
guild_data["filterban_time"] = 0
await ctx.send(_("Autoban disabled.")) await ctx.send(_("Autoban disabled."))
else: else:
await self.config.guild(ctx.guild).filterban_count.set(count) async with self.config.guild(ctx.guild).all() as guild_data:
await self.config.guild(ctx.guild).filterban_time.set(timeframe) guild_data["filterban_count"] = count
guild_data["filterban_time"] = timeframe
await ctx.send(_("Count and time have been set.")) await ctx.send(_("Count and time have been set."))
@commands.group(name="filter") @commands.group(name="filter")
@ -276,8 +278,10 @@ class Filter(commands.Cog):
This is disabled by default. This is disabled by default.
""" """
guild = ctx.guild guild = ctx.guild
current_setting = await self.config.guild(guild).filter_names()
await self.config.guild(guild).filter_names.set(not current_setting) async with self.config.guild(guild).all() as guild_data:
current_setting = guild_data["filter_names"]
guild_data["filter_names"] = not current_setting
if current_setting: if current_setting:
await ctx.send(_("Names and nicknames will no longer be filtered.")) await ctx.send(_("Names and nicknames will no longer be filtered."))
else: else:
@ -365,21 +369,23 @@ class Filter(commands.Cog):
return hits return hits
async def check_filter(self, message: discord.Message): async def check_filter(self, message: discord.Message):
server = message.guild guild = message.guild
author = message.author author = message.author
guild_data = await self.config.guild(guild).all()
filter_count = await self.config.guild(server).filterban_count() member_data = await self.config.member(author).all()
filter_time = await self.config.guild(server).filterban_time() filter_count = guild_data["filterban_count"]
user_count = await self.config.member(author).filter_count() filter_time = guild_data["filterban_time"]
next_reset_time = await self.config.member(author).next_reset_time() user_count = member_data["filter_count"]
next_reset_time = member_data["next_reset_time"]
if filter_count > 0 and filter_time > 0: if filter_count > 0 and filter_time > 0:
if message.created_at.timestamp() >= next_reset_time: if message.created_at.timestamp() >= next_reset_time:
next_reset_time = message.created_at.timestamp() + filter_time next_reset_time = message.created_at.timestamp() + filter_time
await self.config.member(author).next_reset_time.set(next_reset_time) async with self.config.member(author).all() as member_data:
member_data["next_reset_time"] = next_reset_time
if user_count > 0: if user_count > 0:
user_count = 0 user_count = 0
await self.config.member(author).filter_count.set(user_count) member_data["filter_count"] = user_count
hits = await self.filter_hits(message.content, message.channel) hits = await self.filter_hits(message.content, message.channel)
@ -399,17 +405,17 @@ class Filter(commands.Cog):
): ):
reason = _("Autoban (too many filtered messages.)") reason = _("Autoban (too many filtered messages.)")
try: try:
await server.ban(author, reason=reason) await guild.ban(author, reason=reason)
except discord.HTTPException: except discord.HTTPException:
pass pass
else: else:
await modlog.create_case( await modlog.create_case(
self.bot, self.bot,
server, guild,
message.created_at, message.created_at,
"filterban", "filterban",
author, author,
server.me, guild.me,
reason, reason,
) )
@ -449,12 +455,13 @@ class Filter(commands.Cog):
return # Discord Hierarchy applies to nicks return # Discord Hierarchy applies to nicks
if await self.bot.is_automod_immune(member): if await self.bot.is_automod_immune(member):
return return
if not await self.config.guild(member.guild).filter_names(): guild_data = await self.config.guild(member.guild).all()
if not guild_data["filter_names"]:
return return
if await self.filter_hits(member.display_name, member.guild): if await self.filter_hits(member.display_name, member.guild):
name_to_use = await self.config.guild(member.guild).filter_default_name() name_to_use = guild_data["filter_default_name"]
reason = _("Filtered nickname") if member.nick else _("Filtered name") reason = _("Filtered nickname") if member.nick else _("Filtered name")
try: try:
await member.edit(nick=name_to_use, reason=reason) await member.edit(nick=name_to_use, reason=reason)

5
redbot/cogs/mod/kickban.py
View File

@ -410,9 +410,8 @@ class KickBanMixin(MixinMeta):
queue_entry = (guild.id, user.id) queue_entry = (guild.id, user.id)
await self.config.member(user).banned_until.set(unban_time.timestamp()) await self.config.member(user).banned_until.set(unban_time.timestamp())
cur_tbans = await self.config.guild(guild).current_tempbans() async with self.config.guild(guild).current_tempbans() as current_tempbans:
cur_tbans.append(user.id) current_tempbans.append(user.id)
await self.config.guild(guild).current_tempbans.set(cur_tbans)
with contextlib.suppress(discord.HTTPException): with contextlib.suppress(discord.HTTPException):
# We don't want blocked DMs preventing us from banning # We don't want blocked DMs preventing us from banning

128
redbot/core/commands/help.py
View File

@ -74,6 +74,7 @@ class HelpSettings:
verify_checks: bool = True verify_checks: bool = True
verify_exists: bool = False verify_exists: bool = False
tagline: str = "" tagline: str = ""
delete_delay: int = 0
# Contrib Note: This is intentional to not accept the bot object # Contrib Note: This is intentional to not accept the bot object
# There are plans to allow guild and user specific help settings # There are plans to allow guild and user specific help settings
@ -123,40 +124,55 @@ class RedHelpFormatter:
For most cases, you should use this and only this directly. For most cases, you should use this and only this directly.
""" """
help_settings = await HelpSettings.from_context(ctx)
if help_for is None or isinstance(help_for, dpy_commands.bot.BotBase): if help_for is None or isinstance(help_for, dpy_commands.bot.BotBase):
await self.format_bot_help(ctx) await self.format_bot_help(ctx, help_settings=help_settings)
return return
if isinstance(help_for, str): if isinstance(help_for, str):
try: try:
help_for = self.parse_command(ctx, help_for) help_for = self.parse_command(ctx, help_for)
except NoCommand: except NoCommand:
await self.command_not_found(ctx, help_for) await self.command_not_found(ctx, help_for, help_settings=help_settings)
return return
except NoSubCommand as exc: except NoSubCommand as exc:
if await ctx.bot._config.help.verify_exists(): if help_settings.verify_exists:
await self.subcommand_not_found(ctx, exc.last, exc.not_found) await self.subcommand_not_found(
ctx, exc.last, exc.not_found, help_settings=help_settings
)
return return
help_for = exc.last help_for = exc.last
if isinstance(help_for, commands.Cog): if isinstance(help_for, commands.Cog):
await self.format_cog_help(ctx, help_for) await self.format_cog_help(ctx, help_for, help_settings=help_settings)
else: else:
await self.format_command_help(ctx, help_for) await self.format_command_help(ctx, help_for, help_settings=help_settings)
async def get_cog_help_mapping(self, ctx: Context, obj: commands.Cog): async def get_cog_help_mapping(
self, ctx: Context, obj: commands.Cog, help_settings: HelpSettings
):
iterator = filter(lambda c: c.parent is None and c.cog is obj, ctx.bot.commands) iterator = filter(lambda c: c.parent is None and c.cog is obj, ctx.bot.commands)
return {com.name: com async for com in self.help_filter_func(ctx, iterator)}
async def get_group_help_mapping(self, ctx: Context, obj: commands.Group):
return { return {
com.name: com async for com in self.help_filter_func(ctx, obj.all_commands.values()) com.name: com
async for com in self.help_filter_func(ctx, iterator, help_settings=help_settings)
} }
async def get_bot_help_mapping(self, ctx): async def get_group_help_mapping(
self, ctx: Context, obj: commands.Group, help_settings: HelpSettings
):
return {
com.name: com
async for com in self.help_filter_func(
ctx, obj.all_commands.values(), help_settings=help_settings
)
}
async def get_bot_help_mapping(self, ctx, help_settings: HelpSettings):
sorted_iterable = [] sorted_iterable = []
for cogname, cog in (*sorted(ctx.bot.cogs.items()), (None, None)): for cogname, cog in (*sorted(ctx.bot.cogs.items()), (None, None)):
cm = await self.get_cog_help_mapping(ctx, cog) cm = await self.get_cog_help_mapping(ctx, cog, help_settings=help_settings)
if cm: if cm:
sorted_iterable.append((cogname, cm)) sorted_iterable.append((cogname, cm))
return sorted_iterable return sorted_iterable
@ -168,11 +184,15 @@ class RedHelpFormatter:
"You can also type {ctx.clean_prefix}help <category> for more info on a category." "You can also type {ctx.clean_prefix}help <category> for more info on a category."
).format(ctx=ctx) ).format(ctx=ctx)
async def format_command_help(self, ctx: Context, obj: commands.Command): async def format_command_help(
self, ctx: Context, obj: commands.Command, help_settings: HelpSettings
):
send = await ctx.bot._config.help.verify_exists() send = help_settings.verify_exists
if not send: if not send:
async for _ in self.help_filter_func(ctx, (obj,), bypass_hidden=True): async for _ in self.help_filter_func(
ctx, (obj,), bypass_hidden=True, help_settings=help_settings
):
# This is a really lazy option for not # This is a really lazy option for not
# creating a separate single case version. # creating a separate single case version.
# It is efficient though # It is efficient though
@ -187,7 +207,8 @@ class RedHelpFormatter:
command = obj command = obj
description = command.description or "" description = command.description or ""
tagline = (await ctx.bot._config.help.tagline()) or self.get_default_tagline(ctx)
tagline = (help_settings.tagline) or self.get_default_tagline(ctx)
signature = ( signature = (
f"`{T_('Syntax')}: {ctx.clean_prefix}{command.qualified_name} {command.signature}`" f"`{T_('Syntax')}: {ctx.clean_prefix}{command.qualified_name} {command.signature}`"
) )
@ -195,7 +216,7 @@ class RedHelpFormatter:
if hasattr(command, "all_commands"): if hasattr(command, "all_commands"):
grp = cast(commands.Group, command) grp = cast(commands.Group, command)
subcommands = await self.get_group_help_mapping(ctx, grp) subcommands = await self.get_group_help_mapping(ctx, grp, help_settings=help_settings)
if await ctx.embed_requested(): if await ctx.embed_requested():
emb = {"embed": {"title": "", "description": ""}, "footer": {"text": ""}, "fields": []} emb = {"embed": {"title": "", "description": ""}, "footer": {"text": ""}, "fields": []}
@ -235,7 +256,7 @@ class RedHelpFormatter:
field = EmbedField(title, page, False) field = EmbedField(title, page, False)
emb["fields"].append(field) emb["fields"].append(field)
await self.make_and_send_embeds(ctx, emb) await self.make_and_send_embeds(ctx, emb, help_settings=help_settings)
else: # Code blocks: else: # Code blocks:
@ -272,7 +293,7 @@ class RedHelpFormatter:
) )
) )
pages = [box(p) for p in pagify(to_page)] pages = [box(p) for p in pagify(to_page)]
await self.send_pages(ctx, pages, embed=False) await self.send_pages(ctx, pages, embed=False, help_settings=help_settings)
@staticmethod @staticmethod
def group_embed_fields(fields: List[EmbedField], max_chars=1000): def group_embed_fields(fields: List[EmbedField], max_chars=1000):
@ -298,11 +319,11 @@ class RedHelpFormatter:
return ret return ret
async def make_and_send_embeds(self, ctx, embed_dict: dict): async def make_and_send_embeds(self, ctx, embed_dict: dict, help_settings: HelpSettings):
pages = [] pages = []
page_char_limit = await ctx.bot._config.help.page_char_limit() page_char_limit = help_settings.page_char_limit
page_char_limit = min(page_char_limit, 5500) # Just in case someone was manually... page_char_limit = min(page_char_limit, 5500) # Just in case someone was manually...
author_info = { author_info = {
@ -367,16 +388,16 @@ class RedHelpFormatter:
pages.append(embed) pages.append(embed)
await self.send_pages(ctx, pages, embed=True) await self.send_pages(ctx, pages, embed=True, help_settings=help_settings)
async def format_cog_help(self, ctx: Context, obj: commands.Cog): async def format_cog_help(self, ctx: Context, obj: commands.Cog, help_settings: HelpSettings):
coms = await self.get_cog_help_mapping(ctx, obj) coms = await self.get_cog_help_mapping(ctx, obj, help_settings=help_settings)
if not (coms or await ctx.bot._config.help.verify_exists()): if not (coms or help_settings.verify_exists):
return return
description = obj.format_help_for_context(ctx) description = obj.format_help_for_context(ctx)
tagline = (await ctx.bot._config.help.tagline()) or self.get_default_tagline(ctx) tagline = (help_settings.tagline) or self.get_default_tagline(ctx)
if await ctx.embed_requested(): if await ctx.embed_requested():
emb = {"embed": {"title": "", "description": ""}, "footer": {"text": ""}, "fields": []} emb = {"embed": {"title": "", "description": ""}, "footer": {"text": ""}, "fields": []}
@ -410,7 +431,7 @@ class RedHelpFormatter:
field = EmbedField(title, page, False) field = EmbedField(title, page, False)
emb["fields"].append(field) emb["fields"].append(field)
await self.make_and_send_embeds(ctx, emb) await self.make_and_send_embeds(ctx, emb, help_settings=help_settings)
else: else:
subtext = None subtext = None
@ -434,16 +455,16 @@ class RedHelpFormatter:
to_page = "\n\n".join(filter(None, (description, subtext_header, subtext))) to_page = "\n\n".join(filter(None, (description, subtext_header, subtext)))
pages = [box(p) for p in pagify(to_page)] pages = [box(p) for p in pagify(to_page)]
await self.send_pages(ctx, pages, embed=False) await self.send_pages(ctx, pages, embed=False, help_settings=help_settings)
async def format_bot_help(self, ctx: Context): async def format_bot_help(self, ctx: Context, help_settings: HelpSettings):
coms = await self.get_bot_help_mapping(ctx) coms = await self.get_bot_help_mapping(ctx, help_settings=help_settings)
if not coms: if not coms:
return return
description = ctx.bot.description or "" description = ctx.bot.description or ""
tagline = (await ctx.bot._config.help.tagline()) or self.get_default_tagline(ctx) tagline = (help_settings.tagline) or self.get_default_tagline(ctx)
if await ctx.embed_requested(): if await ctx.embed_requested():
@ -475,7 +496,7 @@ class RedHelpFormatter:
field = EmbedField(title, page, False) field = EmbedField(title, page, False)
emb["fields"].append(field) emb["fields"].append(field)
await self.make_and_send_embeds(ctx, emb) await self.make_and_send_embeds(ctx, emb, help_settings=help_settings)
else: else:
to_join = [] to_join = []
@ -510,18 +531,17 @@ class RedHelpFormatter:
to_join.append(f"\n{tagline}") to_join.append(f"\n{tagline}")
to_page = "\n".join(to_join) to_page = "\n".join(to_join)
pages = [box(p) for p in pagify(to_page)] pages = [box(p) for p in pagify(to_page)]
await self.send_pages(ctx, pages, embed=False) await self.send_pages(ctx, pages, embed=False, help_settings=help_settings)
@staticmethod @staticmethod
async def help_filter_func( async def help_filter_func(
ctx, objects: Iterable[SupportsCanSee], bypass_hidden=False ctx, objects: Iterable[SupportsCanSee], help_settings: HelpSettings, bypass_hidden=False,
) -> AsyncIterator[SupportsCanSee]: ) -> AsyncIterator[SupportsCanSee]:
""" """
This does most of actual filtering. This does most of actual filtering.
""" """
show_hidden = bypass_hidden or help_settings.show_hidden
show_hidden = bypass_hidden or await ctx.bot._config.help.show_hidden() verify_checks = help_settings.verify_checks
verify_checks = await ctx.bot._config.help.verify_checks()
# TODO: Settings for this in core bot db # TODO: Settings for this in core bot db
for obj in objects: for obj in objects:
@ -542,11 +562,16 @@ class RedHelpFormatter:
else: else:
yield obj yield obj
async def command_not_found(self, ctx, help_for): async def command_not_found(self, ctx, help_for, help_settings: HelpSettings):
""" """
Sends an error, fuzzy help, or stays quiet based on settings Sends an error, fuzzy help, or stays quiet based on settings
""" """
coms = {c async for c in self.help_filter_func(ctx, ctx.bot.walk_commands())} coms = {
c
async for c in self.help_filter_func(
ctx, ctx.bot.walk_commands(), help_settings=help_settings
)
}
fuzzy_commands = await fuzzy_command_search(ctx, help_for, commands=coms, min_score=75) fuzzy_commands = await fuzzy_command_search(ctx, help_for, commands=coms, min_score=75)
use_embeds = await ctx.embed_requested() use_embeds = await ctx.embed_requested()
if fuzzy_commands: if fuzzy_commands:
@ -555,25 +580,25 @@ class RedHelpFormatter:
ret.set_author( ret.set_author(
name=f"{ctx.me.display_name} {T_('Help Menu')}", icon_url=ctx.me.avatar_url name=f"{ctx.me.display_name} {T_('Help Menu')}", icon_url=ctx.me.avatar_url
) )
tagline = (await ctx.bot._config.help.tagline()) or self.get_default_tagline(ctx) tagline = help_settings.tagline or self.get_default_tagline(ctx)
ret.set_footer(text=tagline) ret.set_footer(text=tagline)
await ctx.send(embed=ret) await ctx.send(embed=ret)
else: else:
await ctx.send(ret) await ctx.send(ret)
elif await ctx.bot._config.help.verify_exists(): elif help_settings.verify_exists:
ret = T_("Help topic for *{command_name}* not found.").format(command_name=help_for) ret = T_("Help topic for *{command_name}* not found.").format(command_name=help_for)
if use_embeds: if use_embeds:
ret = discord.Embed(color=(await ctx.embed_color()), description=ret) ret = discord.Embed(color=(await ctx.embed_color()), description=ret)
ret.set_author( ret.set_author(
name=f"{ctx.me.display_name} {T_('Help Menu')}", icon_url=ctx.me.avatar_url name=f"{ctx.me.display_name} {T_('Help Menu')}", icon_url=ctx.me.avatar_url
) )
tagline = (await ctx.bot._config.help.tagline()) or self.get_default_tagline(ctx) tagline = help_settings.tagline or self.get_default_tagline(ctx)
ret.set_footer(text=tagline) ret.set_footer(text=tagline)
await ctx.send(embed=ret) await ctx.send(embed=ret)
else: else:
await ctx.send(ret) await ctx.send(ret)
async def subcommand_not_found(self, ctx, command, not_found): async def subcommand_not_found(self, ctx, command, not_found, help_settings: HelpSettings):
""" """
Sends an error Sends an error
""" """
@ -585,7 +610,7 @@ class RedHelpFormatter:
ret.set_author( ret.set_author(
name=f"{ctx.me.display_name} {T_('Help Menu')}", icon_url=ctx.me.avatar_url name=f"{ctx.me.display_name} {T_('Help Menu')}", icon_url=ctx.me.avatar_url
) )
tagline = (await ctx.bot._config.help.tagline()) or self.get_default_tagline(ctx) tagline = help_settings.tagline or self.get_default_tagline(ctx)
ret.set_footer(text=tagline) ret.set_footer(text=tagline)
await ctx.send(embed=ret) await ctx.send(embed=ret)
else: else:
@ -622,22 +647,25 @@ class RedHelpFormatter:
return com return com
async def send_pages( async def send_pages(
self, ctx: Context, pages: List[Union[str, discord.Embed]], embed: bool = True self,
ctx: Context,
pages: List[Union[str, discord.Embed]],
embed: bool = True,
help_settings: HelpSettings = None,
): ):
""" """
Sends pages based on settings. Sends pages based on settings.
""" """
# save on config calls # save on config calls
config_help = await ctx.bot._config.help()
channel_permissions = ctx.channel.permissions_for(ctx.me) channel_permissions = ctx.channel.permissions_for(ctx.me)
if not (channel_permissions.add_reactions and config_help["use_menus"]): if not (channel_permissions.add_reactions and help_settings.use_menus):
max_pages_in_guild = config_help["max_pages_in_guild"] max_pages_in_guild = help_settings.max_pages_in_guild
use_DMs = len(pages) > max_pages_in_guild use_DMs = len(pages) > max_pages_in_guild
destination = ctx.author if use_DMs else ctx.channel destination = ctx.author if use_DMs else ctx.channel
delete_delay = config_help["delete_delay"] delete_delay = help_settings.delete_delay
messages: List[discord.Message] = [] messages: List[discord.Message] = []
for page in pages: for page in pages:

10
redbot/core/core_commands.py
View File

@ -879,13 +879,14 @@ class Core(commands.Cog, CoreLogic):
"""Changes [botname]'s settings""" """Changes [botname]'s settings"""
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
if ctx.guild: if ctx.guild:
guild_data = await ctx.bot._config.guild(ctx.guild).all()
guild = ctx.guild guild = ctx.guild
admin_role_ids = await ctx.bot._config.guild(ctx.guild).admin_role() admin_role_ids = guild_data["admin_role"]
admin_role_names = [r.name for r in guild.roles if r.id in admin_role_ids] admin_role_names = [r.name for r in guild.roles if r.id in admin_role_ids]
admin_roles_str = ( admin_roles_str = (
humanize_list(admin_role_names) if admin_role_names else "Not Set." humanize_list(admin_role_names) if admin_role_names else "Not Set."
) )
mod_role_ids = await ctx.bot._config.guild(ctx.guild).mod_role() mod_role_ids = guild_data["mod_role"]
mod_role_names = [r.name for r in guild.roles if r.id in mod_role_ids] mod_role_names = [r.name for r in guild.roles if r.id in mod_role_ids]
mod_roles_str = humanize_list(mod_role_names) if mod_role_names else "Not Set." mod_roles_str = humanize_list(mod_role_names) if mod_role_names else "Not Set."
guild_settings = _("Admin roles: {admin}\nMod roles: {mod}\n").format( guild_settings = _("Admin roles: {admin}\nMod roles: {mod}\n").format(
@ -895,8 +896,9 @@ class Core(commands.Cog, CoreLogic):
guild_settings = "" guild_settings = ""
prefixes = await ctx.bot._prefix_cache.get_prefixes(ctx.guild) prefixes = await ctx.bot._prefix_cache.get_prefixes(ctx.guild)
locale = await ctx.bot._config.locale() global_data = await ctx.bot._config.all()
regional_format = await ctx.bot._config.regional_format() or _("Same as bot's locale") locale = global_data["locale"]
regional_format = global_data["regional_format"] or _("Same as bot's locale")
prefix_string = " ".join(prefixes) prefix_string = " ".join(prefixes)
settings = _( settings = _(

8
redbot/core/events.py
View File

@ -13,7 +13,7 @@ import pkg_resources
from colorama import Fore, Style, init from colorama import Fore, Style, init
from pkg_resources import DistributionNotFound from pkg_resources import DistributionNotFound
from redbot.core.commands import RedHelpFormatter from redbot.core.commands import RedHelpFormatter, HelpSettings
from redbot.core.i18n import Translator from redbot.core.i18n import Translator
from .. import __version__ as red_version, version_info as red_version_info, VersionInfo from .. import __version__ as red_version, version_info as red_version_info, VersionInfo
from . import commands from . import commands
@ -192,10 +192,14 @@ def init_events(bot, cli_flags):
bot._last_exception = exception_log bot._last_exception = exception_log
await ctx.send(inline(message)) await ctx.send(inline(message))
elif isinstance(error, commands.CommandNotFound): elif isinstance(error, commands.CommandNotFound):
help_settings = await HelpSettings.from_context(ctx)
fuzzy_commands = await fuzzy_command_search( fuzzy_commands = await fuzzy_command_search(
ctx, ctx,
commands={ commands={
c async for c in RedHelpFormatter.help_filter_func(ctx, bot.walk_commands()) c
async for c in RedHelpFormatter.help_filter_func(
ctx, bot.walk_commands(), help_settings=help_settings
)
}, },
) )
if not fuzzy_commands: if not fuzzy_commands: