diff options
| author |  Xithrius <[email protected]> | 2021-09-02 12:33:56 -0700 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-09-02 12:33:56 -0700 |
| commit | 02e620db2a8a04d18d0b720abeaf8c07e0ab1a26 (patch) | |
| tree | 83b0fd28a0203a948b5d3eb64270d1799ac7c4b0 /bot | |
| parent | More explicit importing for `Bot` (diff) | |
| parent | Merge pull request #838 from python-discord/Use-permissions_for-over-permissi... (diff) | |
Merge branch 'main' into decorator-factory/typehints-fix
Diffstat (limited to 'bot')
| -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 f936be61..a91ef1c0 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 40743e7b..4bbfe859 100644 --- a/bot/exts/evergreen/fun.py +++ b/bot/exts/evergreen/fun.py @@ -198,11 +198,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) |