Merge branch 'main' into refactor/modularize_apiServer

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+  // 使用 IntelliSense 以得知可用的屬性。
+  // 暫留以檢視現有屬性的描述。
+  // 如需詳細資訊，請瀏覽: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Attach to pm2",
+      "type": "node",
+      "request": "attach",
+      "restart": true,
+      "port": 9229
+    }
+  ]
+}

src/apiServer/routes/leaderboard.js

@@ -54,11 +54,13 @@ router.get('/', validate, async function (req, res) {
 
   const fetchUserDetails = async (doc) => {
     const data = doc.data();
-    const discordUser = await client.users.fetch(data.discordId);
+    const guild = await client.guilds.fetch(process.env.DISCORD_GUILDID);
+    const member = await guild.members.fetch(data.discordId);
+
     return {
       id: doc.id,
-      name: discordUser.username,
-      avatarURL: discordUser.displayAvatarURL(),
+      name: member.nickname || member.user.username,
+      avatarURL: member.user.displayAvatarURL(),
       ...data
     };
   };