Merge pull request 'Update dependency py-cord to v2.5.0' (#8) from renovate/py-cord-2.x into main

Reviewed-on: #8

.gitignore

@@ -0,0 +1,173 @@
+# ---> Python
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+# Project
+venv
+venv_linux
+venv_windows
+
+config.json

.renovaterc

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

README.md

@@ -1,5 +1,19 @@
-# YusarinBot
-[![License: GPL v2](https://img.shields.io/badge/License-GPL_v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html) [![Crowdin](https://badges.crowdin.net/yusarinbot/localized.svg)](https://crowdin.com/project/yusarinbot) ![Discord](https://img.shields.io/discord/940760922346123284)
+<h1 align="center">YusarinBot</h1>
+
+<p align="center">
+    <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">
+        <img alt="License: GPL v2" src="https://img.shields.io/badge/License-GPL_v2-blue.svg">
+    </a>
+    <a href="https://weblate.end-play.xyz/engage/yusarinbot/">
+        <img src="https://weblate.end-play.xyz/widget/yusarinbot/svg-badge.svg" alt="Translation status" />
+    </a>
+    <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">
+        <img alt="Discord" src="https://img.shields.io/discord/940760922346123284">
+    </a>
+</p>
 
 Simple, easy to set up, yet reliable.  
 A specially designed bot for creating private voice channels on your Discord servers.  
@@ -8,28 +22,36 @@ Installation instructions are listed below. Please, make sure you have installed
 > Since version 1.5 only slash commands are supported. If you'd like to use old-fashioned commands and commands prefix feature – consider installing [1.4 version](https://git.end-play.xyz/profitroll/YusarinBot/releases/tag/v1.4) which is the last one compatible with those.
 
 ## Installation (Short)
+
 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)
-1. Download and install Python 3 (3.6+ should be fine)
-2. Download bot's release: https://git.end-play.xyz/profitroll/YusarinBot/releases/latest
+
+1. Download and install Python 3.8+
+2. Download bot's release: <https://git.end-play.xyz/profitroll/YusarinBot/releases/latest>
 3. Unpack your archive to folder. Name it YusarinBot for example
 4. Change working directory using `cd YusarinBot` or `cd FolderYouHaveCreated`
-5. Run `pip install -r requirements.txt` to install dependencies
-6. Create new Discord application at https://discord.com/developers/applications
-7. You can rename it however you want, set needed descriptions etc
-8. Go to "Bot" tab and enable application as bot
-9. Copy token of your bot
-10. Open file `config.json` with your favorite text editor and paste your token as value of "bot_token" key
-11. Copy your own Discord ID and paste it as value of "owner" key (How to get ID: https://support.playhive.com/discord-user-id/)
-12. Bot is ready! Run it using `python yusarin.py`
+5. If you're using Linux system - install [dependencies for Pycord](https://docs.pycord.dev/en/stable/installing.html#installing)
+6. Run `pip install -r requirements.txt` to install dependencies
+7. [Optionally] run `pip install -r requirements-optional.txt` to install optional dependencies
+8. Create new Discord application at <https://discord.com/developers/applications>
+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. 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
-Default configuration file is [available here](https://git.end-play.xyz/profitroll/YusarinBot/blob/main/config.json)
+
+Default configuration file is [available here](https://git.profitroll.eu/profitroll/YusarinBot/src/branch/main/config.json)
+
 - "debug" - Option that enables more detailed log messages [Boolean]
 - "owner" - Discord ID of user who will be able to execute admin commands (`$shutdown` for example) [Integer]
 - "bot_name" - Name of your bot. Is not used anywhere yet [String]
@@ -49,5 +71,7 @@ Default configuration file is [available here](https://git.end-play.xyz/profitro
 - "auto_clear_timer" - Option that defines how often "auto_clear_trash" will do its job [Integer]
 
 ## Extra
+
 1. Bot doesn't have any self updaters **yet**
-2. You can add public version of the bot to your Discord server using this link: https://www.end-play.xyz/yusarin/invite
+2. You can add public version of the bot to your Discord server using this link: <https://www.end-play.xyz/yusarin/invite>
+3. If you have questions/suggestions - just join our [Discord Support Server](https://discord.com/invite/2zpzErtnNT)

cogs/cogCategory.py

@@ -0,0 +1,91 @@
+from discord import ApplicationContext, CategoryChannel, Option, SlashCommandGroup
+from discord.ext import commands
+
+from functions import (
+    getMsg,
+    guildConfGet,
+    guildConfReset,
+    guildConfSet,
+    loadJson,
+    makeEmbed,
+    strToColor,
+)
+
+
+# =========================================================================================================================
+class CogCategory(commands.Cog):
+    def __init__(self, client):
+        self.client = client
+
+    category = SlashCommandGroup(
+        "category", "Commands related to parent channels category"
+    )
+
+    @category.command(
+        name="set",
+        description="Select the voice channel that will be parent to private ones",
+    )
+    async def category_set(self, ctx: ApplicationContext, category: Option(CategoryChannel, "Parent Channel Category")):  # type: ignore
+        config = loadJson("config.json")
+        if ctx.guild is not None:
+            guildConfSet(ctx.guild, "category", category.id)
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("set_category_title", ctx.guild),
+                    description=getMsg("set_category_description", ctx.guild).format(
+                        category.name
+                    ),
+                    color=strToColor(config["color_ok"]),
+                )
+            )
+            if guildConfGet(ctx.guild, "channel") is None:
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("hint_none_channel_title", ctx.guild),
+                        description=getMsg("hint_none_channel_description", ctx.guild),
+                        color=strToColor(config["color_warn"]),
+                    )
+                )
+        else:
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("dm_title", ctx.guild),
+                    description=getMsg("dm_description", ctx.guild),
+                    color=strToColor(config["color_error"]),
+                )
+            )
+
+    @category.command(
+        name="reset", description="Reset the currently selected parent channel category"
+    )
+    async def category_reset(self, ctx: ApplicationContext):  # type: ignore
+        config = loadJson("config.json")
+        if ctx.guild is not None:
+            if guildConfGet(ctx.guild, "category") is not None:
+                guildConfReset(ctx.guild, "category")
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("reset_category_title", ctx.guild),
+                        description=getMsg("reset_category_description", ctx.guild),
+                        color=strToColor(config["color_ok"]),
+                    )
+                )
+            else:
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("hint_none_category_title", ctx.guild),
+                        description=getMsg("hint_none_category_description", ctx.guild),
+                        color=strToColor(config["color_warn"]),
+                    )
+                )
+        else:
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("dm_title", ctx.guild),
+                    description=getMsg("dm_description", ctx.guild),
+                    color=strToColor(config["color_error"]),
+                )
+            )
+
+
+# =========================================================================================================================

cogs/cogChannel.py

@@ -0,0 +1,155 @@
+from discord import (
+    ApplicationContext,
+    Cog,
+    Member,
+    SlashCommandGroup,
+    VoiceChannel,
+    VoiceState,
+    option,
+    utils,
+)
+from discord.ext import commands
+from discord.abc import GuildChannel
+
+from functions import (
+    appendLog,
+    changeNomicPerms,
+    createUserVoice,
+    getMsg,
+    guildConfGet,
+    guildConfReset,
+    guildConfSet,
+    isUserVoice,
+    isVoiceOfUser,
+    loadJson,
+    makeEmbed,
+    removeUserVoice,
+    strToColor,
+)
+
+
+# =========================================================================================================================
+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
+    ):
+        config = loadJson("config.json")
+
+        vc_from = before.channel
+        vc_to = after.channel
+
+        # If user left vc
+        if before.channel is not None and len(before.channel.members) == 0:
+            if isUserVoice(vc_from):
+                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
+        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)
+            if vc_to.id == guildConfGet(vc_to.guild, "channel"):
+                if guildConfGet(vc_to.guild, "category") is not None:
+                    voice_chan = await createUserVoice(
+                        vc_to,
+                        utils.get(
+                            vc_to.guild.categories,
+                            id=guildConfGet(vc_to.guild, "category"),
+                        ),
+                        member,
+                    )
+                    try:
+                        await member.move_to(voice_chan)
+                    except:
+                        await removeUserVoice(voice_chan)
+                else:
+                    appendLog(
+                        f"Category for guild {vc_to.guild} ({str(vc_to.guild.id)}) is not set",
+                        guild=vc_to.guild,
+                    )
+
+    channel = SlashCommandGroup("channel", "Commands related to parent voice channel")
+
+    @channel.command(
+        name="set",
+        description="Select the voice channel that will be parent to private ones",
+    )
+    @option("channel", description="Parent Voice Channel")
+    async def channel_set(self, ctx: ApplicationContext, channel: VoiceChannel):
+        config = loadJson("config.json")
+        if ctx.guild is not None:
+            guildConfSet(ctx.guild, "channel", channel.id)
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("set_channel_title", ctx.guild),
+                    description=getMsg("set_channel_description", ctx.guild).format(
+                        channel.name
+                    ),
+                    color=strToColor(config["color_ok"]),
+                )
+            )
+            if guildConfGet(ctx.guild, "category") is None:
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("hint_none_category_title", ctx.guild),
+                        description=getMsg("hint_none_category_description", ctx.guild),
+                        color=strToColor(config["color_warn"]),
+                    )
+                )
+        else:
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("dm_title", ctx.guild),
+                    description=getMsg("dm_description", ctx.guild),
+                    color=strToColor(config["color_error"]),
+                )
+            )
+
+    @channel.command(
+        name="reset", description="Reset the currently selected parent voice channel"
+    )
+    async def channel_reset(self, ctx: ApplicationContext):
+        config = loadJson("config.json")
+        if ctx.guild is not None:
+            if guildConfGet(ctx.guild, "channel") is not None:
+                guildConfReset(ctx.guild, "channel")
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("reset_channel_title", ctx.guild),
+                        description=getMsg("reset_channel_description", ctx.guild),
+                        color=strToColor(config["color_ok"]),
+                    )
+                )
+            else:
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("hint_none_channel_title", ctx.guild),
+                        description=getMsg("hint_none_channel_description", ctx.guild),
+                        color=strToColor(config["color_warn"]),
+                    )
+                )
+        else:
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("dm_title", ctx.guild),
+                    description=getMsg("dm_description", ctx.guild),
+                    color=strToColor(config["color_error"]),
+                )
+            )
+
+
+# =========================================================================================================================

cogs/cogLocale.py

@@ -0,0 +1,105 @@
+from os import listdir
+
+from discord import ApplicationContext, Option, SlashCommandGroup
+from discord.ext import commands
+
+from functions import (
+    appendLog,
+    getMsg,
+    guildConfGet,
+    guildConfReset,
+    guildConfSet,
+    loadJson,
+    makeEmbed,
+    strToColor,
+)
+
+
+# =========================================================================================================================
+class CogLocale(commands.Cog):
+    def __init__(self, client):
+        self.client = client
+
+    locale = SlashCommandGroup("locale", "Commands related to bot's locale")
+
+    valid_locales = []
+    files_locales = listdir(f"locale/")
+    for entry in files_locales:
+        valid_locales.append(".".join(entry.split(".")[:-1]))
+
+    @locale.command(name="set", description="Set bot's messages language")
+    async def locale_set(self, ctx: ApplicationContext, language: Option(str, "One of the languages in list", choices=valid_locales)):  # type: ignore
+        config = loadJson("config.json")
+        if ctx.guild is not None:
+            if language + ".json" in listdir(f"locale/"):
+                guildConfSet(ctx.guild, "locale", language)
+                appendLog(f"Server's locale is now set to {language}", ctx.guild)
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("set_locale_title", ctx.guild),
+                        description=getMsg("set_locale_description", ctx.guild).format(
+                            getMsg("locale_name", ctx.guild)
+                        ),
+                        color=strToColor(config["color_ok"]),
+                    )
+                )
+            else:
+                valid_locales = []
+                files_locales = listdir(f"locale/")
+                for entry in files_locales:
+                    valid_locales.append(entry.split(".")[:-1])
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("error_locale_title", ctx.guild),
+                        description=getMsg(
+                            "error_locale_description", ctx.guild
+                        ).format(", ".join(valid_locales)),
+                        color=strToColor(config["color_error"]),
+                    )
+                )
+        else:
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("dm_title", ctx.guild),
+                    description=getMsg("dm_description", ctx.guild),
+                    color=strToColor(config["color_error"]),
+                )
+            )
+
+    @locale.command(name="reset", description="Reset the bot's language in this guild")
+    async def locale_reset(self, ctx: ApplicationContext):  # type: ignore
+        config = loadJson("config.json")
+        if ctx.guild is not None:
+            if guildConfGet(ctx.guild, "locale") is not None:
+                guildConfReset(ctx.guild, "locale")
+                appendLog(f"Server's locale has been reset", ctx.guild)
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("reset_locale_title", ctx.guild),
+                        description=getMsg(
+                            "reset_locale_description", ctx.guild
+                        ).format(getMsg("locale_name", ctx.guild)),
+                        color=strToColor(config["color_ok"]),
+                    )
+                )
+            else:
+                await ctx.respond(
+                    embed=makeEmbed(
+                        title=getMsg("hint_none_locale_title", ctx.guild),
+                        description=getMsg(
+                            "hint_none_locale_description", ctx.guild
+                        ).format(getMsg("locale_name", ctx.guild)),
+                        color=strToColor(config["color_warn"]),
+                    )
+                )
+        else:
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("dm_title", ctx.guild),
+                    description=getMsg("dm_description", ctx.guild),
+                    color=strToColor(config["color_error"]),
+                )
+            )
+
+
+# =========================================================================================================================

cogs/cogUtility.py

@@ -0,0 +1,53 @@
+from os import getpid, makedirs, system
+from shutil import rmtree
+
+from discord import ApplicationContext, Cog, Guild, slash_command
+from discord.ext import commands
+
+from functions import appendLog, getMsg, loadJson, makeEmbed, saveJson, strToColor
+
+
+# =========================================================================================================================
+class CogUtility(commands.Cog):
+    def __init__(self, client):
+        self.client = client
+
+    @Cog.listener()
+    async def on_guild_join(self, guild: Guild):
+        makedirs(f"guilds/{str(guild.id)}", exist_ok=True)
+        makedirs(f"guilds/{str(guild.id)}/channels", exist_ok=True)
+        saveJson({}, f"guilds/{str(guild.id)}/config.json")
+
+        appendLog(f"Joined guild '{guild}' with id {str(guild.id)}")
+
+    @Cog.listener()
+    async def on_guild_remove(self, guild: Guild):
+        try:
+            rmtree(f"guilds/{str(guild.id)}")
+        except:
+            pass
+
+        appendLog(f"Left guild '{guild}' with id {str(guild.id)}")
+
+    @slash_command(name="shutdown", description="Restart the bot")
+    async def shutdown(self, ctx: ApplicationContext):
+        config = loadJson("config.json")
+        if ctx.author.id == config["owner"]:
+            await ctx.respond(
+                embed=makeEmbed(
+                    description=getMsg("shutdown", ctx.guild).format(ctx.author),
+                    color=strToColor(config["color_default"]),
+                )
+            )
+            system(f"kill -9 {str(getpid())}")
+        else:
+            await ctx.respond(
+                embed=makeEmbed(
+                    title=getMsg("admin_title", ctx.guild),
+                    description=getMsg("admin_description", ctx.guild),
+                    color=strToColor(config["color_error"]),
+                )
+            )
+
+
+# =========================================================================================================================

functions.py

@@ -1,14 +1,29 @@
-import gzip
-import os
-import sys
-import json
-import shutil
-import discord # type: ignore
-
 from datetime import datetime
-from pathlib import Path
+from gzip import open as gzipopen
+from os import listdir, makedirs, path, remove, stat
+from shutil import copyfileobj
+from typing import Any, Literal, Union
 
-path = Path(__file__).resolve().parent
+from discord import (
+    ApplicationContext,
+    CategoryChannel,
+    Client,
+    Embed,
+    Guild,
+    Member,
+    Message,
+    PermissionOverwrite,
+    TextChannel,
+    VoiceChannel,
+    utils,
+)
+
+try:
+    from ujson import dumps, loads
+except ImportError:
+    from json import dumps, loads
+
+# path = Path(__file__).resolve().parent
 
 log_size = 512
 
@@ -18,40 +33,42 @@ log_size = 512
 debug = False
 
 try:
-    with open("config.json", 'r', encoding="utf-8") as json_file:
-        output = json.load(json_file)
+    with open("config.json", "r", encoding="utf-8") as json_file:
+        output = loads(json_file.read())
         json_file.close()
     debug = output["debug"]
 except:
     debug = debug
 
+
 # Check latest log size
 def checkSize():
-    global path
-    path = str(path)
-
     try:
-        if not os.path.isdir(f"{path}/logs"):
-            os.mkdir(f"{path}/logs")
-        
-        log = os.stat(path + '/logs/latest.log')
+        if not path.isdir("logs"):
+            makedirs("logs", exist_ok=True)
+
+        log = stat("logs/latest.log")
         global log_size
 
         if (log.st_size / 1024) > log_size:
-            with open(path + '/logs/latest.log', 'rb') as f_in:
-                with gzip.open(f'{path}/logs/{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz', 'wb') as f_out:
-                    shutil.copyfileobj(f_in, f_out)
-                    print(f'Copied {path}/logs/{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz')
-            open(path + '/logs/latest.log', 'w').close()
+            with open("logs/latest.log", "rb") as f_in:
+                with gzipopen(
+                    f'logs/{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz', "wb"
+                ) as f_out:
+                    copyfileobj(f_in, f_out)
+                    print(
+                        f'Copied logs/{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz'
+                    )
+            open("logs/latest.log", "w").close()
     except FileNotFoundError:
-        print('Not found')
+        print("Not found")
         pass
 
+
 # Append string to log
-def appendLog(message, guild=None, announce=True):
+def appendLog(message: str, guild: Union[Guild, None] = None, announce=True) -> None:
     global debug
-    global path
-    
+
     if guild == None:
         message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] {message}'
     else:
@@ -59,26 +76,28 @@ def appendLog(message, guild=None, announce=True):
             message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] [{guild} | {str(guild.id)}] {message}'
         else:
             message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] [{guild}] {message}'
-    
+
     if announce:
         print(message_formatted, flush=True)
 
     checkSize()
 
-    log = open(path + '/logs/latest.log', 'a')  # type: ignore
-    log.write(f'{message_formatted}\n')
+    log = open("logs/latest.log", "a")  # type: ignore
+    log.write(f"{message_formatted}\n")
     log.close()
 
-def saveJson(value, filename):
-    with open(filename, 'w', encoding="utf-8") as f:
-        json.dump(value, f, indent=4, ensure_ascii=False)
+
+def saveJson(value: Any, filename: str) -> None:
+    with open(filename, "w", encoding="utf-8") as f:
+        f.write(dumps(value, indent=4, ensure_ascii=False))
         f.close()
 
-def loadJson(filename):
+
+def loadJson(filename: str) -> Any:
     global debug
     try:
-        with open(filename, 'r', encoding="utf-8") as json_file:
-            output = json.load(json_file)
+        with open(filename, "r", encoding="utf-8") as json_file:
+            output = loads(json_file.read())
             json_file.close()
     except Exception as exp:
         if debug:
@@ -86,60 +105,68 @@ def loadJson(filename):
         output = {}
     return output
 
+
 def colorToStr():
     pass
 
-def strToColor(string):
+
+def strToColor(string: str) -> int:
     return int(hex(int(string.replace("#", ""), 16)), 0)
 
-def gotCommand(message):
+
+def gotCommand(message: Message) -> None:
     global debug
     if debug:
-        appendLog(f"Command '{message.content}' from {message.author} ({str(message.author.id)})", message.guild)
+        appendLog(
+            f"Command '{message.content}' from {message.author} ({str(message.author.id)})",
+            message.guild,
+        )
     else:
         appendLog(f"Command '{message.content}' from {message.author}", message.guild)
 
-def guildConfGet(guild, variable):
-    global path
+
+def guildConfGet(guild: Guild, variable: str) -> Any:
     global debug
     try:
-        config = loadJson(f"{path}/guilds/{str(guild.id)}/config.json")
+        config = loadJson(f"guilds/{str(guild.id)}/config.json")
         return config[variable]
     except Exception as exp:
         if debug:
-            appendLog(f"Could not get guild config key '{variable}' due to {exp}", guild)
+            appendLog(
+                f"Could not get guild config key '{variable}' due to {exp}", guild
+            )
         return None
 
-def guildConfSet(guild, variable, value):
-    global path
-    config = loadJson(f"{path}/guilds/{str(guild.id)}/config.json")
+
+def guildConfSet(guild: Guild, variable: str, value: Any) -> None:
+    config = loadJson(f"guilds/{str(guild.id)}/config.json")
     config[variable] = value
     try:
-        saveJson(config, f"{path}/guilds/{str(guild.id)}/config.json")
+        saveJson(config, f"guilds/{str(guild.id)}/config.json")
     except:
-        os.mkdir(f"{path}/guilds/{str(guild.id)}")
-        os.mkdir(f"{path}/guilds/{str(guild.id)}/channels")
-        saveJson(config, f"{path}/guilds/{str(guild.id)}/config.json")
+        makedirs(f"guilds/{str(guild.id)}", exist_ok=True)
+        makedirs(f"guilds/{str(guild.id)}/channels", exist_ok=True)
+        saveJson(config, f"guilds/{str(guild.id)}/config.json")
     appendLog(f"Guild config key '{variable}' is now set to '{value}'", guild)
 
-def guildConfReset(guild, variable):
-    global path
+
+def guildConfReset(guild: Guild, variable: str) -> None:
     try:
-        config = loadJson(f"{path}/guilds/{str(guild.id)}/config.json")
+        config = loadJson(f"guilds/{str(guild.id)}/config.json")
         del config[variable]
         try:
-            saveJson(config, f"{path}/guilds/{str(guild.id)}/config.json")
+            saveJson(config, f"guilds/{str(guild.id)}/config.json")
         except:
-            os.mkdir(f"{path}/guilds/{str(guild.id)}")
-            os.mkdir(f"{path}/guilds/{str(guild.id)}/channels")
-            saveJson(config, f"{path}/guilds/{str(guild.id)}/config.json")
+            makedirs(f"guilds/{str(guild.id)}", exist_ok=True)
+            makedirs(f"guilds/{str(guild.id)}/channels", exist_ok=True)
+            saveJson(config, f"guilds/{str(guild.id)}/config.json")
         appendLog(f"Guild config key '{variable}' has been reset", guild)
     except Exception as exp:
         appendLog(f"Could not reset guild config key '{variable}' due to {exp}", guild)
 
-def guildLocaleGet(guild):
-    global path
-    config = loadJson(f"{path}/config.json")
+
+def guildLocaleGet(guild: Guild) -> str:
+    config = loadJson(f"config.json")
     try:
         locale = guildConfGet(guild, "locale")
     except:
@@ -149,161 +176,232 @@ def guildLocaleGet(guild):
     else:
         return locale
 
-def getMsg(string, guild=None):
-    global path
-    config = loadJson("config.json")
+
+def getMsg(string: str, guild: Union[Guild, None] = None) -> str:
     try:
-        locale = loadJson(f'{path}/locale/{guildLocaleGet(guild)}.json')
+        locale = loadJson(f"locale/{guildLocaleGet(guild)}.json")
         return locale["messages"][string]
     except Exception as exp:
-        appendLog(f"Could not get locale string named {string} due to exception {exp}", guild)
+        appendLog(
+            f"Could not get locale string named {string} due to exception {exp}", guild
+        )
         return string
 
-def makeEmbed(title="", description="", footer="", color=0xffffff):
-    embed=discord.Embed(title=title, description=description, color=color)
+
+def makeEmbed(title="", description="", footer="", color=0xFFFFFF) -> Embed:
+    embed = Embed(title=title, description=description, color=color)
     if footer is not None:
         embed.set_footer(text=footer)
     return embed
 
-def channelExists(number, guild, type="Any"):
+
+def channelExists(
+    number: int, guild: Guild, type: Literal["Any", "Text", "Voice"] = "Any"
+) -> bool:
     global debug
     if number == None:
         return False
     try:
         if type == "Voice":
-            selected_channel = discord.utils.get(guild.channels, id=number)
-            if isinstance(selected_channel, discord.VoiceChannel):
+            selected_channel = utils.get(guild.channels, id=number)
+            if isinstance(selected_channel, VoiceChannel):
                 return True
         elif type == "Text":
-            selected_channel = discord.utils.get(guild.channels, id=number)
-            if isinstance(selected_channel, discord.TextChannel):
+            selected_channel = utils.get(guild.channels, id=number)
+            if isinstance(selected_channel, TextChannel):
                 return True
         elif type == "Any":
-            selected_channel = discord.utils.get(guild.channels, id=number)
+            selected_channel = utils.get(guild.channels, id=number)
             return True
     except Exception as exp:
         if debug:
             appendLog(f"Channel ID {str(number)} is not a channel due to {exp}")
     return False
 
-def channelGetName(number, guild):
+
+def channelGetName(number: int, guild: Guild):
     global debug
     try:
-        selected_channel = discord.utils.get(guild.channels, id=number)
+        selected_channel = utils.get(guild.channels, id=number)
         return selected_channel.name
     except Exception as exp:
         if debug:
             appendLog(f"Channel ID {str(number)} is not a channel due to {exp}")
     return "Channel doesn't exist"
 
-def isUserVoice(vc):
-    global path
+
+def isUserVoice(vc: VoiceChannel) -> bool:
     try:
-        channels_list = os.listdir(f"{path}/guilds/{str(vc.guild.id)}/channels/")
+        channels_list = listdir(f"guilds/{str(vc.guild.id)}/channels/")
         if f"{str(vc.id)}.json" in channels_list:
             return True
         else:
             return False
     except:
         return False
-    
-async def removeUserVoice(vc):
-    global path
+
+
+async def removeUserVoice(vc: VoiceChannel) -> None:
     global debug
-    channels_list = os.listdir(f"{path}/guilds/{str(vc.guild.id)}/channels/")
+    channels_list = listdir(f"guilds/{str(vc.guild.id)}/channels/")
     if f"{vc.id}.json" in channels_list:
-        vc_file = f"{path}/guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
+        vc_file = f"guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
         vc_conf = loadJson(vc_file)
-        
-        needed_channel = discord.utils.get(vc.guild.channels, id=vc.id)
+
+        needed_channel = utils.get(vc.guild.channels, id=vc.id)
         if loadJson("config.json")["enable_nomic"]:
-            nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"])
+            nomic_channel = utils.get(vc.guild.channels, id=vc_conf["nomic"])
+
+        remove(vc_file)
         
-        os.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)
+        if needed_channel is None:
+            appendLog(
+                f"Removed voice channel '{needed_channel}' 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"]:
-            await nomic_channel.delete()
+            await needed_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)
+                appendLog(
+                    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 nomic channel '{nomic_channel}' of channel with id {str(needed_channel.id)}", guild=vc.guild)
+                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
 
-async def createUserVoice(vc, category, member):
-    global path
+
+async def createUserVoice(
+    vc: VoiceChannel, category: CategoryChannel, member: Member
+) -> VoiceChannel:
     global debug
     chan = {}
     overwrites_channel = {
-        vc.guild.default_role: discord.PermissionOverwrite(view_channel=True),
-        vc.guild.me: discord.PermissionOverwrite(read_messages=True, view_channel=True, manage_channels=True),
-        member: discord.PermissionOverwrite(read_messages=True, view_channel=True, manage_channels=True)
+        vc.guild.default_role: PermissionOverwrite(view_channel=True),
+        vc.guild.me: PermissionOverwrite(
+            read_messages=True, view_channel=True, manage_channels=True
+        ),
+        member: PermissionOverwrite(
+            read_messages=True, view_channel=True, manage_channels=True
+        ),
     }
     overwrites_nomic = {
-        vc.guild.default_role: discord.PermissionOverwrite(view_channel=False, read_messages=False),
-        vc.guild.me: discord.PermissionOverwrite(read_messages=True, view_channel=True, manage_channels=True),
-        member: discord.PermissionOverwrite(read_messages=True, view_channel=True, manage_channels=True)
+        vc.guild.default_role: PermissionOverwrite(
+            view_channel=False, read_messages=False
+        ),
+        vc.guild.me: PermissionOverwrite(
+            read_messages=True, view_channel=True, manage_channels=True
+        ),
+        member: PermissionOverwrite(
+            read_messages=True, view_channel=True, manage_channels=True
+        ),
     }
-    created_channel = await vc.guild.create_voice_channel(getMsg("name_voice", vc.guild).format(member.name), category=category, overwrites=overwrites_channel)
+    created_channel = await vc.guild.create_voice_channel(
+        getMsg("name_voice", vc.guild).format(member.name),
+        category=category,
+        overwrites=overwrites_channel,
+    )
     if debug:
-        appendLog(f"Created voice channel '{created_channel}' ({str(created_channel.id)}) for user {member} ({str(member.id)})", guild=vc.guild)
+        appendLog(
+            f"Created voice channel '{created_channel}' ({str(created_channel.id)}) for user {member} ({str(member.id)})",
+            guild=vc.guild,
+        )
     else:
-        appendLog(f"Created voice channel '{created_channel}' for user {member}", guild=vc.guild)
-    if not os.path.isdir(f"{path}/guilds/{str(created_channel.guild.id)}/channels"):
-        os.mkdir(f"{path}/guilds/{str(created_channel.guild.id)}/channels")
-    vc_file = f"{path}/guilds/{str(created_channel.guild.id)}/channels/{str(created_channel.id)}.json"
+        appendLog(
+            f"Created voice channel '{created_channel}' for user {member}",
+            guild=vc.guild,
+        )
+    if not path.isdir(f"guilds/{str(created_channel.guild.id)}/channels"):
+        makedirs(f"guilds/{str(created_channel.guild.id)}/channels", exist_ok=True)
+    vc_file = f"guilds/{str(created_channel.guild.id)}/channels/{str(created_channel.id)}.json"
     chan["ownerid"] = member.id
     saveJson(chan, vc_file)
     if loadJson("config.json")["enable_nomic"]:
-        nomic_channel = await vc.guild.create_text_channel(getMsg("name_nomic", vc.guild).format(created_channel.id), category=category, overwrites=overwrites_nomic, topic=getMsg("description_nomic", vc.guild).format(str(created_channel.id)))
+        nomic_channel = await vc.guild.create_text_channel(
+            getMsg("name_nomic", vc.guild).format(created_channel.id),
+            category=category,
+            overwrites=overwrites_nomic,
+            topic=getMsg("description_nomic", vc.guild).format(str(created_channel.id)),
+        )
         if debug:
-            appendLog(f"Created nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) for channel '{created_channel}' ({str(created_channel.id)})", guild=vc.guild)
+            appendLog(
+                f"Created nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) for channel '{created_channel}' ({str(created_channel.id)})",
+                guild=vc.guild,
+            )
         else:
-            appendLog(f"Created nomic channel '{nomic_channel}' for channel '{created_channel}'", guild=vc.guild)
+            appendLog(
+                f"Created nomic channel '{nomic_channel}' for channel '{created_channel}'",
+                guild=vc.guild,
+            )
         chan["nomic"] = nomic_channel.id
         saveJson(chan, vc_file)
     return created_channel
 
-def isVoiceOfUser(vc, member):
-    global path
-    vc_file = f"{path}/guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
+
+def isVoiceOfUser(vc: VoiceChannel, member: Member) -> bool:
+    vc_file = f"guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
     vc_conf = loadJson(vc_file)
     if vc_conf["ownerid"] == member.id:
         return True
     else:
         return False
 
-async def changeNomicPerms(mode, vc, member):
-    global path
-    vc_file = f"{path}/guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
+
+async def changeNomicPerms(
+    mode: Literal["deny", "allow"], vc: VoiceChannel, member: Member
+) -> None:
+    vc_file = f"guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
     vc_conf = loadJson(vc_file)
     if loadJson("config.json")["enable_nomic"]:
-        nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"])
+        nomic_channel = utils.get(vc.guild.channels, id=vc_conf["nomic"])
         if mode == "deny":
             await nomic_channel.set_permissions(member, view_channel=False)
         else:
             await nomic_channel.set_permissions(member, view_channel=True)
 
-async def clearTrash(client):
-    global path
-    if not os.path.isdir(f"{path}/guilds/"):
-        os.mkdir(f"{path}/guilds")
-    guilds_list = os.listdir(f"{path}/guilds/")
+
+async def clearTrash(client: Client):
+    if not path.isdir(f"guilds/"):
+        makedirs(f"guilds", exist_ok=True)
+    guilds_list = listdir(f"guilds/")
     for guild in guilds_list:
         guild_object = client.get_guild(int(guild))
-        if os.path.isdir(f"{path}/guilds/{guild}/channels"):
-            channels_list = os.listdir(f"{path}/guilds/{guild}/channels/")
+        if path.isdir(f"guilds/{guild}/channels"):
+            channels_list = listdir(f"guilds/{guild}/channels/")
             for channel in channels_list:
                 channel_id = channel[:-5]
                 try:
-                    selected_channel = discord.utils.get(guild_object.voice_channels, id=int(channel_id))
-                    channel_owner = loadJson(f"{path}/guilds/{guild}/channels/{channel}")["ownerid"]
+                    selected_channel = utils.get(
+                        guild_object.voice_channels, id=int(channel_id)
+                    )
+                    channel_owner = loadJson(f"guilds/{guild}/channels/{channel}")[
+                        "ownerid"
+                    ]
                     remove_channel = True
                     for member in selected_channel.members:
                         if member.id == channel_owner:
@@ -311,65 +409,101 @@ async def clearTrash(client):
                     if remove_channel:
                         await removeUserVoice(selected_channel)
                 except:
-                    os.remove(f"{path}/guilds/{guild}/channels/{channel_id}.json")
+                    remove(f"guilds/{guild}/channels/{channel_id}.json")
 
-#async def autoClearTrash(client):
-    # execute clearTrash every 120 seconds
 
-def getHelpMessage(ctx, version):
-    
-    #channelExists(number, guild, type="Voice")
-    
+# async def autoClearTrash(client):
+# execute clearTrash every 120 seconds
+
+
+def getHelpMessage(ctx: ApplicationContext, version: float) -> Embed:
+    # channelExists(number, guild, type="Voice")
+
     config = loadJson("config.json")
-    
+
     if ctx.guild is not None:
-        if channelExists(guildConfGet(ctx.guild, 'channel'), ctx.guild, type="Voice"):
-            desc_channel = getMsg("help_channel_set", guild=ctx.guild).format(channelGetName(guildConfGet(ctx.guild, 'channel'), ctx.guild))
+        if channelExists(guildConfGet(ctx.guild, "channel"), ctx.guild, type="Voice"):
+            desc_channel = getMsg("help_channel_set", guild=ctx.guild).format(
+                channelGetName(guildConfGet(ctx.guild, "channel"), ctx.guild)
+            )
         else:
             desc_channel = getMsg("help_channel_none", guild=ctx.guild)
-        
-        if channelExists(guildConfGet(ctx.guild, 'category'), ctx.guild, type="Any"):
-            desc_category = getMsg("help_category_set", guild=ctx.guild).format(channelGetName(guildConfGet(ctx.guild, 'category'), ctx.guild))
+
+        if channelExists(guildConfGet(ctx.guild, "category"), ctx.guild, type="Any"):
+            desc_category = getMsg("help_category_set", guild=ctx.guild).format(
+                channelGetName(guildConfGet(ctx.guild, "category"), ctx.guild)
+            )
         else:
             desc_category = getMsg("help_category_none", guild=ctx.guild)
-        
-        desc_locale = getMsg("help_locale", guild=ctx.guild).format(getMsg("locale_name", ctx.guild))
+
+        desc_locale = getMsg("help_locale", guild=ctx.guild).format(
+            getMsg("locale_name", ctx.guild)
+        )
 
         description = "\n".join([desc_locale, desc_channel, desc_category])
 
-        embed=discord.Embed(title=getMsg("help_title", ctx.guild), description=description, color=strToColor(config["color_default"]))
+        embed = Embed(
+            title=getMsg("help_title", ctx.guild),
+            description=description,
+            color=strToColor(config["color_default"]),
+        )
     else:
-        embed=discord.Embed(title=getMsg("help_title_dm", ctx.guild), color=strToColor(config["color_default"]))
-    
-    embed.set_author(name=f'{config["bot_name"]} v{str(version)}', url=config["bot_site"], icon_url=config["bot_icon"])
-    
+        embed = Embed(
+            title=getMsg("help_title_dm", ctx.guild),
+            color=strToColor(config["color_default"]),
+        )
+
+    embed.set_author(
+        name=f'{config["bot_name"]} v{str(version)}',
+        url=config["bot_site"],
+        icon_url=config["bot_icon"],
+    )
+
     if ctx.author.id == config["owner"]:
-        embed.add_field(name=f"/shutdown", value=getMsg("help_cmd_shutdown", ctx.guild), inline=False)
-    
-    embed.add_field(name=f"/channel set", value=getMsg("help_cmd_channel", ctx.guild), inline=False)
-    embed.add_field(name=f"/category set", value=getMsg("help_cmd_category", ctx.guild), inline=False)
-    embed.add_field(name=f"/locale set", value=getMsg("help_cmd_locale", ctx.guild), inline=False)
-    
+        embed.add_field(
+            name=f"/shutdown",
+            value=getMsg("help_cmd_shutdown", ctx.guild),
+            inline=False,
+        )
+
+    embed.add_field(
+        name=f"/channel set", value=getMsg("help_cmd_channel", ctx.guild), inline=False
+    )
+    embed.add_field(
+        name=f"/category set",
+        value=getMsg("help_cmd_category", ctx.guild),
+        inline=False,
+    )
+    embed.add_field(
+        name=f"/locale set", value=getMsg("help_cmd_locale", ctx.guild), inline=False
+    )
+
     if ctx.guild is None:
         embed.set_footer(text=getMsg("help_server", ctx.guild))
     else:
         embed.set_footer(text=getMsg("help_notice_id", ctx.guild))
-    
+
     return embed
 
-async def guildConfigured(guild):
 
+async def guildConfigured(guild: Guild) -> str:
     output = {}
     config = loadJson("config.json")
 
     for kind in ["channel", "category"]:
         if guildConfGet(guild, kind) is not None:
             try:
-                guild_object = discord.utils.get(guild.categories, id=guildConfGet(guild, kind))
-                output[kind] = getMsg("configured_"+kind, guild).format(guild_object.name)
+                guild_object = utils.get(guild.categories, id=guildConfGet(guild, kind))
+                output[kind] = getMsg("configured_" + kind, guild).format(
+                    guild_object.name
+                )
             except Exception as exp:
-                output[kind] = getMsg("unconfigured_"+kind, guild)
+                output[kind] = getMsg("unconfigured_" + kind, guild)
         else:
-            output[kind] = getMsg("unconfigured_"+kind, guild)
+            output[kind] = getMsg("unconfigured_" + kind, guild)
 
-    return getMsg("server_config", guild).format(getMsg("info_locale", guild).format(getMsg("locale_name", guild)), output["channel"], output["category"])
+    return getMsg("server_config", guild).format(
+        getMsg("info_locale", guild).format(getMsg("locale_name", guild)),
+        output["channel"],
+        output["category"],
+    )

requirements-optional.txt

@@ -0,0 +1,2 @@
+ujson==5.9.0
+py-cord[speed]==2.5.0

requirements.txt

@@ -1 +1,2 @@
-py-cord>=2.0.0b7
+py-cord==2.5.0
+requests==2.31.0

yusarin.py

@@ -1,224 +1,75 @@
-import os
-import sys
-import json
-import shutil
-import requests # type: ignore
-import threading
-
 try:
-    import discord # type: ignore
-    from discord import ApplicationContext, Option, Intents # type: ignore
+    from discord import Activity, ActivityType, ApplicationContext, Bot, Intents
+    from requests import get
 except Exception as exp:
-    print(f"Module py-cord is not installed. Make sure to run 'pip install -r requirements.txt' before first start")
-    sys.exit()
+    print(
+        f"Dependencies not installed. Make sure to run 'pip install -r requirements.txt' before first start"
+    )
+    exit()
+
+from os import getpid, path
 
 from functions import *
-pid = os.getpid()
-version = 1.6
 
-if loadJson("config.json")["owner"] == "SET-OWNER-ID" or loadJson("config.json")["bot_token"] == "SET-BOT-TOKEN":
-    print(f"Bot is not correctly configured.\nMake sure you've set up owner id and bot token in {path}/config.json\nLearn more here: https://git.end-play.xyz/profitroll/YusarinBot")
-    sys.exit()
+pid = getpid()
+version = 2.3
+
+if (
+    not path.exists("config.json")
+    or loadJson("config.json")["owner"] == "SET-OWNER-ID"
+    or loadJson("config.json")["bot_token"] == "SET-BOT-TOKEN"
+):
+    print(
+        f"Bot is not correctly configured.\nMake sure you've set up owner id and bot token in 'config.json'\nLearn more here: https://git.end-play.xyz/profitroll/YusarinBot"
+    )
+    exit()
 
 if loadJson("config.json")["check_for_updates"]:
+    appendLog(f"Currently using YusarinBot v{str(version)}")
     try:
-        serv_ver = json.loads(requests.get("https://api.end-play.xyz/version?app=yusarinbot&apikey=publickey").text)["version"]
-        if float(serv_ver) > version:
-            appendLog(f"YusarinBot version {serv_ver} is available. Download new version here: https://git.end-play.xyz/profitroll/YusarinBot/releases/latest")
-            appendLog(f"Currently using YusarinBot v{str(version)}")
+        releases = get(
+            "https://git.end-play.xyz/api/v1/repos/profitroll/YusarinBot/releases?draft=false&pre-release=false&page=1&limit=1"
+        ).json()
+        if float(releases[0]["tag_name"].replace("v", "")) > version:
+            appendLog(
+                f"YusarinBot version {releases[0]['tag_name']} is available. Download new version here: {releases[0]['html_url']}"
+            )
     except Exception as exp:
-        appendLog(f"Could not get YusarinBot cloud version due to {exp}. Currently using {str(version)}")
+        appendLog(
+            f"Could not get YusarinBot cloud version due to {exp}. Currently using {str(version)}"
+        )
 
 intents = Intents().all()
-client = discord.Bot(intents=intents)
+client = Bot(intents=intents)
 
-@client.event
-async def on_ready():
+from cogs.cogCategory import CogCategory
+from cogs.cogChannel import CogChannel
+from cogs.cogLocale import CogLocale
+from cogs.cogUtility import CogUtility
 
-    appendLog(f"Logged in as {client.user}")
-    
-    config = loadJson("config.json")
-    
-    await client.change_presence(activity=discord.Activity(type=discord.ActivityType.listening, name=config["bot_activity"]))
-    
-    await clearTrash(client)
 
-@client.event
-async def on_guild_join(guild):
-    
-    global path
-    
-    os.mkdir(f"{path}/guilds/{str(guild.id)}")
-    os.mkdir(f"{path}/guilds/{str(guild.id)}/channels")
-    saveJson({}, f"{path}/guilds/{str(guild.id)}/config.json")
-    
-    appendLog(f"Joined guild '{guild}' with id {str(guild.id)}")
-
-@client.event
-async def on_guild_remove(guild):
-    
-    global path
-
-    try:
-        shutil.rmtree(f"{path}/guilds/{str(guild.id)}")
-    except:
-        pass
-    
-    appendLog(f"Left guild '{guild}' with id {str(guild.id)}")
-
-@client.event
-async def on_voice_state_update(member, before, after):
-
-    global debug
-
-    config = loadJson("config.json")
-
-    vc_from = before.channel
-    vc_to = after.channel
-    
-    # If user left vc
-    if vc_to is None:
-        if isUserVoice(vc_from):
-            if isVoiceOfUser(vc_from, member):
-                await removeUserVoice(vc_from)
-                return
-            else:
-                if loadJson("config.json")["enable_nomic"]:
-                    await changeNomicPerms("deny", vc_from, member)
-        
-    # 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 isUserVoice(vc_to):
-            if loadJson("config.json")["enable_nomic"]:
-                await changeNomicPerms("allow", vc_to, member)
-        if vc_to.id == guildConfGet(vc_to.guild, "channel"):
-            if guildConfGet(vc_to.guild, "category") is not None:
-                voice_chan = await createUserVoice(vc_to, discord.utils.get(vc_to.guild.categories, id=guildConfGet(vc_to.guild, "category")), member)
-                try:
-                    await member.move_to(voice_chan)
-                except:
-                    await removeUserVoice(voice_chan)
-            else:
-                if debug:
-                    appendLog(f"Category for guild {vc_to.guild} ({str(vc_to.guild.id)}) is not set", guild=vc_to.guild)
-                else:
-                    appendLog(f"Category for guild {vc_to.guild} is not set", guild=vc_to.guild)
-
-#=========================================================================================================================
-@client.slash_command(name="shutdown", description="Restart the bot")
-async def shutdown(ctx: ApplicationContext):
-    config = loadJson("config.json")
-    if ctx.author.id == config["owner"]:  
-        await ctx.respond(embed=makeEmbed(description=getMsg("shutdown", ctx.guild).format(ctx.author), color=strToColor(config["color_default"])))
-        os.system(f"kill -9 {str(pid)}")
-    else:
-        await ctx.respond(embed=makeEmbed(title=getMsg("admin_title", ctx.guild), description=getMsg("admin_description", ctx.guild), color=strToColor(config["color_error"])))
-#=========================================================================================================================
-
-#=========================================================================================================================
 @client.slash_command(name="help", description="Get information about this server")
 async def help(ctx: ApplicationContext):
     await ctx.respond(embed=getHelpMessage(ctx, version))
-#=========================================================================================================================
 
-#=========================================================================================================================
-locale = client.create_group("locale", "Commands related to bot's locale")
 
-valid_locales = []
-files_locales = os.listdir(f"{path}/locale/")
-for entry in files_locales:
-    valid_locales.append(".".join(entry.split(".")[:-1]))
+@client.event
+async def on_ready():
+    appendLog(f"Logged in as {client.user}")
 
-@locale.command(name="set", description="Set bot's messages language")
-async def locale_set(ctx: ApplicationContext, language: Option(str, "One of the languages in list", choices=valid_locales)): # type: ignore
     config = loadJson("config.json")
-    if ctx.guild is not None:
-        if language+".json" in os.listdir(f"{path}/locale/"):
-            guildConfSet(ctx.guild, "locale", language)
-            appendLog(f"Server's locale is now set to {language}", ctx.guild)
-            await ctx.respond(embed=makeEmbed(title=getMsg("set_locale_title", ctx.guild), description=getMsg("set_locale_description", ctx.guild).format(getMsg("locale_name", ctx.guild)), color=strToColor(config["color_ok"])))
-        else:
-            valid_locales = []
-            files_locales = os.listdir(f"{path}/locale/")
-            for entry in files_locales:
-                valid_locales.append(entry.split(".")[:-1])
-            await ctx.respond(embed=makeEmbed(title=getMsg("error_locale_title", ctx.guild), description=getMsg("error_locale_description", ctx.guild).format(", ".join(valid_locales)), color=strToColor(config["color_error"])))
-    else:
-        await ctx.respond(embed=makeEmbed(title=getMsg("dm_title", ctx.guild), description=getMsg("dm_description", ctx.guild), color=strToColor(config["color_error"])))
 
-@locale.command(name="reset", description="Reset the bot's language in this guild")
-async def locale_reset(ctx: ApplicationContext): # type: ignore
-    config = loadJson("config.json")
-    if ctx.guild is not None:
-        if guildConfGet(ctx.guild, "locale") is not None:
-            guildConfReset(ctx.guild, "locale")
-            appendLog(f"Server's locale has been reset", ctx.guild)
-            await ctx.respond(embed=makeEmbed(title=getMsg("reset_locale_title", ctx.guild), description=getMsg("reset_locale_description", ctx.guild).format(getMsg("locale_name", ctx.guild)), color=strToColor(config["color_ok"])))
-        else:
-            await ctx.respond(embed=makeEmbed(title=getMsg("hint_none_locale_title", ctx.guild), description=getMsg("hint_none_locale_description", ctx.guild).format(getMsg("locale_name", ctx.guild)), color=strToColor(config["color_warn"])))
-    else:
-        await ctx.respond(embed=makeEmbed(title=getMsg("dm_title", ctx.guild), description=getMsg("dm_description", ctx.guild), color=strToColor(config["color_error"])))
-#=========================================================================================================================
+    await client.change_presence(
+        activity=Activity(type=ActivityType.listening, name=config["bot_activity"])
+    )
 
-#=========================================================================================================================
-channel = client.create_group("channel", "Commands related to parent voice channel")
+    await clearTrash(client)
 
-@channel.command(name="set", description="Select the voice channel that will be parent to private ones")
-async def channel_set(ctx: ApplicationContext, channel: Option(discord.VoiceChannel, "Parent Voice Channel")): # type: ignore
-    config = loadJson("config.json")
-    if ctx.guild is not None:
-        guildConfSet(ctx.guild, "channel", channel.id)
-        await ctx.respond(embed=makeEmbed(title=getMsg("set_channel_title", ctx.guild), description=getMsg("set_channel_description", ctx.guild).format(channel.name), color=strToColor(config["color_ok"])))
-        if guildConfGet(ctx.guild, "category") is None:
-            await ctx.respond(embed=makeEmbed(title=getMsg("hint_none_category_title", ctx.guild), description=getMsg("hint_none_category_description", ctx.guild), color=strToColor(config["color_warn"])))
-    else:
-        await ctx.respond(embed=makeEmbed(title=getMsg("dm_title", ctx.guild), description=getMsg("dm_description", ctx.guild), color=strToColor(config["color_error"])))
 
-@channel.command(name="reset", description="Reset the currently selected parent voice channel")
-async def channel_reset(ctx: ApplicationContext): # type: ignore
-    config = loadJson("config.json")
-    if ctx.guild is not None:
-        if guildConfGet(ctx.guild, "channel") is not None:
-            guildConfReset(ctx.guild, "channel")
-            await ctx.respond(embed=makeEmbed(title=getMsg("reset_channel_title", ctx.guild), description=getMsg("reset_channel_description", ctx.guild), color=strToColor(config["color_ok"])))
-        else:
-            await ctx.respond(embed=makeEmbed(title=getMsg("hint_none_channel_title", ctx.guild), description=getMsg("hint_none_channel_description", ctx.guild), color=strToColor(config["color_warn"])))
-    else:
-        await ctx.respond(embed=makeEmbed(title=getMsg("dm_title", ctx.guild), description=getMsg("dm_description", ctx.guild), color=strToColor(config["color_error"])))
-#=========================================================================================================================
-
-#=========================================================================================================================
-category = client.create_group("category", "Commands related to parent channels category")
-
-@category.command(name="set", description="Select the voice channel that will be parent to private ones")
-async def category_set(ctx: ApplicationContext, category: Option(discord.CategoryChannel, "Parent Channel Category")): # type: ignore
-    config = loadJson("config.json")
-    if ctx.guild is not None:
-        guildConfSet(ctx.guild, "category", category.id)
-        await ctx.respond(embed=makeEmbed(title=getMsg("set_category_title", ctx.guild), description=getMsg("set_category_description", ctx.guild).format(category.name), color=strToColor(config["color_ok"])))
-        if guildConfGet(ctx.guild, "channel") is None:
-            await ctx.respond(embed=makeEmbed(title=getMsg("hint_none_channel_title", ctx.guild), description=getMsg("hint_none_channel_description", ctx.guild), color=strToColor(config["color_warn"])))
-    else:
-        await ctx.respond(embed=makeEmbed(title=getMsg("dm_title", ctx.guild), description=getMsg("dm_description", ctx.guild), color=strToColor(config["color_error"])))
-
-@category.command(name="reset", description="Reset the currently selected parent channel category")
-async def category_reset(ctx: ApplicationContext): # type: ignore
-    config = loadJson("config.json")
-    if ctx.guild is not None:
-        if guildConfGet(ctx.guild, "category") is not None:
-            guildConfReset(ctx.guild, "category")
-            await ctx.respond(embed=makeEmbed(title=getMsg("reset_category_title", ctx.guild), description=getMsg("reset_category_description", ctx.guild), color=strToColor(config["color_ok"])))
-        else:
-            await ctx.respond(embed=makeEmbed(title=getMsg("hint_none_category_title", ctx.guild), description=getMsg("hint_none_category_description", ctx.guild), color=strToColor(config["color_warn"])))
-    else:
-        await ctx.respond(embed=makeEmbed(title=getMsg("dm_title", ctx.guild), description=getMsg("dm_description", ctx.guild), color=strToColor(config["color_error"])))
-#=========================================================================================================================
+client.add_cog(CogCategory(client))
+client.add_cog(CogChannel(client))
+client.add_cog(CogLocale(client))
+client.add_cog(CogUtility(client))
 
 appendLog(f"Trying to log in...")
-client.run(loadJson("config.json")["bot_token"])
+client.run(loadJson("config.json")["bot_token"])