diff options
| author |  ChrisJL <[email protected]> | 2021-09-01 14:07:34 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-09-01 14:07:34 +0100 |
| commit | 69c18520b854166edd6c965b5b5db2fcd1d782ce (patch) | |
| tree | 6a181f5d0ccef1616d618f3e5a8f5f4eb77f1483 | |
| parent | Merge pull request #835 from python-discord/discord-2.0 (diff) | |
| parent | Use permissions_for over permissions_in (diff) | |
Merge pull request #838 from python-discord/Use-permissions_for-over-permissions_in
Use permissions_for over permissions_in
| -rw-r--r-- | bot/exts/evergreen/bookmark.py | 2 | ||||
| -rw-r--r-- | bot/exts/evergreen/fun.py | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bot/exts/evergreen/bookmark.py b/bot/exts/evergreen/bookmark.py index 98b0f2bf..c0619e86 100644 --- a/bot/exts/evergreen/bookmark.py +++ b/bot/exts/evergreen/bookmark.py @@ -103,7 +103,7 @@ class Bookmark(commands.Cog): target_message = ctx.message.reference.resolved # Prevent users from bookmarking a message in a channel they don't have access to - permissions = ctx.author.permissions_in(target_message.channel) + permissions = target_message.channel.permissions_for(ctx.author) if not permissions.read_messages: log.info(f"{ctx.author} tried to bookmark a message in #{target_message.channel} but has no permissions.") embed = discord.Embed( diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py index 3b266e1b..63450025 100644 --- a/bot/exts/evergreen/fun.py +++ b/bot/exts/evergreen/fun.py @@ -197,11 +197,13 @@ class Fun(Cog): msg = await Fun._get_discord_message(ctx, text) # Ensure the user has read permissions for the channel the message is in - if isinstance(msg, Message) and ctx.author.permissions_in(msg.channel).read_messages: - text = msg.clean_content - # Take first embed because we can't send multiple embeds - if msg.embeds: - embed = msg.embeds[0] + if isinstance(msg, Message): + permissions = msg.channel.permissions_for(ctx.author) + if permissions.read_messages: + text = msg.clean_content + # Take first embed because we can't send multiple embeds + if msg.embeds: + embed = msg.embeds[0] return (text, embed) |