hammy
/
Enso-Bot
mirror of https://github.com/sgoudham/Enso-Bot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-adding music.py

Browse Source
pull/4/head
sgoudham 5 years ago
parent c763224cd6
commit 4c6d2506ea
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

46
cogs/music.py
Unescape Escape View File

@ -45,7 +45,7 @@ class YTDLSource(discord.PCMVolumeTransformer):
ytdl = youtube_dl.YoutubeDL(YTDL_OPTIONS)
def __init__(self, ctx: commands.Context, source: discord.FFmpegPCMAudio, *, data: dict, volume: float = 0.5):
def __init__(self, ctx, source: discord.FFmpegPCMAudio, *, data: dict, volume: float = 0.5):
super().__init__(source, volume)
self.requester = ctx.author
@ -71,7 +71,7 @@ class YTDLSource(discord.PCMVolumeTransformer):
return '**{0.title}** by **{0.uploader}**'.format(self)
@classmethod
async def create_source(cls, ctx: commands.Context, search: str, *, loop: asyncio.BaseEventLoop = None):
async def create_source(cls, ctx, search: str, *, loop: asyncio.BaseEventLoop = None):
loop = loop or asyncio.get_event_loop()
partial = functools.partial(cls.ytdl.extract_info, search, download=False, process=False)
@ -174,7 +174,7 @@ class SongQueue(asyncio.Queue):
class VoiceState:
def __init__(self, bot: commands.Bot, ctx: commands.Context):
def __init__(self, bot: commands.Bot, ctx):
self.bot = bot
self._ctx = ctx
@ -259,7 +259,7 @@ class Music(commands.Cog):
self.bot = bot
self.voice_states = {}
def get_voice_state(self, ctx: commands.Context):
def get_voice_state(self, ctx):
state = self.voice_states.get(ctx.guild.id)
if not state:
state = VoiceState(self.bot, ctx)
@ -271,20 +271,20 @@ class Music(commands.Cog):
for state in self.voice_states.values():
self.bot.loop.create_task(state.stop())
def cog_check(self, ctx: commands.Context):
def cog_check(self, ctx):
if not ctx.guild:
raise commands.NoPrivateMessage('This command can\'t be used in DM channels.')
return True
async def cog_before_invoke(self, ctx: commands.Context):
async def cog_before_invoke(self, ctx):
ctx.voice_state = self.get_voice_state(ctx)
async def cog_command_error(self, ctx: commands.Context, error: commands.CommandError):
async def cog_command_error(self, ctx, error: commands.CommandError):
await ctx.send('An error occurred: {}'.format(str(error)))
@commands.command(name='join', invoke_without_subcommand=True)
async def _join(self, ctx: commands.Context):
async def _join(self, ctx):
"""Joins a voice channel."""
destination = ctx.author.voice.channel
@ -296,7 +296,7 @@ class Music(commands.Cog):
@commands.command(name='summon')
@commands.has_permissions(manage_guild=True)
async def _summon(self, ctx: commands.Context, *, channel: discord.VoiceChannel = None):
async def _summon(self, ctx, *, channel: discord.VoiceChannel = None):
"""Summons the bot to a voice channel.
If no channel was specified, it joins your channel.
"""
@ -313,7 +313,7 @@ class Music(commands.Cog):
@commands.command(name='leave', aliases=['disconnect'])
@commands.has_permissions(manage_guild=True)
async def _leave(self, ctx: commands.Context):
async def _leave(self, ctx):
"""Clears the queue and leaves the voice channel."""
if not ctx.voice_state.voice:
@ -323,7 +323,7 @@ class Music(commands.Cog):
del self.voice_states[ctx.guild.id]
@commands.command(name='volume')
async def _volume(self, ctx: commands.Context, *, volume: int):
async def _volume(self, ctx, *, volume: int):
"""Sets the volume of the player."""
if not ctx.voice_state.is_playing:
@ -336,14 +336,14 @@ class Music(commands.Cog):
await ctx.send('Volume of the player set to {}%'.format(volume))
@commands.command(name='now', aliases=['current', 'playing'])
async def _now(self, ctx: commands.Context):
async def _now(self, ctx):
"""Displays the currently playing song."""
await ctx.send(embed=ctx.voice_state.current.create_embed())
@commands.command(name='pause')
@commands.has_permissions(manage_guild=True)
async def _pause(self, ctx: commands.Context):
async def _pause(self, ctx):
"""Pauses the currently playing song."""
if not ctx.voice_state.is_playing and ctx.voice_state.voice.is_playing():
@ -352,7 +352,7 @@ class Music(commands.Cog):
@commands.command(name='resume')
@commands.has_permissions(manage_guild=True)
async def _resume(self, ctx: commands.Context):
async def _resume(self, ctx):
"""Resumes a currently paused song."""
if not ctx.voice_state.is_playing and ctx.voice_state.voice.is_paused():
@ -361,7 +361,7 @@ class Music(commands.Cog):
@commands.command(name='stop')
@commands.has_permissions(manage_guild=True)
async def _stop(self, ctx: commands.Context):
async def _stop(self, ctx):
"""Stops playing song and clears the queue."""
ctx.voice_state.songs.clear()
@ -371,7 +371,7 @@ class Music(commands.Cog):
await ctx.message.add_reaction('⏹')
@commands.command(name='skip')
async def _skip(self, ctx: commands.Context):
async def _skip(self, ctx):
"""Vote to skip a song. The requester can automatically skip.
3 skip votes are needed for the song to be skipped.
"""
@ -398,7 +398,7 @@ class Music(commands.Cog):
await ctx.send('You have already voted to skip this song.')
@commands.command(name='queue')
async def _queue(self, ctx: commands.Context, *, page: int = 1):
async def _queue(self, ctx, *, page: int = 1):
"""Shows the player's queue.
You can optionally specify the page to show. Each page contains 10 elements.
"""
@ -421,7 +421,7 @@ class Music(commands.Cog):
await ctx.send(embed=embed)
@commands.command(name='shuffle')
async def _shuffle(self, ctx: commands.Context):
async def _shuffle(self, ctx):
"""Shuffles the queue."""
if len(ctx.voice_state.songs) == 0:
@ -431,7 +431,7 @@ class Music(commands.Cog):
await ctx.message.add_reaction('✅')
@commands.command(name='remove')
async def _remove(self, ctx: commands.Context, index: int):
async def _remove(self, ctx, index: int):
"""Removes a song from the queue at a given index."""
if len(ctx.voice_state.songs) == 0:
@ -441,7 +441,7 @@ class Music(commands.Cog):
await ctx.message.add_reaction('✅')
@commands.command(name='loop')
async def _loop(self, ctx: commands.Context):
async def _loop(self, ctx):
"""Loops the currently playing song.
Invoke this command again to unloop the song.
"""
@ -453,8 +453,8 @@ class Music(commands.Cog):
ctx.voice_state.loop = not ctx.voice_state.loop
await ctx.message.add_reaction('✅')
@commands.command(name='play')
async def _play(self, ctx: commands.Context, *, search: str):
@commands.command(name='play', aliases=["p", "P", "Play"])
async def _play(self, ctx, *, search: str):
"""Plays a song.
If there are songs in the queue, this will be queued until the
other songs finished playing.
@ -478,7 +478,7 @@ class Music(commands.Cog):
@_join.before_invoke
@_play.before_invoke
async def ensure_voice_state(self, ctx: commands.Context):
async def ensure_voice_state(self, ctx):
if not ctx.author.voice or not ctx.author.voice.channel:
raise commands.CommandError('You are not connected to any voice channel.')

Write Preview
Loading…
Cancel
Save