CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Audio] Check required permissions in events (#4960)

Browse Source
This commit is contained in:
PredaaA 2021-05-18 22:30:26 +02:00 committed by GitHub
parent e467833cee
commit 9986cbe6b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redbot/cogs/audio/core/abc.py
View File

@ -231,6 +231,10 @@ class MixinMeta(ABC):
) -> discord.Message: ) -> discord.Message:
raise NotImplementedError() raise NotImplementedError()
@abstractmethod
def _has_notify_perms(self, channel: discord.TextChannel) -> bool:
raise NotImplementedError()
@abstractmethod @abstractmethod
async def update_external_status(self) -> bool: async def update_external_status(self) -> bool:
raise NotImplementedError() raise NotImplementedError()

3
redbot/cogs/audio/core/events/cog.py
View File

@ -195,6 +195,7 @@ class AudioEvents(MixinMeta, metaclass=CompositeMetaClass):
player: lavalink.Player, player: lavalink.Player,
): ):
notify_channel = self.bot.get_channel(player.fetch("channel")) notify_channel = self.bot.get_channel(player.fetch("channel"))
has_perms = self._has_notify_perms(notify_channel)
tries = 0 tries = 0
while not player._is_playing: while not player._is_playing:
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
@ -202,7 +203,7 @@ class AudioEvents(MixinMeta, metaclass=CompositeMetaClass):
return return
tries += 1 tries += 1
if notify_channel and not player.fetch("autoplay_notified", False): if notify_channel and has_perms and not player.fetch("autoplay_notified", False):
if ( if (
len(player.manager.players) < 10 len(player.manager.players) < 10
or not player._last_resume or not player._last_resume

22
redbot/cogs/audio/core/events/lavalink.py
View File

@ -137,19 +137,19 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
and self.playlist_api is not None and self.playlist_api is not None
and self.api_interface is not None and self.api_interface is not None
): ):
notify_channel = player.fetch("channel") notify_channel_id = player.fetch("channel")
try: try:
await self.api_interface.autoplay(player, self.playlist_api) await self.api_interface.autoplay(player, self.playlist_api)
except DatabaseError: except DatabaseError:
notify_channel = self.bot.get_channel(notify_channel) notify_channel = self.bot.get_channel(notify_channel_id)
if notify_channel: if notify_channel and self._has_notify_perms(notify_channel):
await self.send_embed_msg( await self.send_embed_msg(
notify_channel, title=_("Couldn't get a valid track.") notify_channel, title=_("Couldn't get a valid track.")
) )
return return
except TrackEnqueueError: except TrackEnqueueError:
notify_channel = self.bot.get_channel(notify_channel) notify_channel = self.bot.get_channel(notify_channel_id)
if notify_channel: if notify_channel and self._has_notify_perms(notify_channel):
await self.send_embed_msg( await self.send_embed_msg(
notify_channel, notify_channel,
title=_("Unable to Get Track"), title=_("Unable to Get Track"),
@ -160,9 +160,9 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
) )
return return
if event_type == lavalink.LavalinkEvents.TRACK_START and notify: if event_type == lavalink.LavalinkEvents.TRACK_START and notify:
notify_channel = player.fetch("channel") notify_channel_id = player.fetch("channel")
if notify_channel: notify_channel = self.bot.get_channel(notify_channel_id)
notify_channel = self.bot.get_channel(notify_channel) if notify_channel and self._has_notify_perms(notify_channel):
if player.fetch("notify_message") is not None: if player.fetch("notify_message") is not None:
with contextlib.suppress(discord.HTTPException): with contextlib.suppress(discord.HTTPException):
await player.fetch("notify_message").delete() await player.fetch("notify_message").delete()
@ -199,9 +199,9 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
if event_type == lavalink.LavalinkEvents.QUEUE_END: if event_type == lavalink.LavalinkEvents.QUEUE_END:
if not autoplay: if not autoplay:
notify_channel = player.fetch("channel") notify_channel_id = player.fetch("channel")
if notify_channel and notify: notify_channel = self.bot.get_channel(notify_channel_id)
notify_channel = self.bot.get_channel(notify_channel) if notify_channel and notify and self._has_notify_perms(notify_channel):
await self.send_embed_msg(notify_channel, title=_("Queue ended.")) await self.send_embed_msg(notify_channel, title=_("Queue ended."))
if disconnect: if disconnect:
self.bot.dispatch("red_audio_audio_disconnect", guild) self.bot.dispatch("red_audio_audio_disconnect", guild)

4
redbot/cogs/audio/core/utilities/miscellaneous.py
View File

@ -100,6 +100,10 @@ class MiscellaneousUtilities(MixinMeta, metaclass=CompositeMetaClass):
embed.set_author(name=name) embed.set_author(name=name)
return await ctx.send(embed=embed) return await ctx.send(embed=embed)
def _has_notify_perms(self, channel: discord.TextChannel) -> bool:
perms = channel.permissions_for(channel.guild.me)
return all((perms.send_messages, perms.embed_links))
async def maybe_run_pending_db_tasks(self, ctx: commands.Context) -> None: async def maybe_run_pending_db_tasks(self, ctx: commands.Context) -> None:
if self.api_interface is not None: if self.api_interface is not None:
await self.api_interface.run_tasks(ctx) await self.api_interface.run_tasks(ctx)