Merge branch 'main' into main

hwangsihu · Jul 12, 2024 · bede7e2 · bede7e2
2 parents 649153a + 4798986
commit bede7e2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/commands/playlist/Steal.ts b/src/commands/playlist/Steal.ts
@@ -47,7 +47,7 @@ export default class StealPlaylist extends Command {
         let userId;
         let targetUser = ctx.args[0];
 
-        if (targetUser && targetUser.startsWith("<@") && targetUser.endsWith(">")) {
+        if (targetUser?.targetUser.startsWith("<@") && targetUser.endsWith(">")) {
             targetUser = targetUser.slice(2, -1);
 
             if (targetUser.startsWith("!")) {

diff --git a/src/commands/playlist/list.ts b/src/commands/playlist/list.ts
@@ -41,7 +41,7 @@ export default class GetPlaylists extends Command {
             let userId;
             let targetUser = ctx.args[0];
 
-            if (targetUser && targetUser.startsWith("<@") && targetUser.endsWith(">")) {
+            if (targetUser?.targetUser.startsWith("<@") && targetUser.endsWith(">")) {
                 targetUser = targetUser.slice(2, -1);
 
                 if (targetUser.startsWith("!")) {

diff --git a/src/database/server.ts b/src/database/server.ts
@@ -122,7 +122,7 @@ export default class ServerData {
     }
 
     public async getUserPlaylists(userId: string) {
-        return this.prisma.playlist.findMany({
+        return await this.prisma.playlist.findMany({
             where: {
                 userId: userId,
             },

diff --git a/src/events/client/MessageCreate.ts b/src/events/client/MessageCreate.ts
@@ -153,7 +153,7 @@ export default class MessageCreate extends Event {
                     }
                 }
             }
-       }
+        }
 
         if (command.args && !args.length) {
             const embed = this.client
-Original file line number
+Diff line change
@@ Expand Up / @@ -153,7 +153,7 @@ export default class MessageCreate extends Event { @@
                         }
                     }
                 }
-           }
+            }
             if (command.args && !args.length) {
                 const embed = this.client
@@ Expand Down @@