ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Tentative fix for None voice_client

Browse source
This commit is contained in:
Steffo 2019-11-04 09:40:12 +01:00
parent 816cd42d09
commit 4759f1951a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
royalnet/bots/discord.py
View file

@ -224,6 +224,8 @@ class DiscordBot(GenericBot):
async def add_to_music_data(self, dfiles: typing.List[YtdlDiscord], guild: discord.Guild): async def add_to_music_data(self, dfiles: typing.List[YtdlDiscord], guild: discord.Guild):
"""Add a list of :py:class:`royalnet.audio.YtdlDiscord` to the corresponding music_data object.""" """Add a list of :py:class:`royalnet.audio.YtdlDiscord` to the corresponding music_data object."""
guild_music_data = self.music_data[guild] guild_music_data = self.music_data[guild]
if guild_music_data is None:
raise CommandError(f"No music_data has been created for guild {guild}")
for dfile in dfiles: for dfile in dfiles:
log.debug(f"Adding {dfile} to music_data") log.debug(f"Adding {dfile} to music_data")
await asyncify(dfile.ready_up) await asyncify(dfile.ready_up)
@ -233,8 +235,8 @@ class DiscordBot(GenericBot):
async def advance_music_data(self, guild: discord.Guild): async def advance_music_data(self, guild: discord.Guild):
"""Try to play the next song, while it exists. Otherwise, just return.""" """Try to play the next song, while it exists. Otherwise, just return."""
guild_music_data = self.music_data[guild] guild_music_data: MusicData = self.music_data[guild]
voice_client: discord.VoiceClient = self.client.find_voice_client_by_guild(guild) voice_client: discord.VoiceClient = guild_music_data.voice_client
next_source: discord.AudioSource = await guild_music_data.playmode.next() next_source: discord.AudioSource = await guild_music_data.playmode.next()
await self.update_activity_with_source_title() await self.update_activity_with_source_title()
if next_source is None: if next_source is None: