From 148f19e5fe9c73bbdf449a13f8cc1f622d492df6 Mon Sep 17 00:00:00 2001
From: Choco <cindymeow905@gmail.com>
Date: Wed, 9 Aug 2023 12:05:05 +0800
Subject: [PATCH] General clean code

---
 cogs/admin.py       |  4 ----
 cogs/basic.py       |  2 +-
 views/search.py     | 15 ++++++++-------
 voicelink/player.py |  1 -
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/cogs/admin.py b/cogs/admin.py
index 6b8017d..fd289f7 100644
--- a/cogs/admin.py
+++ b/cogs/admin.py
@@ -63,10 +63,6 @@ class Admin(commands.Cog, name="settings"):
         if language not in langs:
             return await ctx.send(get_lang(ctx.guild.id, "languageNotFound"))
 
-        player, settings = self.get_settings(ctx)
-        if player:
-            player.lang = language
-
         update_settings(ctx.guild.id, {'lang': language})
         await ctx.send(get_lang(ctx.guild.id, 'changedLanguage').format(language))
 
diff --git a/cogs/basic.py b/cogs/basic.py
index d013a37..c655619 100644
--- a/cogs/basic.py
+++ b/cogs/basic.py
@@ -190,7 +190,7 @@ class Basic(commands.Cog):
             f"`{index}.` `[{track.formatted_length}]` **{track.title[:35]}**" for index, track in enumerate(tracks[0:10], start=1))
         embed = discord.Embed(title=player.get_msg('searchTitle').format(query), description=player.get_msg(
             'searchDesc').format(emoji_source(platform), platform, len(tracks[0:10]), query_track), color=settings.embed_color)
-        view = SearchView(tracks=tracks[0:10], lang=player.lang)
+        view = SearchView(tracks=tracks[0:10], lang=player.get_msg)
         message = await ctx.send(embed=embed, view=view, ephemeral=True)
         view.response = message
         await view.wait()
diff --git a/views/search.py b/views/search.py
index 84cee9d..a496147 100644
--- a/views/search.py
+++ b/views/search.py
@@ -26,21 +26,22 @@ import discord
 from function import langs
 
 class SearchDropdown(discord.ui.Select):
-    def __init__(self, tracks, lang):
+    def __init__(self, tracks, get_msg):
         self.tracks = tracks
-        self.lang = lang
+        self.get_msg = get_msg
         options = []
         for index, track in enumerate(self.tracks, start=1):
             options.append(discord.SelectOption(label=f"{index}. {track.title[:50]}", description=f"{track.author[:50]} · {track.formatted_length}"))
 
-        super().__init__(placeholder=langs[lang]['searchWait'],
-                            min_values=1, max_values=len(tracks),
-                            options=options
-                        )
+        super().__init__(
+            placeholder=get_msg('searchWait'),
+            min_values=1, max_values=len(tracks),
+            options=options
+        )
         
     async def callback(self, interaction: discord.Interaction):
         self.disabled = True
-        self.placeholder = langs[self.lang]['searchSuccess']
+        self.placeholder = self.get_msg('searchSuccess')
         await interaction.response.edit_message(view=self.view)
         self.view.values = self.values          
         self.view.stop()
diff --git a/voicelink/player.py b/voicelink/player.py
index e093380..38875ca 100644
--- a/voicelink/player.py
+++ b/voicelink/player.py
@@ -107,7 +107,6 @@ class Player(VoiceProtocol):
         self.settings: dict = func.get_settings(ctx.guild.id)
         self.joinTime: float = round(time.time())
         self._volume: int = self.settings.get('volume', 100)
-        self.lang: dict = self.settings.get('lang', 'EN') if self.settings.get('lang', 'EN') in func.langs else "EN"
         self.queue: Queue = eval(self.settings.get("queueType", "Queue"))(self.settings.get("maxQueue", func.settings.max_queue), self.settings.get("duplicateTrack", True), self.get_msg)
 
         self._node = NodePool.get_node()