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

Properly fix find_voice_player

Browse source
This commit is contained in:
Steffo 2020-03-28 19:07:02 +01:00
parent c091898724
commit 49c1b39a53
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pyproject.toml
View file

@ -5,7 +5,7 @@
[tool.poetry] [tool.poetry]
name = "royalnet" name = "royalnet"
version = "5.6.4" version = "5.6.5"
description = "A multipurpose bot and web framework" description = "A multipurpose bot and web framework"
authors = ["Stefano Pigozzi <ste.pigozzi@gmail.com>"] authors = ["Stefano Pigozzi <ste.pigozzi@gmail.com>"]
license = "AGPL-3.0+" license = "AGPL-3.0+"

6
royalnet/serf/discord/discordserf.py
View file

@ -237,7 +237,7 @@ class DiscordSerf(Serf):
return channels[0] return channels[0]
def find_voice_player(self, guild: "discord.Guild") -> Optional[VoicePlayer]: def find_voice_players(self, guild: "discord.Guild") -> List[VoicePlayer]:
candidate_players: List[VoicePlayer] = [] candidate_players: List[VoicePlayer] = []
for player in self.voice_players: for player in self.voice_players:
player: VoicePlayer player: VoicePlayer
@ -246,4 +246,6 @@ class DiscordSerf(Serf):
if guild is not None and guild != player.voice_client.guild: if guild is not None and guild != player.voice_client.guild:
continue continue
candidate_players.append(player) candidate_players.append(player)
return candidate_players[0] if len(candidate_players) > 0 else None if guild:
assert len(candidate_players) <= 1
return candidate_players

2
royalnet/serf/discord/errors.py
View file

@ -38,5 +38,5 @@ class PlayerNotConnectedError(VoicePlayerError):
Use :meth:`VoicePlayer.connect` first!""" Use :meth:`VoicePlayer.connect` first!"""
class PlayerAlreadyPlaying(VoicePlayerError): class PlayerAlreadyPlayingError(VoicePlayerError):
"""The :class:`VoicePlayer` is already playing audio and cannot start playing audio again.""" """The :class:`VoicePlayer` is already playing audio and cannot start playing audio again."""

2
royalnet/serf/discord/voiceplayer.py
View file

@ -86,7 +86,7 @@ class VoicePlayer:
if self.voice_client is None or not self.voice_client.is_connected(): if self.voice_client is None or not self.voice_client.is_connected():
raise PlayerNotConnectedError() raise PlayerNotConnectedError()
if self.voice_client.is_playing(): if self.voice_client.is_playing():
raise PlayerAlreadyPlaying() raise PlayerAlreadyPlayingError()
log.debug("Getting next AudioSource...") log.debug("Getting next AudioSource...")
next_source: Optional["discord.AudioSource"] = await self.playing.next() next_source: Optional["discord.AudioSource"] = await self.playing.next()
if next_source is None: if next_source is None:

2
royalnet/version.py
View file

@ -1 +1 @@
semantic = "5.6.4" semantic = "5.6.5"