Updated version to 2.2

Reviewed-on: #3

.renovaterc

@@ -0,0 +1,6 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "config:base"
+    ]
+}

README.md

@@ -7,7 +7,7 @@
     <a href="https://crowdin.com/project/yusarinbot">
         <img alt="Crowdin" src="https://badges.crowdin.net/yusarinbot/localized.svg">
     </a>
-    <a href="https://git.end-play.xyz/profitroll/TelegramPoster">
+    <a href="https://git.end-play.xyz/profitroll/YusarinBot">
         <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
     </a>
     <a href="https://discord.com/invite/2zpzErtnNT">

cogs/cogChannel.py

@@ -9,6 +9,7 @@ from discord import (
     utils,
 )
 from discord.ext import commands
+from discord.abc import GuildChannel
 
 from functions import (
     appendLog,
@@ -32,6 +33,11 @@ class CogChannel(commands.Cog):
     def __init__(self, client):
         self.client = client
 
+    @commands.Cog.listener()
+    async def on_guild_channel_delete(self, channel: GuildChannel):
+        if isUserVoice(channel):
+            await removeUserVoice(channel)
+
     @Cog.listener()
     async def on_voice_state_update(
         self, member: Member, before: VoiceState, after: VoiceState
@@ -42,23 +48,17 @@ class CogChannel(commands.Cog):
         vc_to = after.channel
 
         # If user left vc
-        if vc_to is None:
+        if before.channel is not None and len(before.channel.members) == 0:
             if isUserVoice(vc_from):
-                if isVoiceOfUser(vc_from, member):
-                    await removeUserVoice(vc_from)
-                    return
-                else:
+                if not isVoiceOfUser(vc_from, member):
                     if loadJson("config.json")["enable_nomic"]:
                         await changeNomicPerms("deny", vc_from, member)
+                await removeUserVoice(vc_from)
 
         # If user joined vc
-        else:
-            if isUserVoice(vc_from):
-                if isVoiceOfUser(vc_from, member):
-                    await removeUserVoice(vc_from)
-                else:
-                    if loadJson("config.json")["enable_nomic"]:
-                        await changeNomicPerms("deny", vc_from, member)
+        if after.channel is not None and after.channel.id == guildConfGet(
+            member.guild, "channel"
+        ):
             if isUserVoice(vc_to):
                 if loadJson("config.json")["enable_nomic"]:
                     await changeNomicPerms("allow", vc_to, member)

functions.py

@@ -253,31 +253,45 @@ async def removeUserVoice(vc: VoiceChannel) -> None:
             nomic_channel = utils.get(vc.guild.channels, id=vc_conf["nomic"])
 
         remove(vc_file)
-
-        await needed_channel.delete()
-        if debug:
-            appendLog(
-                f"Removed voice channel '{needed_channel}' ({str(needed_channel.id)}) of user with id {str(vc_conf['ownerid'])}",
-                guild=vc.guild,
-            )
-        else:
+        
+        if needed_channel is None:
             appendLog(
                 f"Removed voice channel '{needed_channel}' of user with id {str(vc_conf['ownerid'])}",
                 guild=vc.guild,
             )
+        else:
+            await needed_channel.delete()
 
-        if loadJson("config.json")["enable_nomic"]:
-            await nomic_channel.delete()
             if debug:
                 appendLog(
-                    f"Removed nomic channel {nomic_channel} ({str(nomic_channel.id)}) of channel with id {str(needed_channel.id)}",
+                    f"Removed voice channel '{needed_channel}' ({str(needed_channel.id)}) of user with id {str(vc_conf['ownerid'])}",
                     guild=vc.guild,
                 )
             else:
+                appendLog(
+                    f"Removed voice channel '{needed_channel}' of user with id {str(vc_conf['ownerid'])}",
+                    guild=vc.guild,
+                )
+
+        if loadJson("config.json")["enable_nomic"]:
+            if nomic_channel is None:
                 appendLog(
                     f"Removed nomic channel '{nomic_channel}' of channel with id {str(needed_channel.id)}",
                     guild=vc.guild,
                 )
+            else:
+                await nomic_channel.delete()
+
+                if debug:
+                    appendLog(
+                        f"Removed nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) of channel with id {str(needed_channel.id)}",
+                        guild=vc.guild,
+                    )
+                else:
+                    appendLog(
+                        f"Removed nomic channel '{nomic_channel}' of channel with id {str(needed_channel.id)}",
+                        guild=vc.guild,
+                    )
     else:
         return
 

requirements-optional.txt

@@ -1,2 +1,2 @@
-ujson~=5.7.0
-py-cord[speed]~=2.4.1
+ujson==5.7.0
+py-cord[speed]==2.4.1

requirements.txt

@@ -1,2 +1,2 @@
-py-cord~=2.4.1
-requests~=2.28.2
+py-cord==2.4.1
+requests==2.29.0

yusarin.py

@@ -12,7 +12,7 @@ from os import getpid
 from functions import *
 
 pid = getpid()
-version = 1.9
+version = 2.2
 
 if (
     loadJson("config.json")["owner"] == "SET-OWNER-ID"