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] Change pause to a toggle (#2461)

Browse Source
This commit is contained in:
aikaterna 2019-02-18 15:10:11 -08:00 committed by Toby Harradine
parent d608dd953b
commit 83411d0fa4
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,10 +793,10 @@ class Audio(commands.Cog):
await self._clear_react(message) await self._clear_react(message)
await ctx.invoke(self.skip) await ctx.invoke(self.skip)
@commands.command(aliases=["resume"]) @commands.command()
@commands.guild_only() @commands.guild_only()
async def pause(self, ctx): async def pause(self, ctx):
"""Pause and resume.""" """Pause or resume a playing track."""
dj_enabled = await self.config.guild(ctx.guild).dj_enabled() dj_enabled = await self.config.guild(ctx.guild).dj_enabled()
if not self._player_check(ctx): if not self._player_check(ctx):
return await self._embed_msg(ctx, _("Nothing playing.")) return await self._embed_msg(ctx, _("Nothing playing."))
@ -805,41 +805,40 @@ class Audio(commands.Cog):
not ctx.author.voice or ctx.author.voice.channel != player.channel not ctx.author.voice or ctx.author.voice.channel != player.channel
) and not await self._can_instaskip(ctx, ctx.author): ) and not await self._can_instaskip(ctx, ctx.author):
return await self._embed_msg( return await self._embed_msg(
ctx, _("You must be in the voice channel to pause the music.") ctx, _("You must be in the voice channel pause or resume.")
) )
if dj_enabled: if dj_enabled:
if not await self._can_instaskip(ctx, ctx.author) and not await self._is_alone( if not await self._can_instaskip(ctx, ctx.author) and not await self._is_alone(
ctx, ctx.author ctx, ctx.author
): ):
return await self._embed_msg(ctx, _("You need the DJ role to pause tracks.")) return await self._embed_msg(
ctx, _("You need the DJ role to pause or resume tracks.")
)
command = ctx.invoked_with
if not player.current: if not player.current:
return await self._embed_msg(ctx, _("Nothing playing.")) return await self._embed_msg(ctx, _("Nothing playing."))
if "localtracks/" in player.current.uri: if "localtracks/" in player.current.uri:
description = "**{}**\n{}".format( if player.current.title == "Unknown title":
player.current.title, player.current.uri.replace("localtracks/", "") description = player.current.uri
)
else: else:
description = "**[{}]({})**".format(player.current.title, player.current.uri) song = bold("{} - {}").format(player.current.author, player.current.title)
if player.current and not player.paused and command != "resume": description = "{}\n{}".format(song, player.current.uri.replace("localtracks/", ""))
else:
description = bold("[{}]({})").format(player.current.title, player.current.uri)
if player.current and not player.paused:
await player.pause() await player.pause()
embed = discord.Embed( embed = discord.Embed(
colour=await ctx.embed_colour(), title=_("Track Paused"), description=description colour=await ctx.embed_colour(), title=_("Track Paused"), description=description
) )
return await ctx.send(embed=embed) return await ctx.send(embed=embed)
if player.current and player.paused:
if player.paused and command != "pause":
await player.pause(False) await player.pause(False)
embed = discord.Embed( embed = discord.Embed(
colour=await ctx.embed_colour(), title=_("Track Resumed"), description=description colour=await ctx.embed_colour(), title=_("Track Resumed"), description=description
) )
return await ctx.send(embed=embed) return await ctx.send(embed=embed)
if player.paused and command == "pause":
return await self._embed_msg(ctx, _("Track is paused."))
if player.current and command == "resume":
return await self._embed_msg(ctx, _("Track is playing."))
await self._embed_msg(ctx, _("Nothing playing.")) await self._embed_msg(ctx, _("Nothing playing."))
@commands.command() @commands.command()
@ -2305,7 +2304,7 @@ class Audio(commands.Cog):
if dj_enabled and not vote_enabled: if dj_enabled and not vote_enabled:
if not await self._can_instaskip(ctx, ctx.author): if not await self._can_instaskip(ctx, ctx.author):
return await self._embed_msg(ctx, _("You need the DJ role to stop the music.")) return await self._embed_msg(ctx, _("You need the DJ role to stop the music."))
if player.is_playing: if (player.is_playing) or (not player.is_playing and player.paused):
await self._embed_msg(ctx, _("Stopping...")) await self._embed_msg(ctx, _("Stopping..."))
await player.stop() await player.stop()
player.store("prev_requester", None) player.store("prev_requester", None)