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] Timeout voice connection + cooldown after fail (#556)

Browse Source
This commit is contained in:
Will 2017-02-09 09:19:40 -05:00 committed by Twentysix
parent ae1244668e
commit b8b5572b07
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cogs/audio.py
View File

@ -290,6 +290,8 @@ class Audio:
self.skip_votes = {} self.skip_votes = {}
self.connect_timers = {}
if player == "ffmpeg": if player == "ffmpeg":
self.settings["AVCONV"] = False self.settings["AVCONV"] = False
elif player == "avconv": elif player == "avconv":
@ -627,13 +629,21 @@ class Audio:
async def _join_voice_channel(self, channel): async def _join_voice_channel(self, channel):
server = channel.server server = channel.server
connect_time = self.connect_timers.get(server.id, 0)
if time.time() < connect_time:
diff = int(connect_time - time.time())
raise ConnectTimeout("You are on connect cooldown for another {}"
" seconds.".format(diff))
if server.id in self.queue: if server.id in self.queue:
self.queue[server.id]["VOICE_CHANNEL_ID"] = channel.id self.queue[server.id]["VOICE_CHANNEL_ID"] = channel.id
try: try:
await self.bot.join_voice_channel(channel) await asyncio.wait_for(self.bot.join_voice_channel(channel),
timeout=5, loop=self.bot.loop)
except asyncio.futures.TimeoutError as e: except asyncio.futures.TimeoutError as e:
log.exception(e) log.exception(e)
raise ConnectTimeout("We timed out connecting to a voice channel") self.connect_timers[server.id] = time.time() + 300
raise ConnectTimeout("We timed out connecting to a voice channel,"
" please try again in 10 minutes.")
def _list_local_playlists(self): def _list_local_playlists(self):
ret = [] ret = []