Sweetbread/natsuko
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[style]: Internal use functions to __name

Browse Source
This commit is contained in:
Sweetbread 2023-05-13 00:22:55 +03:00
parent b12f947109
commit e36155dd3f
1 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
cogs/music.py
View File

@ -36,36 +36,6 @@ class Music(commands.Cog, name="Музыка"):
self.bot = bot self.bot = bot
self.queue: Dict[int, Channel] = {} self.queue: Dict[int, Channel] = {}
def play_(self, inter, info):
try:
URL = info['url']
except:
URL = url
logger.debug(URL)
audio_source = discord.FFmpegPCMAudio(URL, **FFMPEG_OPTIONS)
inter.guild.voice_client.play(audio_source, after=lambda error: self.next_(inter, error))
asyncio.run_coroutine_threadsafe(self.send_embed_(inter, info), self.bot.loop)
async def send_embed_(self, inter, info):
embed = discord.Embed (
title=info["title"],
url=info['url'],
description=info["description"]
)
embed.set_author (
name=info["uploader"],
url=info["uploader_url"]
)
embed.set_thumbnail( url=info["thumbnail"] )
try:
await inter.response.send_message(embed=embed)
except:
await inter.channel.send(embed=embed)
async def end_of_queue_(self, inter):
await inter.channel.send("В очереди больше не осталось песен")
@app_commands.command(description="Plays music from popular platforms") @app_commands.command(description="Plays music from popular platforms")
@app_commands.describe(url="URL from Youtube/RuTube and other platforms") @app_commands.describe(url="URL from Youtube/RuTube and other platforms")
@ -96,7 +66,8 @@ class Music(commands.Cog, name="Музыка"):
else: else:
inter.guild.voice_client.stop() inter.guild.voice_client.stop()
self.play_(inter, info) self.__play(inter, info)
@app_commands.command() @app_commands.command()
async def stop(self, inter): async def stop(self, inter):
@ -105,25 +76,30 @@ class Music(commands.Cog, name="Музыка"):
inter.guild.voice_client.stop() inter.guild.voice_client.stop()
await inter.response.send_message("Остановлено") await inter.response.send_message("Остановлено")
@app_commands.command() @app_commands.command()
async def pause(self, inter): async def pause(self, inter):
inter.guild.voice_client.pause() inter.guild.voice_client.pause()
await inter.response.send_message("Поставлено на паузу") await inter.response.send_message("Поставлено на паузу")
@app_commands.command() @app_commands.command()
async def resume(self, inter): async def resume(self, inter):
inter.guild.voice_client.resume() inter.guild.voice_client.resume()
await inter.response.send_message("Снято с паузы") await inter.response.send_message("Снято с паузы")
@app_commands.command() @app_commands.command()
async def disconnect(self, inter): async def disconnect(self, inter):
await inter.guild.voice_client.disconnect() await inter.guild.voice_client.disconnect()
await inter.response.send_message("Отключено") await inter.response.send_message("Отключено")
@app_commands.command() @app_commands.command()
async def next(self, inter): async def next(self, inter):
inter.guild.voice_client.stop() inter.guild.voice_client.stop()
@app_commands.command(name='queue') @app_commands.command(name='queue')
async def _queue(self, inter): async def _queue(self, inter):
queue = self.queue[inter.user.voice.channel.id] queue = self.queue[inter.user.voice.channel.id]
@ -140,7 +116,41 @@ class Music(commands.Cog, name="Музыка"):
await inter.response.send_message(f"```\n{text}\n```") await inter.response.send_message(f"```\n{text}\n```")
def next_(self, inter, error=None): def __play(self, inter, info):
try:
URL = info['url']
except:
URL = url
logger.debug(URL)
audio_source = discord.FFmpegPCMAudio(URL, **FFMPEG_OPTIONS)
inter.guild.voice_client.play(audio_source, after=lambda error: self.__next(inter, error))
asyncio.run_coroutine_threadsafe(self.__send_embed(inter, info), self.bot.loop)
async def __send_embed(self, inter, info):
embed = discord.Embed (
title=info["title"],
url=info['url'],
description=info["description"]
)
embed.set_author (
name=info["uploader"],
url=info["uploader_url"]
)
embed.set_thumbnail( url=info["thumbnail"] )
try:
await inter.response.send_message(embed=embed)
except:
await inter.channel.send(embed=embed)
async def __end_of_queue(self, inter):
await inter.channel.send("В очереди больше не осталось песен")
def __next(self, inter, error=None):
if error: if error:
logger.error(error) logger.error(error)
return return
@ -151,12 +161,12 @@ class Music(commands.Cog, name="Музыка"):
queue.cur_pos += 1 queue.cur_pos += 1
logger.debug((len(queue.queue), queue.cur_pos)) logger.debug((len(queue.queue), queue.cur_pos))
if len(queue.queue) == queue.cur_pos: if len(queue.queue) == queue.cur_pos:
asyncio.run_coroutine_threadsafe(self.end_of_queue_(inter), self.bot.loop) asyncio.run_coroutine_threadsafe(self.__end_of_queue(inter), self.bot.loop)
return return
#logger.debug([query["music_pos"]]) #logger.debug([query["music_pos"]])
info = queue.queue[queue.cur_pos].info info = queue.queue[queue.cur_pos].info
self.play_(inter, info) self.__play(inter, info)
async def setup(bot): async def setup(bot):