This commit is contained in:
parent
b614c6d443
commit
e0ad1fc337
1 changed files with 7 additions and 8 deletions
|
@ -101,8 +101,7 @@ class Galaxy(commands.Cog):
|
||||||
match = re.search(r'(?<=:)\d+(?=>)', input_string)
|
match = re.search(r'(?<=:)\d+(?=>)', input_string)
|
||||||
if match:
|
if match:
|
||||||
return int(match.group())
|
return int(match.group())
|
||||||
else:
|
return input_string
|
||||||
return input_string
|
|
||||||
|
|
||||||
@autoreact.command(name="emoji")
|
@autoreact.command(name="emoji")
|
||||||
@app_commands.describe(emoji="Which emoji are you setting Autoreact to use?")
|
@app_commands.describe(emoji="Which emoji are you setting Autoreact to use?")
|
||||||
|
@ -121,14 +120,14 @@ class Galaxy(commands.Cog):
|
||||||
emoji_obj = emoji_to_find
|
emoji_obj = emoji_to_find
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
await interaction.response.send_message(content=f"You're trying to set the autoreact emoji to an emoji I don't have access to!", ephemeral=True)
|
await interaction.response.send_message(content="You're trying to set the autoreact emoji to an emoji I don't have access to!", ephemeral=True)
|
||||||
return
|
return
|
||||||
await self.config.guild(interaction.guild).autoreact_emoji.set(emoji_obj.id)
|
await self.config.guild(interaction.guild).autoreact_emoji.set(emoji_obj.id)
|
||||||
embed=discord.Embed(color=await self.bot.get_embed_color(None), description=f"Autoreact's emoji has been set to {emoji_obj} ({emoji_obj.id}).")
|
embed=discord.Embed(color=await self.bot.get_embed_color(None), description=f"Autoreact's emoji has been set to {emoji_obj} ({emoji_obj.id}).")
|
||||||
await interaction.response.send_message(embed=embed)
|
await interaction.response.send_message(embed=embed)
|
||||||
else:
|
else:
|
||||||
await self.config.guild(interaction.guild).autoreact_emoji.set('💀')
|
await self.config.guild(interaction.guild).autoreact_emoji.set('💀')
|
||||||
embed=discord.Embed(color=await self.bot.get_embed_color(None), description=f"Autoreact's emoji has been set to 💀.")
|
embed=discord.Embed(color=await self.bot.get_embed_color(None), description="Autoreact's emoji has been set to 💀.")
|
||||||
await interaction.response.send_message(embed=embed)
|
await interaction.response.send_message(embed=embed)
|
||||||
|
|
||||||
@autoreact.command(name="set")
|
@autoreact.command(name="set")
|
||||||
|
@ -146,7 +145,7 @@ class Galaxy(commands.Cog):
|
||||||
async def autoreact_reset(self, interaction: discord.Interaction):
|
async def autoreact_reset(self, interaction: discord.Interaction):
|
||||||
"""Resets Autoreact's target."""
|
"""Resets Autoreact's target."""
|
||||||
await self.config.guild(interaction.guild).autoreact_target.set(0)
|
await self.config.guild(interaction.guild).autoreact_target.set(0)
|
||||||
embed=discord.Embed(color=await self.bot.get_embed_color(None), description=f"Autoreact's target has been reset.")
|
embed=discord.Embed(color=await self.bot.get_embed_color(None), description="Autoreact's target has been reset.")
|
||||||
await interaction.response.send_message(embed=embed)
|
await interaction.response.send_message(embed=embed)
|
||||||
|
|
||||||
@commands.command()
|
@commands.command()
|
||||||
|
@ -189,8 +188,8 @@ class Galaxy(commands.Cog):
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
insurance_dict[f'{ship_class}']
|
insurance_dict[f'{ship_class}']
|
||||||
except KeyError:
|
except KeyError as error:
|
||||||
raise ValueError("Received value is not a valid ship class!")
|
raise ValueError("Received value is not a valid ship class!") from error
|
||||||
if ship_class == "super_capital":
|
if ship_class == "super_capital":
|
||||||
humanized_class = ship_class.replace("_", " ").title()
|
humanized_class = ship_class.replace("_", " ").title()
|
||||||
else:
|
else:
|
||||||
|
@ -348,7 +347,7 @@ class Galaxy(commands.Cog):
|
||||||
|
|
||||||
@warehouse.error
|
@warehouse.error
|
||||||
@unix.error
|
@unix.error
|
||||||
async def faq_handler(self, ctx, error):
|
async def faq_handler(self, error):
|
||||||
"""Error Handler for Galaxy."""
|
"""Error Handler for Galaxy."""
|
||||||
if isinstance(error, discord.NotFound):
|
if isinstance(error, discord.NotFound):
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in a new issue