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

Bump RLL and improve logging (#5044)

Browse Source 
* version bump

* - bump RLL
- logging changes
- player.channel.guild->player.guild
- small cleanup around logging changes

* missed one

* here this one too

* Apply suggestions from code review

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>

* add one missing player log

* missed one

* Format with Black

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>
This commit is contained in:
Draper
2021-05-18 23:56:10 +01:00
committed by GitHub
parent c9431f7d90
commit 38da7370ec
19 changed files with 164 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
redbot/cogs/audio/core/commands/controller.py
View File

@@ -289,7 +289,7 @@ class PlayerControllerCommands(MixinMeta, metaclass=CompositeMetaClass):
}
)
player.add(player.fetch("prev_requester"), track)
self.bot.dispatch("red_audio_track_enqueue", player.channel.guild, track, ctx.author)
self.bot.dispatch("red_audio_track_enqueue", player.guild, track, ctx.author)
queue_len = len(player.queue)
bump_song = player.queue[-1]
player.queue.insert(0, bump_song)

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

@@ -59,10 +59,10 @@ class MiscellaneousCommands(MixinMeta, metaclass=CompositeMetaClass):
current_title = await self.get_track_description(
p.current, self.local_folder_current_path
)
msg += "{} [`{}`]: {}\n".format(p.channel.guild.name, connect_dur, current_title)
msg += "{} [`{}`]: {}\n".format(p.guild.name, connect_dur, current_title)
except AttributeError:
msg += "{} [`{}`]: **{}**\n".format(
p.channel.guild.name, connect_dur, _("Nothing playing.")
p.guild.name, connect_dur, _("Nothing playing.")
)
if total_num == 0:

16
redbot/cogs/audio/core/commands/player.py
View File

@@ -294,7 +294,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
query_obj=query,
):
if IS_DEBUG:
log.debug(f"Query is not allowed in {ctx.guild} ({ctx.guild.id})")
log.debug("Query is not allowed in %r (%d)", ctx.guild.name, ctx.guild.id)
self.update_player_lock(ctx, False)
return await self.send_embed_msg(
ctx,
@@ -314,7 +314,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
player.queue.insert(0, single_track)
player.maybe_shuffle()
self.bot.dispatch(
"red_audio_track_enqueue", player.channel.guild, single_track, ctx.author
"red_audio_track_enqueue", player.guild, single_track, ctx.author
)
else:
self.update_player_lock(ctx, False)
@@ -336,9 +336,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
)
player.queue.insert(0, single_track)
player.maybe_shuffle()
self.bot.dispatch(
"red_audio_track_enqueue", player.channel.guild, single_track, ctx.author
)
self.bot.dispatch("red_audio_track_enqueue", player.guild, single_track, ctx.author)
description = await self.get_track_description(
single_track, self.local_folder_current_path
)
@@ -838,7 +836,9 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
query_obj=query,
):
if IS_DEBUG:
log.debug(f"Query is not allowed in {ctx.guild} ({ctx.guild.id})")
log.debug(
"Query is not allowed in %r (%d)", ctx.guild.name, ctx.guild.id
)
continue
elif guild_data["maxlength"] > 0:
if self.is_track_length_allowed(track, guild_data["maxlength"]):
@@ -852,7 +852,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
)
player.add(ctx.author, track)
self.bot.dispatch(
"red_audio_track_enqueue", player.channel.guild, track, ctx.author
"red_audio_track_enqueue", player.guild, track, ctx.author
)
else:
track_len += 1
@@ -865,7 +865,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
)
player.add(ctx.author, track)
self.bot.dispatch(
"red_audio_track_enqueue", player.channel.guild, track, ctx.author
"red_audio_track_enqueue", player.guild, track, ctx.author
)
if not player.current:
await player.play()

8
redbot/cogs/audio/core/commands/playlists.py
View File

@@ -1525,7 +1525,9 @@ class PlaylistCommands(MixinMeta, metaclass=CompositeMetaClass):
query_obj=query,
):
if IS_DEBUG:
log.debug(f"Query is not allowed in {ctx.guild} ({ctx.guild.id})")
log.debug(
"Query is not allowed in %r (%d)", ctx.guild.name, ctx.guild.id
)
continue
query = Query.process_input(track.uri, self.local_folder_current_path)
if query.is_local:
@@ -1544,9 +1546,7 @@ class PlaylistCommands(MixinMeta, metaclass=CompositeMetaClass):
}
)
player.add(author_obj, track)
self.bot.dispatch(
"red_audio_track_enqueue", player.channel.guild, track, ctx.author
)
self.bot.dispatch("red_audio_track_enqueue", player.guild, track, ctx.author)
track_len += 1
player.maybe_shuffle(0 if empty_queue else 1)
if len(tracks) > track_len: