Skip to content

Add warning to [p]set api if <>s are included in secret #6651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Evanroby wants to merge 1 commit into
base: V3/develop
Choose a base branch
from
+20 −1
Open

Add warning to [p]set api if <>s are included in secret #6651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion redbot/core/core_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3704,8 +3704,27 @@ async def _set_api(
else:
if ctx.bot_permissions.manage_messages:
await ctx.message.delete()

angle_bracket_warning = None

for api_service_name, token in tokens.items():
if token.startswith("<") and token.endswith(">"):
angle_bracket_warning = (
"You may have failed to properly format your {api_service_name}. If you were told to enter a key"
" with an example such as `[p]set api {service} api_key <your_api_key_here>`, and your API key"
" was `HREDFGWE`, make sure to run `[p]set api {service} api_key HREDFGWE` and not "
"`[p]set api {service} api_key <HREDFGWE>`."
).format(api_service_name=api_service_name, service=service)
log.warning(angle_bracket_warning)
break

await ctx.bot.set_shared_api_tokens(service, **tokens)
await ctx.send(_("`{service}` API tokens have been set.").format(service=service))

message = _("`{service}` API tokens have been set.").format(service=service)
if angle_bracket_warning:
message += "\n\n" + _("**Warning:** ") + _(angle_bracket_warning)

await ctx.send(message)

@_set_api.command(name="list")
async def _set_api_list(self, ctx: commands.Context):
Expand Down
Loading