aboutsummaryrefslogtreecommitdiffstats
path: root/bot/utils/messages.py
diff options
context:
space:
mode:
authorGravatar AbooMinister25 <[email protected]>2022-08-08 20:44:18 -0400
committerGravatar AbooMinister25 <[email protected]>2022-08-08 20:44:18 -0400
commitf0455f9ae865e5d424e84cafdb52bc17f25b3db5 (patch)
treedda0dfe359f51156fec827b5f1c5d8fd71cc6405 /bot/utils/messages.py
parentRefactored methods _get_discord_message, _get_text_and_embed, and _convert_em... (diff)
Refactored get_discord_message to not unnecessarily log, and cleaned up uwu_command
Diffstat (limited to 'bot/utils/messages.py')
-rw-r--r--bot/utils/messages.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/bot/utils/messages.py b/bot/utils/messages.py
index ccc8b61c..71b634e8 100644
--- a/bot/utils/messages.py
+++ b/bot/utils/messages.py
@@ -3,7 +3,6 @@ import re
from typing import Callable, Optional, Union
from discord import Embed, Message
-from discord.ext import commands
from discord.ext.commands import Context, MessageConverter
log = logging.getLogger(__name__)
@@ -33,10 +32,7 @@ async def get_discord_message(ctx: Context, text: str) -> Union[Message, str]:
Conversion will succeed if given a discord Message ID or link.
Returns `text` if the conversion fails.
"""
- try:
- text = await MessageConverter().convert(ctx, text)
- except commands.BadArgument:
- log.debug(f"Input '{text:.20}...' is not a valid Discord Message")
+ text = await MessageConverter().convert(ctx, text)
return text
@@ -64,7 +60,7 @@ async def get_text_and_embed(ctx: Context, text: str) -> tuple[str, Optional[Emb
if msg.embeds:
embed = msg.embeds[0]
- return (text, embed)
+ return text, embed
def convert_embed(func: Callable[[str, ], str], embed: Embed) -> Embed: