Merge pull request 'Update dependency ujson to v5.8.0' (#6) from renovate/ujson-5.x into main

Reviewed-on: #6

.gitignore

@@ -164,3 +164,10 @@ cython_debug/
 
 # Built Visual Studio Code Extensions
 *.vsix
+
+# Project
+venv
+venv_linux
+venv_windows
+
+config.json

README.md

@@ -26,8 +26,9 @@ Installation instructions are listed below. Please, make sure you have installed
 1. `git clone https://git.end-play.xyz/profitroll/YusarinBot`
 2. `cd YusarinBot`
 3. `pip install -r requirements.txt`
-4. `nano config.json`
-5. `python yusarin.py`
+4. `cp config_example.json config.json`
+5. `nano config.json`
+6. `python yusarin.py`
 
 ## Installation (Detailed)
 
@@ -42,9 +43,10 @@ Installation instructions are listed below. Please, make sure you have installed
 9. You can rename it however you want, set needed descriptions etc
 10. Go to "Bot" tab and enable application as bot
 11. Copy token of your bot
-12. Open file `config.json` with your favorite text editor and paste your token as value of "bot_token" key
-13. Copy your own Discord ID and paste it as value of "owner" key (How to get ID: <https://support.playhive.com/discord-user-id/>)
-14. Bot is ready! Run it using `python yusarin.py`
+12. Copy `config_example.json` to `config.json`
+13. Open file `config.json` with your favorite text editor and paste your token as value of "bot_token" key
+14. Copy your own Discord ID and paste it as value of "owner" key (How to get ID: <https://support.playhive.com/discord-user-id/>)
+15. Bot is ready! Run it using `python yusarin.py`
 
 ## Config explanation
 

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

@@ -254,7 +254,14 @@ async def removeUserVoice(vc: VoiceChannel) -> None:
 
         remove(vc_file)
         
+        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 debug:
                 appendLog(
                     f"Removed voice channel '{needed_channel}' ({str(needed_channel.id)}) of user with id {str(vc_conf['ownerid'])}",
@@ -267,10 +274,17 @@ async def removeUserVoice(vc: VoiceChannel) -> None:
                 )
 
         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)}",
+                        f"Removed nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) of channel with id {str(needed_channel.id)}",
                         guild=vc.guild,
                     )
                 else:

requirements-optional.txt

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

requirements.txt

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

yusarin.py

@@ -7,15 +7,16 @@ except Exception as exp:
     )
     exit()
 
-from os import getpid
+from os import getpid, path
 
 from functions import *
 
 pid = getpid()
-version = 1.9
+version = 2.3
 
 if (
-    loadJson("config.json")["owner"] == "SET-OWNER-ID"
+    not path.exists("config.json")
+    or loadJson("config.json")["owner"] == "SET-OWNER-ID"
     or loadJson("config.json")["bot_token"] == "SET-BOT-TOKEN"
 ):
     print(