Update 1.6

README.md

@@ -1,11 +1,13 @@
 # YusarinBot
 
-Simple, clear, easy, reliable.  
-A specially designed bot for creating private voice channels at your servers.  
+Simple, easy to set up, yet reliable.  
+A specially designed bot for creating private voice channels on your Discord servers.  
 Installation instructions are listed below. Please, make sure you have installed dependencies before opening issue here.
 
+> 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://github.com/profitrollgame/YusarinBot`
+1. `git clone https://git.end-play.xyz/profitroll/YusarinBot`
 2. `cd YusarinBot`
 3. `pip install -r requirements.txt`
 4. `nano config.json`
@@ -13,7 +15,7 @@ Installation instructions are listed below. Please, make sure you have installed
 
 ## Installation (Detailed)
 1. Download and install Python 3 (3.6+ should be fine)
-2. Download bot's release: https://github.com/profitrollgame/YusarinBot/releases/latest
+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
@@ -26,16 +28,24 @@ Installation instructions are listed below. Please, make sure you have installed
 12. 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)
+- "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]
 - "bot_token" - Token of your Discord bot [String]
 - "bot_prefix" - Default prefix for all bot commands [String]
 - "bot_locale" - Default language file of bot. Name of file in `locale` folder without extension is used [String]
 - "bot_activity" - The name (string) of the song bot will be listening to [String]
+- "color_default" - HTML color used in help messages embed [String]
+- "color_ok" - HTML color used on command success embed [String]
+- "color_warn" - HTML color used in all warning embeds [String]
+- "color_error" - HTML color used on command error embed [String]
+- "bot_site" - http or https link that will be used in help message header [String]
+- "bot_icon" - http or https link that will be used in help message header's icon [String]
 - "check_for_updates" - Option that defines whether bot should check for a new version available [Boolean]
 - "auto_clear_trash" - Option that defines whether bot should clean all buggy inactive channels every "auto_clear_timer" seconds [Boolean]
 - "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://discord.com/api/oauth2/authorize?client_id=937839388853944390&permissions=318769168&scope=bot
+2. You can add public version of the bot to your Discord server using this link: https://www.end-play.xyz/yusarin/invite

config.json

@@ -1,10 +1,17 @@
 {
-    "owner": SET-OWNER-ID,
+    "debug": false,
+    "owner": "SET-OWNER-ID",
     "bot_name": "Yusa Nishimori",
     "bot_token": "SET-BOT-TOKEN",
     "bot_prefix": "$",
     "bot_locale": "en",
     "bot_activity": "How-Low-Hello - Keep on Burnin'",
+    "color_default": "#F2C48D",
+    "color_ok": "#226699",
+    "color_warn": "#FFCC4D",
+    "color_error": "#DD2E44",
+    "bot_site": "https://www.end-play.xyz/yusarin",
+    "bot_icon": "https://www.end-play.xyz/yusarin/logo",
     "check_for_updates": true,
     "auto_clear_trash": false,
     "auto_clear_timer": 120

functions.py

@@ -1,8 +1,9 @@
+import gzip
 import os
 import sys
 import json
 import shutil
-import discord
+import discord # type: ignore
 
 from datetime import datetime
 from pathlib import Path
@@ -11,6 +12,19 @@ path = Path(__file__).resolve().parent
 
 log_size = 512
 
+# This is the default option for "debug" key in
+# file config.json, so if cebug is not set in it
+# bot will use this value instead.
+debug = False
+
+try:
+    with open("config.json", 'r', encoding="utf-8") as json_file:
+        output = json.load(json_file)
+        json_file.close()
+    debug = output["debug"]
+except:
+    debug = debug
+
 # Check latest log size
 def checkSize():
     global path
@@ -34,16 +48,24 @@ def checkSize():
         pass
 
 # Append string to log
-def appendLog(message, guild="none"):
+def appendLog(message, guild=None, announce=True):
+    global debug
     global path
     
-    message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] [{str(guild)}] {message}'
+    if guild == None:
+        message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] {message}'
+    else:
+        if debug:
+            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}'
     
-    print(message_formatted)
+    if announce:
+        print(message_formatted)
 
     checkSize()
 
-    log = open(path + '/logs/latest.log', 'a')
+    log = open(path + '/logs/latest.log', 'a')  # type: ignore
     log.write(f'{message_formatted}\n')
     log.close()
 
@@ -53,50 +75,73 @@ def saveJson(value, filename):
         f.close()
 
 def loadJson(filename):
+    global debug
     try:
         with open(filename, 'r', encoding="utf-8") as json_file:
             output = json.load(json_file)
             json_file.close()
     except Exception as exp:
-        appendLog(f"Could not get contents of json file {filename} due to exception {exp}")
+        if debug:
+            appendLog(f"Could not load json file {filename} due to exception {exp}")
         output = {}
     return output
 
+def colorToStr():
+    pass
+
+def strToColor(string):
+    return int(hex(int(string.replace("#", ""), 16)), 0)
+
+def gotCommand(message):
+    global debug
+    if debug:
+        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
-    config = loadJson(f"{path}/guilds/{str(guild)}/config.json")
+    global debug
     try:
+        config = loadJson(f"{path}/guilds/{str(guild.id)}/config.json")
         return config[variable]
-    except:
+    except Exception as exp:
+        if debug:
+            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)}/config.json")
+    config = loadJson(f"{path}/guilds/{str(guild.id)}/config.json")
     config[variable] = value
     try:
-        saveJson(config, f"{path}/guilds/{str(guild)}/config.json")
+        saveJson(config, f"{path}/guilds/{str(guild.id)}/config.json")
     except:
-        os.mkdir(f"{path}/guilds/{str(guild)}")
-        os.mkdir(f"{path}/guilds/{str(guild)}/channels")
-        saveJson(config, f"{path}/guilds/{str(guild)}/config.json")
+        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")
+    appendLog(f"Guild config key '{variable}' is now set to '{value}'", guild)
 
 def guildConfReset(guild, variable):
     global path
-    config = loadJson(f"{path}/guilds/{str(guild)}/config.json")
-    del config[variable]
     try:
-        saveJson(config, f"{path}/guilds/{str(guild)}/config.json")
-    except:
-        os.mkdir(f"{path}/guilds/{str(guild)}")
-        os.mkdir(f"{path}/guilds/{str(guild)}/channels")
-        saveJson(config, f"{path}/guilds/{str(guild)}/config.json")
+        config = loadJson(f"{path}/guilds/{str(guild.id)}/config.json")
+        del config[variable]
+        try:
+            saveJson(config, f"{path}/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")
+        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")
     try:
-        locale = guildConfGet(guild.id, "locale")
+        locale = guildConfGet(guild, "locale")
     except:
         return config["bot_locale"]
     if locale is None:
@@ -104,15 +149,52 @@ def guildLocaleGet(guild):
     else:
         return locale
 
-def getMsg(string, guild):
+def getMsg(string, guild=None):
     global path
     config = loadJson("config.json")
     try:
         locale = loadJson(f'{path}/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}")
-        return f"Could not get locale string {string}"
+        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)
+    if footer is not None:
+        embed.set_footer(text=footer)
+    return embed
+
+def channelExists(number, guild, type="Any"):
+    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):
+                return True
+        elif type == "Text":
+            selected_channel = discord.utils.get(guild.channels, id=number)
+            if isinstance(selected_channel, discord.TextChannel):
+                return True
+        elif type == "Any":
+            selected_channel = discord.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):
+    global debug
+    try:
+        selected_channel = discord.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
@@ -127,6 +209,7 @@ def isUserVoice(vc):
     
 async def removeUserVoice(vc):
     global path
+    global debug
     channels_list = os.listdir(f"{path}/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"
@@ -138,14 +221,21 @@ async def removeUserVoice(vc):
         os.remove(vc_file)
         
         await needed_channel.delete()
-        appendLog(f"Removed voice channel {str(needed_channel.id)} of user {str(vc_conf['ownerid'])}", guild=vc.guild.id)
+        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:
+            appendLog(f"Removed voice channel '{needed_channel}' of user with id {str(vc_conf['ownerid'])}", guild=vc.guild)
         await nomic_channel.delete()
-        appendLog(f"Removed nomic channel {str(nomic_channel.id)} of channel {str(needed_channel.id)}", guild=vc.guild.id)
+        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
+    global debug
     chan = {}
     overwrites_channel = {
         vc.guild.default_role: discord.PermissionOverwrite(view_channel=True),
@@ -158,14 +248,20 @@ async def createUserVoice(vc, category, member):
         member: discord.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)
-    appendLog(f"Created voice channel {str(created_channel.id)} for user {str(member.id)}", guild=vc.guild.id)
+    if debug:
+        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"
     chan["ownerid"] = member.id
     saveJson(chan, vc_file)
     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)))
-    appendLog(f"Created nomic channel {str(nomic_channel.id)} for channel {str(created_channel.id)}", guild=vc.guild.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)
+    else:
+        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
@@ -215,31 +311,60 @@ async def clearTrash(client):
 #async def autoClearTrash(client):
     # execute clearTrash every 120 seconds
 
+def getHelpMessage(ctx, version):
+    
+    #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))
+        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))
+        else:
+            desc_category = getMsg("help_category_none", guild=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"]))
+    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"])
+    
+    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)
+    
+    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):
 
     output = {}
     config = loadJson("config.json")
 
-    for kind in ["channel", "category", "prefix"]:
-        if guildConfGet(guild.id, kind) is not None:
+    for kind in ["channel", "category"]:
+        if guildConfGet(guild, kind) is not None:
             try:
-                if kind == "channel":
-                    guild_object = discord.utils.get(guild.channels, id=guildConfGet(guild.id, kind))
-                    output[kind] = getMsg("configured_"+kind, guild).format(guild_object.name)
-                elif kind == "category":
-                    guild_object = discord.utils.get(guild.categories, id=guildConfGet(guild.id, kind))
-                    output[kind] = getMsg("configured_"+kind, guild).format(guild_object.name)
-                elif kind == "prefix":
-                    output[kind] = getMsg("info_prefix", guild).format(guildConfGet(guild.id, kind))
+                guild_object = discord.utils.get(guild.categories, id=guildConfGet(guild, kind))
+                output[kind] = getMsg("configured_"+kind, guild).format(guild_object.name)
             except Exception as exp:
-                if kind == "prefix":
-                    output[kind] = getMsg("info_prefix", guild).format(config["bot_prefix"])
-                else:
-                    output[kind] = getMsg("unconfigured_"+kind, guild)
-        else:
-            if kind == "prefix":
-                output[kind] = getMsg("info_prefix", guild).format(config["bot_prefix"])
-            else:
                 output[kind] = getMsg("unconfigured_"+kind, guild)
+        else:
+            output[kind] = getMsg("unconfigured_"+kind, guild)
 
-    return getMsg("server_config", guild).format(output["prefix"], 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"])

locale/en.json

@@ -1,38 +1,55 @@
 {
     "messages": {
-        "shutdown": "Shutting down...",
+        "shutdown": "**{0}** Shutting down...",
         "locale_name": "English",
-        "locale_set": "Bot's locale has been changed to `English`",
-        "help": "**List of command:**\n{0}• Set parent channel: `{1}channel CHANNEL-ID`\n• Set parent category: `{2}category CATEGORY-ID`\n• Set commands prefix: `{3}prefix SYMBOL`\n• Change bot's locale on server `{4}locale LOCALE`\n\nTo reset channel/category/prefix use `reset` as argument\n\nPlease note that channel/category name ≠ ID of channel/category",
-        "help_owner": "• Turn off the bot: `{0}shutdown`\n",
-        "command_in_dm": "Commands can only be executed on the server",
-        "command_forbidden": "To set up private channels, you need to have **Administrator** permission on the server",
-        "usage_channel": "Correct usage: `{0}channel CHANNEL-ID`\nPlease note that name of channel ≠ ID of channel.\nFind out more about this here: https://support.discord.com/hc/articles/206346498-Where-can-I-find-my-User-Server-Message-ID",
-        "usage_category": "Correct usage: `{0}category CATEGORY-ID`\nPlease note that name of category ≠ ID of category.\nFind out more about it here: https://support.discord.com/hc/articles/206346498-Where-can-I-find-my-User-Server-Message-ID",
-        "usage_prefix": "Correct usage: `{0}prefix SYMBOL`",
-        "usage_locale": "Correct usage: `{0}locale LOCALE`\nAvailable locales: {1}",
-        "result_channel": "Voice channel **{0}** is now set as parent",
-        "result_category": "Category **{0}** is now set as parent",
-        "result_prefix": "Command prefix **{0}** is now set as primary for this server",
-        "warn_channel": "⚠ Parent channel is not set!\nFor the bot to work, you need to set parent channel: `{0}channel CHANNEL-ID`",
-        "warn_category": "⚠ Parent category is not set!\nFor the bot to work, you need to set parent category: `{0}category CATEGORY-ID`",
-        "reset_channel": "Parent voice channel has been reset",
-        "reset_category": "Parent category has been reset",
-        "reset_prefix": "Commands prefix has been reset and now is `{0}`",
-        "reset_locale": "Bot's locale on this server has been reset and now is `{0}`",
-        "none_channel": "Parent voice channel is not set",
-        "none_category": "Parent category is not set",
-        "none_prefix": "Commands prefix is not set, using default prefix `{0}`",
-        "none_locale": "Bot's locale on this server is not set, using default locale: `{0}`",
-        "server_config": "**Server status:**\n{0}\n{1}\n{2}\n{3}\n\n",
-        "info_prefix": "ℹ Commands prefix: `{0}`",
-        "info_locale": "ℹ Bot's server language: `{0}`",
-        "unconfigured_channel": "⚠ Parent channel",
-        "unconfigured_category": "⚠ Parent category",
-        "configured_channel": "☑ Parent channel: `{0}`",
-        "configured_category": "☑ Parent category: `{0}`",
         "name_voice": "{0}'s channel",
         "name_nomic": "no-mic-{0}",
-        "description_nomic": "Text channel for no mic communication\nVoice room ID: {0}"
+        "description_nomic": "Text channel for communication without a microphone\nVoice room ID: {0}",
+        "set_channel_title": "☑ Parent channel set",
+        "set_channel_description": "Voice channel `{0}` has been set as a parent.",
+        "set_category_title": "☑ Parent category set",
+        "set_category_description": "Category `{0}` has been set as the parent category.",
+        "set_locale_title": "☑ Bot language set",
+        "set_locale_description": "This server is now using `{0}`",
+        "reset_channel_title": "☑ Parent channel reset",
+        "reset_channel_description": "Use `/channel set` to select a new channel",
+        "reset_category_title": "☑ Parent category reset",
+        "reset_category_description": "Use `/category set` to select a new category",
+        "reset_locale_title": "☑ Bot language reset",
+        "reset_locale_description": "The default locale `{0}` is now used.\nUse `/locale set` to select a different one",
+        "error_channel_title": "🚫 Error installing channel",
+        "error_channel_description": "Correct Usage: `/channel set`",
+        "error_category_title": "🚫 Error setting category",
+        "error_category_description": "Correct Usage: `/category set`",
+        "error_locale_title": "🚫 Error installing language",
+        "error_locale_description": "Correct Usage: `/locale set`\nAvailable languages: {1}",
+        "hint_none_channel_title": "⚠ No parent channel set",
+        "hint_none_channel_description": "For the bot to work properly, you need to set the parent channel, by entering which the user can create his own private voice channel. Set the parent channel with the command `/channel set`",
+        "hint_none_category_title": "⚠ No parent category set",
+        "hint_none_category_description": "For the bot to work properly, you need to set a parent category, within which a private channel will be created for the user. Set the parent category with the command `/category set`",
+        "hint_none_locale_title": "⚠ Bot language not set",
+        "hint_none_locale_description": "This server uses default `{0}`.\nTo change it use `/locale set`",
+        "error_text_channel_title": "🚫 Error installing channel",
+        "error_text_channel_description": "The selected channel must be a voice channel.",
+        "help_title": "Server Information",
+        "help_title_dm": "Bot Commands",
+        "help_server": "Commands must be run on the server",
+        "help_locale": "ℹ Server bot language: `{0}`",
+        "help_channel_set": "☑ Parent channel: `{0}`",
+        "help_channel_none": "⚠ Parent channel not installed",
+        "help_category_set": "☑ Parent category: `{0}`",
+        "help_category_none": "⚠ No parent category set",
+        "help_cmd_shutdown": "Shut the bot down",
+        "help_cmd_channel": "Set parent channel\nMust be a voice channel",
+        "help_cmd_category": "Set parent category",
+        "help_cmd_locale": "Change bot language on server",
+        "help_notice_id": "Note that channel name ≠ channel ID",
+        "help_notice_id_category": "Note that category name ≠ category ID",
+        "forbidden_title": "🚫 Access Denied",
+        "forbidden_description": "You must have **Administrator** right to set up private channels",
+        "dm_title": "🚫 Execution error",
+        "dm_description": "Commands can only be executed while on the server",
+        "admin_title": "🚫 Permission denied",
+        "admin_description": "You must be bot owner to perform this"
     }
 }

locale/ru.json

@@ -1,38 +0,0 @@
-{
-    "messages": {
-        "shutdown": "Выключаюсь...",
-        "locale_name": "Русский",
-        "locale_set": "Язык бота на сервере был изменён на `Русский`",
-        "help": "**Список команд:**\n{0}• Установить родительский канал: `{1}channel ID-КАНАЛА`\n• Установить родительскую категорию: `{2}category ID-КАТЕГОРИИ`\n• Установить префикс команд: `{3}prefix СИМВОЛ`\n• Сменить язык бота на сервере: `{4}locale ЯЗЫК`\n\nДля сброса канала/категории/префикса используйте `reset` как аргумент\n\nОбратите внимание, что имя канала/категории ≠ ID канала/категории",
-        "help_owner": "• Выключиться: `{0}shutdown`\n",
-        "command_in_dm": "Команды можно исполнять только находясь на сервере",
-        "command_forbidden": "Для настройки приватных каналов нужно иметь право **Администратор** на сервере",
-        "usage_channel": "Правильное использование: `{0}channel ID-КАНАЛА`\nОбратите внимание, что имя канала ≠ ID канала.\nУзнайте больше об этом тут: https://support.discord.com/hc/articles/206346498-Where-can-I-find-my-User-Server-Message-ID",
-        "usage_category": "Правильное использование: `{0}category ID-КАТЕГОРИИ`\nОбратите внимание, что имя категории ≠ ID категории.\nУзнайте больше об этом тут: https://support.discord.com/hc/articles/206346498-Where-can-I-find-my-User-Server-Message-ID",
-        "usage_prefix": "Правильное использование: `{0}prefix СИМВОЛ`",
-        "usage_locale": "Правильное использование: `{0}locale ЯЗЫК`\nДоступные языки: {1}",
-        "result_channel": "Голосовой канал `{0}` был установлен как родительский",
-        "result_category": "Категория `{0}` была установлена как родительская",
-        "result_prefix": "Префикс `{0}` был установлен как основной для этого сервера",
-        "warn_channel": "⚠ Родительский канал не установлен!\nДля работы бота нужно установить канал: `{0}channel ID-КАНАЛА`",
-        "warn_category": "⚠ Родительская категория не установлена!\nДля работы бота нужно установить категорию: `{0}category ID-КАТЕГОРИИ`",
-        "reset_channel": "Родительский голосовой канал был сброшен",
-        "reset_category": "Родительская категория была сброшена",
-        "reset_prefix": "Прификс команд был сброшен, теперь это `{0}`",
-        "reset_locale": "Язык бота на этом сервере был сброшен, теперь это `{0}`",
-        "none_channel": "Родительский голосовой канал не был задан",
-        "none_category": "Родительская категория не была задана",
-        "none_prefix": "Префикс команд не был задан, используется стандартный `{0}`",
-        "none_locale": "Язык бота на сервере не был задан, используется стандартный: `{0}`",
-        "server_config": "**Статус сервера:**\n{0}\n{1}\n{2}\n{3}\n\n",
-        "info_prefix": "ℹ Префикс команд: `{0}`",
-        "info_locale": "ℹ Язык бота на сервере: `{0}`",
-        "unconfigured_channel": "⚠ Родительский канал",
-        "unconfigured_category": "⚠ Родительская категория",
-        "configured_channel": "☑ Родительский канал: `{0}`",
-        "configured_category": "☑ Родительская категория: `{0}`",
-        "name_voice": "Канал {0}",
-        "name_nomic": "без-микро-{0}",
-        "description_nomic": "Текстовый канал для коммуникации без микрофона\nID голосовой комнаты: {0}"
-    }
-}

locale/uk.json

@@ -1,38 +1,55 @@
 {
     "messages": {
-        "shutdown": "Вимикаюсь...",
+        "shutdown": "**{0}** Вимикаюсь...",
         "locale_name": "Українська",
-        "locale_set": "Мова бота на сервері була змінена на `Українську`",
-        "help": "**Перелік команд:**\n{0}• Встановити твірний канал: `{1}channel ID-КАНАЛА`\n• Встановити твірну категорію: `{2}category ID-КАТЕГОРІЇ`\n• Встановити префікс команд: `{3}prefix СИМВОЛ`\n• Змінити мову бота на сервері: `{4}locale МОВА`\n\nДля скидання каналу/категорії/префіксу використовуйте `reset` як аргумент\n\nЗверніть увагу, що назва каналу/категорії ≠ ID каналу/категорії",
-        "help_owner": "• Вимкнутись: `{0}shutdown`\n",
-        "command_in_dm": "Команди можна виконувати тільки знаходячись на сервері",
-        "command_forbidden": "Для налаштування приватних каналів потрібно мати право **Адміністратор** на сервері",
-        "usage_channel": "Правильне використання: `{0}channel ID-КАНАЛА`\nЗверніть увагу, що назва канала ≠ ID канала.\nДізнайтеся більше про це тут: https://support.discord.com/hc/articles/206346498-Where-can-I-find-my-User-Server-Message-ID",
-        "usage_category": "Правильне використання: `{0}category ID-КАТЕГОРІЇ`\nЗверніть увагу, що назва категорії ≠ ID категорії.\nДізнайтеся більше про це тут: https://support.discord.com/hc/articles/206346498-Where-can-I-find-my-User-Server-Message-ID",
-        "usage_prefix": "Правильне використання: `{0}prefix СИМВОЛ`",
-        "usage_locale": "Правильне використання: `{0}locale МОВА`\nДоступні мови: {1}",
-        "result_channel": "Голосовий канал **{0}** було встановлено як твірний",
-        "result_category": "Категорія **{0}** була встановлена як твірна",
-        "result_prefix": "Префікс **{0}** було встановлено як основний для цього сервера",
-        "warn_channel": "⚠ Твірний канал не встановлено!\nДля роботи робота потрібно встановити канал: `{0}channel ID-КАНАЛА`",
-        "warn_category": "⚠ Твірна категорія не встановлена!\nДля роботи робота потрібно встановити категорію: `{0}category ID-КАТЕГОРІЇ`",
-        "reset_channel": "Твірний голосовий канал було скинуто",
-        "reset_category": "Твірну категорію було скинуто",
-        "reset_prefix": "Префікс команд було скинуто, тепер це `{0}`",
-        "reset_locale": "Мову бота на цьому сервері було скинуто, тепер це `{0}`",
-        "none_channel": "Твірний голосовий канал не було задано",
-        "none_category": "Твірну категорію не було задано",
-        "none_prefix": "Префікс команд не було задано, використовується стандартний `{0}`",
-        "none_locale": "Мова бота на сервері не була задана, використовується стандартна: `{0}`",
-        "server_config": "**Статус сервера:**\n{0}\n{1}\n{2}\n{3}\n\n",
-        "info_prefix": "ℹ Префікс команд: `{0}`",
-        "info_locale": "ℹ Мова бота на сервері: `{0}`",
-        "unconfigured_channel": "⚠ Твірний канал",
-        "unconfigured_category": "⚠ Твірна категорія",
-        "configured_channel": "☑ Твірний канал: `{0}`",
-        "configured_category": "☑ Твірна категорія: `{0}`",
         "name_voice": "Канал {0}",
         "name_nomic": "без-мікро-{0}",
-        "description_nomic": "Текстовий канал для комунікації без мікрофона\nID голосової кімнати: {0}"
+        "description_nomic": "Текстовий канал для комунікації без мікрофона\nID голосової кімнати: {0}",
+        "set_channel_title": "☑ Твірний канал встановлено",
+        "set_channel_description": "Голосовий канал `{0}` був встановлений як твірний.",
+        "set_category_title": "☑ Твірну категорію встановлено",
+        "set_category_description": "Категорія `{0}` була встановлена ​​як твірна.",
+        "set_locale_title": "☑ Мова бота встановлена",
+        "set_locale_description": "На цьому сервері тепер використовується `{0}`",
+        "reset_channel_title": "☑ Твірний канал скинутий",
+        "reset_channel_description": "Для вибору нового каналу використовуйте `/channel set`",
+        "reset_category_title": "☑ Твірна категорія скинута",
+        "reset_category_description": "Для вибору нової категорії використовуйте `/category set`",
+        "reset_locale_title": "☑ Мова бота скинута",
+        "reset_locale_description": "Тепер використовується стандартна мова `{0}`.\nДля вибору іншого використовуйте `/locale set`",
+        "error_channel_title": "🚫 Помилка установки каналу",
+        "error_channel_description": "Правильне використання: `/channel set`",
+        "error_category_title": "🚫 Помилка установки категорії",
+        "error_category_description": "Правильне використання: `/category set`",
+        "error_locale_title": "🚫 Помилка встановлення мови",
+        "error_locale_description": "Правильне використання: `/locale set`\nДоступні мови: {1}",
+        "hint_none_channel_title": "⚠ Твірний канал не заданий",
+        "hint_none_channel_description": "Для правильної роботи робота необхідно задати твірний канал, входячи в який користувач зможе створити свій приватний голосовий канал. Встановіть твірний канал командою `/channel set`",
+        "hint_none_category_title": "⚠ Твірна категорія не задана",
+        "hint_none_category_description": "Для правильної роботи робота необхідно задати твірну категорію, всередині якої для користувача буде створено його приватний канал. Встановіть твірну категорію командою `/category set`",
+        "hint_none_locale_title": "⚠ Мова бота не задана",
+        "hint_none_locale_description": "На цьому сервері використовується стандартний `{0}`.\nЩоб змінити його використовуйте `/locale set`",
+        "error_text_channel_title": "🚫 Помилка установки каналу",
+        "error_text_channel_description": "Вибраний канал повинен бути голосовим.",
+        "help_title": "Інформація про сервер",
+        "help_title_dm": "Команда бота",
+        "help_server": "Команди повинні виконуватись на сервері",
+        "help_locale": "ℹ Мова бота на сервері: `{0}`",
+        "help_channel_set": "☑ Твірний канал: `{0}`",
+        "help_channel_none": "⚠ Твірний канал не встановлено",
+        "help_category_set": "☑ Твірна категорія: `{0}`",
+        "help_category_none": "⚠ Твірна категорія не встановлена",
+        "help_cmd_shutdown": "Вимкнути бота",
+        "help_cmd_channel": "Встановити твірний канал\nКанал повинен бути голосовим",
+        "help_cmd_category": "Встановити твірну категорію",
+        "help_cmd_locale": "Змінити мову бота на сервері",
+        "help_notice_id": "Зверніть увагу, що ім'я каналу ≠ ID каналу",
+        "help_notice_id_category": "Зверніть увагу, що ім'я категорії ≠ ID категорії",
+        "forbidden_title": "🚫 Відмовлено у доступі",
+        "forbidden_description": "Для налаштування приватних каналів потрібно мати право **Адміністратор**",
+        "dm_title": "🚫 Помилка виконання",
+        "dm_description": "Команди можна виконувати лише перебуваючи на сервері",
+        "admin_title": "🚫 Відмовлено в доступі",
+        "admin_description": "Треба бути адміністратором бота щоб зробити це"
     }
 }

requirements.txt

@@ -1 +1 @@
-discord.py
+py-cord>=2.0.0b7

start.bat

@@ -0,0 +1,3 @@
+title YusarinBot
+cls
+python3 yusarin.py

start.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+python3 yusarin.py

yusarin.py

@@ -1,30 +1,36 @@
 import os
 import sys
 import json
+import shutil
 import requests
 import threading
 
 try:
-    import discord
+    import discord # type: ignore
+    from discord import ApplicationContext, Option, Intents  # type: ignore
 except Exception as exp:
-    print(f"Module discord.py is not installed. Make sure to run 'pip install -r requirements.txt' before first start")
+    print(f"Module py-cord is not installed. Make sure to run 'pip install -r requirements.txt' before first start")
     sys.exit()
 
 from functions import *
 pid = os.getpid()
-version = 1.1
+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()
 
 if loadJson("config.json")["check_for_updates"]:
     try:
-        serv_ver = requests.get("https://www.end-play.xyz/yusarin/version.txt").text.replace('\n', '')
+        serv_ver = json.loads(requests.get("https://api.end-play.xyz/version&apikey=publickey&app=yusarinbot").text)["version"]
         if float(serv_ver) > version:
-            appendLog(f"YusarinBot version {serv_ver} is available. Download new version here: https://github.com/profitrollgame/YusarinBot/releases/latest")
+            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)}")
     except Exception as exp:
         appendLog(f"Could not get YusarinBot cloud version due to {exp}. Currently using {str(version)}")
 
-intents = discord.Intents().all()
-client = discord.Client(intents=intents)
+intents = Intents().all()
+client = discord.Bot(intents=intents)
 
 @client.event
 async def on_ready():
@@ -37,10 +43,34 @@ async def on_ready():
     
     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
@@ -64,249 +94,128 @@ async def on_voice_state_update(member, before, after):
                 await changeNomicPerms("deny", vc_from, member)
         if isUserVoice(vc_to):
             await changeNomicPerms("allow", vc_to, member)
-        if vc_to.id == guildConfGet(vc_to.guild.id, "channel"):
-            if guildConfGet(vc_to.guild.id, "category") is not None:
-                voice_chan = await createUserVoice(vc_to, discord.utils.get(vc_to.guild.categories, id=guildConfGet(vc_to.guild.id, "category")), 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:
-                appendLog(f"Category for guild {str(vc_to.guild.id)} is not set", guild=vc_to.guild.id)
-
-# ==========================================================================================
-
-@client.event
-async def on_message(message):
+                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 message.guild is not None:
-        try:
-            prefix = guildConfGet(message.guild.id, "prefix")
-            if prefix is None:
-                prefix = config["bot_prefix"]
-        except Exception as exp:
-            print(exp)
-            prefix = config["bot_prefix"]
+    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:
-        prefix = config["bot_prefix"]
+        await ctx.respond(embed=makeEmbed(title=getMsg("admin_title", ctx.guild), description=getMsg("admin_description", ctx.guild), color=strToColor(config["color_error"])))
+#=========================================================================================================================
 
-    if message.author == client.user:
-        
-        return
+#=========================================================================================================================
+@client.slash_command(name="help", description="Get information about this server")
+async def help(ctx: ApplicationContext):
+    await ctx.respond(embed=getHelpMessage(ctx, version))
+#=========================================================================================================================
 
-    if message.content in [f"{prefix}reboot", f"{prefix}restart", f"{prefix}shutdown", f"{prefix}die"]:
-        
-        if message.author.id == config["owner"]:
-            
-            await message.channel.send(getMsg("shutdown", message.guild))
-            os.system(f"kill -9 {str(pid)}")
-            
+#=========================================================================================================================
+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]))
+
+@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:
-            
-            return
-        
-    elif message.content.startswith(f"{prefix}channel"):
-        
-        fullcmd = message.content.split()
-        
-        if message.guild is not None:
-        
-            if message.author.guild_permissions.administrator:
-                
-                try:
-                    
-                    if fullcmd[1] == "reset":
-                        
-                        if guildConfGet(message.guild.id, "channel") is not None:
-                            
-                            guildConfReset(message.guild.id, "channel")
-                            
-                            await message.channel.send(getMsg("reset_channel", message.guild))
-                            
-                        else:
-                            
-                            await message.channel.send(getMsg("none_channel", message.guild))
-                        
-                    else:
-                    
-                        selected_channel = discord.utils.get(message.guild.channels, id=int(fullcmd[1]))
-                        
-                        guildConfSet(message.guild.id, "channel", int(fullcmd[1]))
-                        
-                        await message.channel.send(getMsg("result_channel", message.guild).format(selected_channel.name))
-                        
-                        if guildConfGet(message.guild.id, "category") is None:
-                            
-                            await message.channel.send(getMsg("warn_category", message.guild).format(prefix))
-                    
-                except Exception as exp:
-                    
-                    #print(exp)
-                    
-                    await message.channel.send(getMsg("usage_channel", message.guild).format(prefix))
-                
-            else:
-                
-                await message.channel.send(getMsg("command_forbidden", message.guild))
+            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 message.channel.send(getMsg("command_in_dm", message.guild))
-        
-    elif message.content.startswith(f"{prefix}category"):
-        
-        fullcmd = message.content.split()
-        
-        if message.guild is not None:
-        
-            if message.author.guild_permissions.administrator:
-            
-                try:
-                
-                    if fullcmd[1] == "reset":
-                        
-                        if guildConfGet(message.guild.id, "category") is not None:
-                        
-                            guildConfReset(message.guild.id, "category")
-                            
-                            await message.channel.send(getMsg("reset_category", message.guild))
-                            
-                        else:
-                            
-                            await message.channel.send(getMsg("none_category", message.guild))
-                        
-                    else:
-                    
-                        selected_category = discord.utils.get(message.guild.channels, id=int(fullcmd[1]))
-                        
-                        guildConfSet(message.guild.id, "category", int(fullcmd[1]))
-                        
-                        await message.channel.send(getMsg("result_category", message.guild).format(selected_category.name))
-                        
-                        if guildConfGet(message.guild.id, "channel") is None:
-                            
-                            await message.channel.send(getMsg("warn_channel", message.guild).format(prefix))
-                    
-                except Exception as exp:
-                
-                    #print(exp)
-                    
-                    await message.channel.send(getMsg("usage_category", message.guild).format(prefix))
-                
-            else:
-                
-                await message.channel.send(getMsg("command_forbidden", message.guild))
-            
-        else:
-            await message.channel.send(getMsg("command_in_dm", message.guild))
+            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"])))
+#=========================================================================================================================
 
-    elif message.content.startswith(f"{prefix}prefix"):
-        
-        fullcmd = message.content.split()
-        
-        if message.guild is not None:
-        
-            if message.author.guild_permissions.administrator:
-            
-                try:
-                
-                    if fullcmd[1] == "reset":
-                    
-                        if guildConfGet(message.guild.id, "prefix") is not None:
-                        
-                            guildConfReset(message.guild.id, "prefix")
-                            
-                            await message.channel.send(getMsg("reset_prefix", message.guild).format(config["bot_prefix"]))
-                            
-                        else:
-                            
-                            await message.channel.send(getMsg("none_prefix", message.guild).format(prefix))
-                        
-                    else:
-                        
-                        guildConfSet(message.guild.id, "prefix", fullcmd[1])
-                        
-                        await message.channel.send(getMsg("result_prefix", message.guild).format(fullcmd[1]))
-                    
-                except:
-                    
-                    await message.channel.send(getMsg("usage_prefix", message.guild).format(prefix))
-                
-            else:
-                await message.channel.send(getMsg("command_forbidden", message.guild))
-            
-        else:
-            await message.channel.send(getMsg("command_in_dm", message.guild))
+#=========================================================================================================================
+channel = client.create_group("channel", "Commands related to parent voice channel")
 
-    elif message.content.startswith(f"{prefix}locale"):
-        
-        fullcmd = message.content.split()
-        
-        if message.guild is not None:
-        
-            if message.author.guild_permissions.administrator:
-            
-                try:
-                
-                    if fullcmd[1] == "reset":
-                    
-                        if guildConfGet(message.guild.id, "locale") is not None:
-                        
-                            guildConfReset(message.guild.id, "locale")
-                            appendLog(f"Server's locale has been reset", message.guild.id)
-                            await message.channel.send(getMsg("reset_locale", message.guild).format(getMsg("locale_name", message.guild)))
-                            
-                        else:
-                            
-                            await message.channel.send(getMsg("none_locale", message.guild).format(getMsg("locale_name", message.guild)))
-                        
-                    else:
-                        
-                        for locale_file in os.listdir(f"{path}/locale/"):
-                            if locale_file[:-5] == fullcmd[1]:
-                                guildConfSet(message.guild.id, "locale", fullcmd[1])
-                                appendLog(f"Server's locale is now set to {fullcmd[1]}", message.guild.id)
-                                await message.channel.send(getMsg("locale_set", message.guild))
-                                return
-                         
-                        locales = []
-                    
-                        for locale_file in os.listdir(f"{path}/locale/"):
-                            locales.append(f"`{locale_file[:-5]}`")
-                    
-                        await message.channel.send(getMsg("usage_locale", message.guild).format(prefix, ", ".join(locales)))
-                    
-                except:
-                    
-                    locales = []
-                    
-                    for locale_file in os.listdir(f"{path}/locale/"):
-                        locales.append(f"`{locale_file[:-5]}`")
-                    
-                    await message.channel.send(getMsg("usage_locale", message.guild).format(prefix, ", ".join(locales)))
-                
-            else:
-                await message.channel.send(getMsg("command_forbidden", message.guild))
-            
-        else:
-            await message.channel.send(getMsg("command_in_dm", message.guild))
+@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"])))
 
-    elif message.content.startswith(f"{prefix}help"):
-        if message.author.id == config["owner"]:
-            if message.guild is not None:
-                await message.channel.send(await guildConfigured(message.guild) + getMsg("help", message.guild).format(getMsg("help_owner", message.guild).format(prefix), prefix, prefix, prefix, prefix, prefix))
-            else:
-                await message.channel.send(getMsg("help", message.guild).format(getMsg("help_owner", message.guild).format(prefix), prefix, prefix, prefix, prefix, prefix))
+@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:
-            if message.guild is not None:
-                await message.channel.send(await guildConfigured(message.guild) + getMsg("help").format("", prefix, prefix, prefix, prefix))
-            else:
-                await message.channel.send(getMsg("help", message.guild).format("", prefix, prefix, prefix, prefix))
+            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"])))
+#=========================================================================================================================
 
-#if loadJson("config.json")["auto_clear_trash"]:
-    # run func
+#=========================================================================================================================
+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"])))
+#=========================================================================================================================
 
 appendLog(f"Trying to log in...")
-
 client.run(loadJson("config.json")["bot_token"])