Skip to content

Check that embed desc is not Empty before stripping. #1064

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

Merged
Den4200 merged 2 commits into from
Jul 23, 2020
Merged

Check that embed desc is not Empty before stripping. #1064

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53fe5d4
Check that embed desc is not Empty before stripping.
kosayoda Jul 23, 2020
f0aa729
Merge branch 'master' into bug/1036/empty-embed-fields
Den4200 Jul 23, 2020
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
7 changes: 5 additions & 2 deletions bot/cogs/help_channels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,11 @@ def match_bot_embed(self, message: t.Optional[discord.Message], description: str
if not message or not message.embeds:
return False

embed = message.embeds[0]
return message.author == self.bot.user and embed.description.strip() == description.strip()
bot_msg_desc = message.embeds[0].description
if bot_msg_desc is discord.Embed.Empty:
log.trace("Last message was a bot embed but it was empty.")
return False
return message.author == self.bot.user and bot_msg_desc.strip() == description.strip()

@staticmethod
def is_in_category(channel: discord.TextChannel, category_id: int) -> bool:
Expand Down