Skip to content

Prevent exception if a watched user sends a DM to the bot #815

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
scragly merged 1 commit into from
Mar 4, 2020
Merged

Prevent exception if a watched user sends a DM to the bot #815

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
11 changes: 9 additions & 2 deletions bot/cogs/watchchannels/watchchannel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import dateutil.parser
import discord
from discord import Color, Embed, HTTPException, Message, errors
from discord import Color, DMChannel, Embed, HTTPException, Message, errors
from discord.ext.commands import Cog, Context

from bot.api import ResponseCodeError
Expand Down Expand Up @@ -273,7 +273,14 @@ async def send_header(self, msg: Message) -> None:

reason = self.watched_users[user_id]['reason']

embed = Embed(description=f"{msg.author.mention} in [#{msg.channel.name}]({msg.jump_url})")
if isinstance(msg.channel, DMChannel):
# If a watched user DMs the bot there won't be a channel name or jump URL
# This could technically include a GroupChannel but bot's can't be in those
message_jump = "via DM"
else:
message_jump = f"in [#{msg.channel.name}]({msg.jump_url})"

embed = Embed(description=f"{msg.author.mention} {message_jump}")
embed.set_footer(text=f"Added {time_delta} by {actor} | Reason: {reason}")

await self.webhook_send(embed=embed, username=msg.author.display_name, avatar_url=msg.author.avatar_url)
Expand Down