From b26d7af14bef0857b152f4761c95599a2c229595 Mon Sep 17 00:00:00 2001
From: Choco <94597336+ChocoMeow@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:16:39 +0800
Subject: [PATCH] Improved codes

---
 cogs/basic.py  |  1 -
 ipc/methods.py | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cogs/basic.py b/cogs/basic.py
index 838a7a3..06baea6 100644
--- a/cogs/basic.py
+++ b/cogs/basic.py
@@ -103,7 +103,6 @@ class Basic(commands.Cog):
         if not current:
             return history_tracks
 
-        await interaction.response.defer()
         node = voicelink.NodePool.get_node()
         if node and node.spotify_client:
             try:
diff --git a/ipc/methods.py b/ipc/methods.py
index e153e0f..67bc17f 100644
--- a/ipc/methods.py
+++ b/ipc/methods.py
@@ -597,19 +597,16 @@ async def updatePlaylist(bot: commands.Bot, data: Dict) -> Dict:
 
 async def getMutualGuilds(bot: commands.Bot, data: Dict) -> Dict:
     user_id = int(data.get("user_id"))
-    user = bot.get_user(user_id)
-    if not user:
-        user = await bot.fetch_user(user_id)
 
-    payload = {"op": "getMutualGuilds", "servers": {}, "user_id": str(user_id)}
-    for guild in user.mutual_guilds:
-        member = guild.get_member(user_id)
-        if member.guild_permissions.manage_guild:
-            payload["servers"][str(guild.id)] = {
-                "avatar": guild.icon.url if guild.icon else None,
-                "name": guild.name,
+    payload = {"op": "getMutualGuilds", "mutualGuilds": {}, "inviteGuilds": {}, "user_id": str(user_id)}
+    for guild_id, guild_info in data.get("guilds", {}).items():
+        if guild := bot.get_guild(int(guild_id)):
+            payload["mutualGuilds"][guild_id] = {
+                **guild_info,
                 "member_count": guild.member_count
             }
+        else:
+            payload["inviteGuilds"][guild_id] = {**guild_info}
 
     return payload