From 9dc6b993381cf9399e01487db4aa33e315004495 Mon Sep 17 00:00:00 2001
From: Choco <94597336+ChocoMeow@users.noreply.github.com>
Date: Sun, 11 Feb 2024 19:47:29 +0800
Subject: [PATCH] Optimized code

---
 addons/settings.py        | 28 ++++++++++++++--------------
 cogs/basic.py             |  2 +-
 main.py                   |  3 +++
 views/inbox.py            |  2 +-
 voicelink/placeholders.py |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addons/settings.py b/addons/settings.py
index bd18fec..28660e4 100644
--- a/addons/settings.py
+++ b/addons/settings.py
@@ -3,20 +3,20 @@ from dotenv import load_dotenv
 
 class Settings:
     def __init__(self, settings: dict) -> None:
-        self.invite_link = "https://discord.gg/wRCgB7vBQv"
-        self.nodes = settings.get("nodes", {})
-        self.max_queue = settings.get("default_max_queue", 1000)
-        self.bot_prefix = settings.get("prefix", "")
-        self.activity = settings.get("activity", [{"listen": "/help"}])
-        self.embed_color = int(settings.get("embed_color", "0xb3b3b3"), 16)
-        self.bot_access_user = settings.get("bot_access_user", [])
-        self.emoji_source_raw = settings.get("emoji_source_raw", {})
-        self.cooldowns_settings = settings.get("cooldowns", {})
-        self.aliases_settings = settings.get("aliases", {})
-        self.controller = settings.get("default_controller", {})
-        self.lyrics_platform = settings.get("lyrics_platform", "A_ZLyrics").lower()
-        self.ipc_server = settings.get("ipc_server", {})
-        self.version = settings.get("version", "")
+        self.invite_link: str = "https://discord.gg/wRCgB7vBQv"
+        self.nodes: dict = settings.get("nodes", {})
+        self.max_queue: int = settings.get("default_max_queue", 1000)
+        self.bot_prefix: str = settings.get("prefix", "")
+        self.activity: dict = settings.get("activity", [{"listen": "/help"}])
+        self.embed_color: str = int(settings.get("embed_color", "0xb3b3b3"), 16)
+        self.bot_access_user: list = settings.get("bot_access_user", [])
+        self.emoji_source_raw: dict = settings.get("emoji_source_raw", {})
+        self.cooldowns_settings: dict = settings.get("cooldowns", {})
+        self.aliases_settings: dict = settings.get("aliases", {})
+        self.controller: dict = settings.get("default_controller", {})
+        self.lyrics_platform: str = settings.get("lyrics_platform", "A_ZLyrics").lower()
+        self.ipc_server: dict = settings.get("ipc_server", {})
+        self.version: str = settings.get("version", "")
 
 class TOKENS:
     def __init__(self) -> None:
diff --git a/cogs/basic.py b/cogs/basic.py
index e9bcdba..1950950 100644
--- a/cogs/basic.py
+++ b/cogs/basic.py
@@ -499,7 +499,7 @@ class Basic(commands.Cog):
 
         temp = "!Remember do not change this file!\n------------->Info<-------------\nGuild: {} ({})\nRequester: {} ({})\nTracks: {} - {}\n------------>Tracks<------------\n".format(
             ctx.guild.name, ctx.guild.id,
-            ctx.author.name, ctx.author.id,
+            ctx.author.display_name, ctx.author.id,
             len(tracks), ctime(total_length)
         ) + temp
         temp += raw
diff --git a/main.py b/main.py
index ad7bbac..5e508d3 100644
--- a/main.py
+++ b/main.py
@@ -68,6 +68,7 @@ class Vocard(commands.Bot):
     async def setup_hook(self) -> None:
         func.langs_setup()
         
+        # Connecting to MongoDB
         await self.connect_db()
 
         # Loading all the module in `cogs` folder
@@ -145,6 +146,8 @@ async def get_prefix(bot, message: discord.Message):
     settings = await func.get_settings(message.guild.id)
     return settings.get("prefix", func.settings.bot_prefix)
 
+# Loading settings
+func.settings = Settings(func.open_json("settings.json"))
 
 # Setup the bot object
 intents = discord.Intents.default()
diff --git a/views/inbox.py b/views/inbox.py
index d9c8fd9..6ef5fa9 100644
--- a/views/inbox.py
+++ b/views/inbox.py
@@ -57,7 +57,7 @@ class InboxView(discord.ui.View):
 
     def build_embed(self) -> discord.Embed:
         embed=discord.Embed(
-            title=f"📭 All {self.author.name}'s Inbox",
+            title=f"📭 All {self.author.display_name}'s Inbox",
             description=f'Max Messages: {len(self.inbox)}/10' + '```%0s %2s %20s\n' % ("   ", "ID:", "Title:") + '\n'.join('%0s %2s. %35s'% ('✉️' if mail['type'] == 'invite' else '📢', index, mail['title'][:35] + "...") for index, mail in enumerate(self.inbox, start=1)) + '```',
             color=func.settings.embed_color
         )
diff --git a/voicelink/placeholders.py b/voicelink/placeholders.py
index 11fed34..585d130 100644
--- a/voicelink/placeholders.py
+++ b/voicelink/placeholders.py
@@ -72,7 +72,7 @@ class Placeholders:
     
     @ensure_track
     def requester_name(self, track: Track) -> str:
-        return track.requester.name if track.requester else self.bot.user.name
+        return track.requester.name if track.requester else self.bot.user.display_name
     
     @ensure_track
     def requester_avatar(self, track: Track) -> str: