From 05001a09aa5a143a752bc9fb26856b640784d057 Mon Sep 17 00:00:00 2001 From: ionburger Date: Sun, 29 Jan 2023 19:27:43 -0700 Subject: [PATCH] jhgyu --- py/cogs/misc.py | 4 ++++ py/cogs/voice.py | 8 +++----- py/lib64 | 1 - py/pyvenv.cfg | 5 ----- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 120000 py/lib64 delete mode 100644 py/pyvenv.cfg diff --git a/py/cogs/misc.py b/py/cogs/misc.py index cec0142..2b6cfb2 100644 --- a/py/cogs/misc.py +++ b/py/cogs/misc.py @@ -28,6 +28,10 @@ class Misc(commands.Cog): self.bot.reload_extension("cogs.misc") self.bot.reload_extension("cogs.triggers") self.bot.reload_extension("cogs.counting") + self.bot.reload_extension("cogs.quotequeue") + self.bot.reload_extension("cogs.voice") + st = Config(message.guild.id,self.bot.db) + st.updateguild() await message.channel.send("r") diff --git a/py/cogs/voice.py b/py/cogs/voice.py index 1192483..cbc580a 100644 --- a/py/cogs/voice.py +++ b/py/cogs/voice.py @@ -7,9 +7,7 @@ class Voice(commands.Cog): def __init__(self, bot): self.bot = bot - def qhandler(self, ctx, error=None): - print(ctx.guild.id) - st = Config(ctx.guild.id, self.bot.db) + def qhandler(error=None,self=None, ctx=None, st=None): queue = st.read("voice", "queue").split("/./") queue.pop(0) st.write("voice", "queue", queue.join("/./")) @@ -73,6 +71,7 @@ class Voice(commands.Cog): 'source_address': '0.0.0.0', } with YoutubeDL(ytdl_format_options) as ydl: + st = Config(ctx.guild.id, self.bot.db) if link.startswith("https://"): info_dict = ydl.extract_info(link, download=False) video_url = info_dict.get("url", None) @@ -84,10 +83,9 @@ class Voice(commands.Cog): video_id = info_dict.get("id", None) video_title = info_dict.get('title', None) if not ctx.voice_client.is_playing(): - ctx.voice_client.play(discord.FFmpegPCMAudio(video_url, **ffmpeg_options), after=self.qhandler(self, ctx)) + ctx.voice_client.play(discord.FFmpegPCMAudio(video_url, **ffmpeg_options), after=self.qhandler(self=self, ctx=ctx, st=st)) await ctx.respond(f"Now playing: {video_title}") else: - st = Config(ctx.guild.id, self.bot.db) queue = st.read("voice", "queue").split("/./") queue.append(info_dict) st.write("voice", "queue", queue.join("/./")) diff --git a/py/lib64 b/py/lib64 deleted file mode 120000 index 7951405..0000000 --- a/py/lib64 +++ /dev/null @@ -1 +0,0 @@ -lib \ No newline at end of file diff --git a/py/pyvenv.cfg b/py/pyvenv.cfg deleted file mode 100644 index 9fc3b3e..0000000 --- a/py/pyvenv.cfg +++ /dev/null @@ -1,5 +0,0 @@ -home = /usr/bin -include-system-site-packages = false -version = 3.11.1 -executable = /usr/bin/python3.11 -command = /usr/bin/python3.11 -m venv /home/ion/projects/turdbot/py