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] Emptydisconnect and status refactor (#2473)

Browse Source 
- Refactored disconnect_timer, the function behind audioset emptydisconnect, to be more appropriately responsive (thanks to TrustyJAID)
- Refactored status clearing/status changing when emptydisconnect or other Lavalink player statuses would have a TRACK_END event but no QUEUE_END event. This should clear or modify the bot's status event appropriately when [p]audioset status is on and the bot disconnects due to emptydisconnect and ideally play a little nicer with other cogs that set statuses.
This commit is contained in:
aikaterna 2019-02-22 13:45:01 -08:00 committed by Toby Harradine
parent 3637804929
commit 7b9d85c1b5
1 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
redbot/cogs/audio/audio.py
View File

@ -5,6 +5,7 @@ import discord
from fuzzywuzzy import process from fuzzywuzzy import process
import heapq import heapq
import lavalink import lavalink
import logging
import math import math
import os import os
import random import random
@ -32,6 +33,8 @@ _ = Translator("Audio", __file__)
__version__ = "0.0.8" __version__ = "0.0.8"
__author__ = ["aikaterna", "billy/bollo/ati"] __author__ = ["aikaterna", "billy/bollo/ati"]
log = logging.getLogger("red.audio")
@cog_i18n(_) @cog_i18n(_)
class Audio(commands.Cog): class Audio(commands.Cog):
@ -119,22 +122,46 @@ class Audio(commands.Cog):
async def event_handler(self, player, event_type, extra): async def event_handler(self, player, event_type, extra):
notify = await self.config.guild(player.channel.guild).notify() notify = await self.config.guild(player.channel.guild).notify()
status = await self.config.status() status = await self.config.status()
try:
get_players = [p for p in lavalink.players if p.current is not None] async def _players_check():
get_single_title = get_players[0].current.title try:
if get_single_title == "Unknown title": get_players = [
get_single_title = get_players[0].current.uri p for p in lavalink.players if p.current is not None and p.is_playing
if not get_single_title.startswith("http"): ]
get_single_title = get_single_title.rsplit("/", 1)[-1]
elif "localtracks/" in get_players[0].current.uri:
get_single_title = "{} - {}".format(
get_players[0].current.author, get_players[0].current.title
)
else:
get_single_title = get_players[0].current.title get_single_title = get_players[0].current.title
playing_servers = len(get_players) if get_single_title == "Unknown title":
except IndexError: get_single_title = get_players[0].current.uri
playing_servers = 0 if not get_single_title.startswith("http"):
get_single_title = get_single_title.rsplit("/", 1)[-1]
elif "localtracks/" in get_players[0].current.uri:
get_single_title = "{} - {}".format(
get_players[0].current.author, get_players[0].current.title
)
else:
get_single_title = get_players[0].current.title
playing_servers = len(get_players)
except IndexError:
get_single_title = None
playing_servers = 0
return get_single_title, playing_servers
async def _status_check(playing_servers):
if playing_servers == 0:
await self.bot.change_presence(activity=None)
if playing_servers == 1:
single_title = await _players_check()
await self.bot.change_presence(
activity=discord.Activity(
name=single_title[0], type=discord.ActivityType.listening
)
)
if playing_servers > 1:
await self.bot.change_presence(
activity=discord.Activity(
name=_("music in {} servers").format(playing_servers),
type=discord.ActivityType.playing,
)
)
if event_type == lavalink.LavalinkEvents.TRACK_START: if event_type == lavalink.LavalinkEvents.TRACK_START:
playing_song = player.fetch("playing_song") playing_song = player.fetch("playing_song")
@ -188,21 +215,14 @@ class Audio(commands.Cog):
player.store("notify_message", notify_message) player.store("notify_message", notify_message)
if event_type == lavalink.LavalinkEvents.TRACK_START and status: if event_type == lavalink.LavalinkEvents.TRACK_START and status:
if playing_servers == 0: player_check = await _players_check()
await self.bot.change_presence(activity=None) await _status_check(player_check[1])
if playing_servers == 1:
await self.bot.change_presence( if event_type == lavalink.LavalinkEvents.TRACK_END and status:
activity=discord.Activity( await asyncio.sleep(1)
name=get_single_title, type=discord.ActivityType.listening if not player.is_playing:
) player_check = await _players_check()
) await _status_check(player_check[1])
if playing_servers > 1:
await self.bot.change_presence(
activity=discord.Activity(
name=_("music in {} servers").format(playing_servers),
type=discord.ActivityType.playing,
)
)
if event_type == lavalink.LavalinkEvents.QUEUE_END and notify: if event_type == lavalink.LavalinkEvents.QUEUE_END and notify:
notify_channel = player.fetch("channel") notify_channel = player.fetch("channel")
@ -214,21 +234,8 @@ class Audio(commands.Cog):
await notify_channel.send(embed=embed) await notify_channel.send(embed=embed)
if event_type == lavalink.LavalinkEvents.QUEUE_END and status: if event_type == lavalink.LavalinkEvents.QUEUE_END and status:
if playing_servers == 0: player_check = await _players_check()
await self.bot.change_presence(activity=None) await _status_check(player_check[1])
if playing_servers == 1:
await self.bot.change_presence(
activity=discord.Activity(
name=get_single_title, type=discord.ActivityType.listening
)
)
if playing_servers > 1:
await self.bot.change_presence(
activity=discord.Activity(
name=_("music in {} servers").format(playing_servers),
type=discord.ActivityType.playing,
)
)
if event_type == lavalink.LavalinkEvents.TRACK_EXCEPTION: if event_type == lavalink.LavalinkEvents.TRACK_EXCEPTION:
if "localtracks/" in player.current.uri: if "localtracks/" in player.current.uri:
@ -546,7 +553,7 @@ class Audio(commands.Cog):
return await self._embed_msg(ctx, _("There are other people listening to music.")) return await self._embed_msg(ctx, _("There are other people listening to music."))
else: else:
await lavalink.get_player(ctx.guild.id).stop() await lavalink.get_player(ctx.guild.id).stop()
return await lavalink.get_player(ctx.guild.id).disconnect() await lavalink.get_player(ctx.guild.id).disconnect()
@commands.group() @commands.group()
@commands.guild_only() @commands.guild_only()
@ -2603,16 +2610,20 @@ class Audio(commands.Cog):
stop_times[server.id] = int(time.time()) stop_times[server.id] = int(time.time())
for sid in stop_times: for sid in stop_times:
if stop_times[sid] is None:
continue
server_obj = self.bot.get_guild(sid) server_obj = self.bot.get_guild(sid)
emptydc_enabled = await self.config.guild(server_obj).emptydc_enabled() if await self.config.guild(server_obj).emptydc_enabled():
if emptydc_enabled: emptydc_timer = await self.config.guild(server_obj).emptydc_timer()
if stop_times[sid] is not None and [self.bot.user] == p.channel.members: if (int(time.time()) - stop_times[sid]) >= emptydc_timer:
emptydc_timer = await self.config.guild(server_obj).emptydc_timer() stop_times[sid] = None
if stop_times[sid] and ( try:
int(time.time()) - stop_times[sid] > emptydc_timer
):
stop_times[sid] = None
await lavalink.get_player(sid).disconnect() await lavalink.get_player(sid).disconnect()
except Exception:
log.error(
"Exception raised in Audio's disconnect_timer.", exc_info=True
)
pass
await asyncio.sleep(5) await asyncio.sleep(5)