From 6bcb2ba7c444c0cbb037a21e9a0d0cd18172f7f2 Mon Sep 17 00:00:00 2001
From: levina <82658782+levina-lab@users.noreply.github.com>
Date: Wed, 9 Feb 2022 09:44:46 +0700
Subject: [PATCH] fixes

---
 program/music.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/program/music.py b/program/music.py
index 0069955..edab051 100644
--- a/program/music.py
+++ b/program/music.py
@@ -3,7 +3,6 @@
 # Finished On 28/10/2021
 
 import os
-
 # pyrogram stuff
 from pyrogram import Client
 from pyrogram.errors import UserAlreadyParticipant, UserNotParticipant
@@ -23,7 +22,7 @@ from driver.core import calls, user, bot
 from driver.utils import bash
 from driver.database.dbpunish import is_gbanned_user
 from driver.database.dblockchat import blacklisted_chats
-from driver.database.dbqueue import add_active_chat, remove_active_chat, is_active_chat, music_on
+from driver.database.dbqueue import add_active_chat, remove_active_chat, music_on, music_off
 from config import BOT_USERNAME, IMG_5
 # youtube-dl stuff
 from youtubesearchpython import VideosSearch
@@ -177,6 +176,7 @@ async def play(c: Client, m: Message):
                     image = await thumb(thumbnail, title, userid, ctitle)
                     await suhu.edit("🔄 **Joining vc...**")
                     await music_on(chat_id)
+                    await add_active_chat(chat_id)
                     await calls.join_group_call(
                         chat_id,
                         AudioPiped(
@@ -197,10 +197,10 @@ async def play(c: Client, m: Message):
                         caption=f"🗂 **Name:** [{songname}]({link}) | `music`\n⏱️ **Duration:** `{duration}`\n🧸 **Request by:** {requester}",
                     )
                     await idle()
-                    await add_active_chat(chat_id)
                     os.remove(image)
                 except Exception as e:
                     await suhu.delete()
+                    await music_off(chat_id)
                     await remove_active_chat(chat_id)
                     await m.reply_text(f"🚫 error:\n\n» {e}")
         else:
@@ -245,6 +245,7 @@ async def play(c: Client, m: Message):
                             try:
                                 await suhu.edit("🔄 **Joining vc...**")
                                 await music_on(chat_id)
+                                await add_active_chat(chat_id)
                                 await calls.join_group_call(
                                     chat_id,
                                     AudioPiped(
@@ -265,10 +266,10 @@ async def play(c: Client, m: Message):
                                     caption=f"🗂 **Name:** [{songname}]({url}) | `music`\n**⏱ Duration:** `{duration}`\n🧸 **Request by:** {requester}",
                                 )
                                 await idle()
-                                await add_active_chat(chat_id)
                                 os.remove(image)
                             except Exception as ep:
                                 await suhu.delete()
+                                await music_off(chat_id)
                                 await remove_active_chat(chat_id)
                                 await m.reply_text(f"🚫 error: `{ep}`")
 
@@ -312,6 +313,7 @@ async def play(c: Client, m: Message):
                         try:
                             await suhu.edit("🔄 **Joining vc...**")
                             await music_on(chat_id)
+                            await add_active_chat(chat_id)
                             await calls.join_group_call(
                                 chat_id,
                                 AudioPiped(
@@ -330,9 +332,9 @@ async def play(c: Client, m: Message):
                                 caption=f"🗂 **Name:** [{songname}]({url}) | `music`\n**⏱ Duration:** `{duration}`\n🧸 **Request by:** {requester}",
                             )
                             await idle()
-                            await add_active_chat(chat_id)
                             os.remove(image)
                         except Exception as ep:
                             await suhu.delete()
+                            await music_off(chat_id)
                             await remove_active_chat(chat_id)
                             await m.reply_text(f"🚫 error: `{ep}`")