Skip to content
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

[countryball] change grammatically incorrect 'catched' variable to 'caught' #500

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[countryball] change grammatically incorrect 'catched' variable to 'caught' #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e22720
change grammatically incorrect 'catched' to 'caught'
imtherealF1 Jan 4, 2025
a03fdce
Merge branch 'master' into fix-variable-name
imtherealF1 Jan 24, 2025
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
6 changes: 3 additions & 3 deletions ballsdex/packages/countryballs/components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ async def on_submit(self, interaction: discord.Interaction["BallsDexBot"]):
await interaction.response.defer(thinking=True)

player, _ = await Player.get_or_create(discord_id=interaction.user.id)
if self.ball.catched:
if self.ball.caught:
await interaction.followup.send(
f"{interaction.user.mention} I was caught already!",
ephemeral=True,
Expand All @@ -66,7 +66,7 @@ async def on_submit(self, interaction: discord.Interaction["BallsDexBot"]):
possible_names += tuple(x.lower() for x in self.ball.model.translations.split(";"))

if self.name.value.lower().strip() in possible_names:
self.ball.catched = True
self.ball.caught = True
ball, has_caught_before = await self.catch_ball(
interaction.client, cast(discord.Member, interaction.user)
)
Expand Down Expand Up @@ -176,7 +176,7 @@ async def on_timeout(self):

@button(style=discord.ButtonStyle.primary, label="Catch me!")
async def catch_button(self, interaction: discord.Interaction["BallsDexBot"], button: Button):
if self.ball.catched:
if self.ball.caught:
await interaction.response.send_message("I was caught already!", ephemeral=True)
else:
await interaction.response.send_modal(CountryballNamePrompt(self.ball, button))
2 changes: 1 addition & 1 deletion ballsdex/packages/countryballs/countryball.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def __init__(self, model: Ball):
self.model = model
self.algo: str | None = None
self.message: discord.Message = discord.utils.MISSING
self.catched = False
self.caught = False
self.time = datetime.now()
self.special: Special | None = None
self.atk_bonus: int | None = None
Expand Down
Loading