Merge pull request #736 from hwangsihu/main

Update

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -32,7 +32,7 @@ body:
     attributes:
       label: "Operating System"
       description: "Which operating system and version are you using?"
-      placeholder: "e.g., Windows 10, macOS 13, Ubuntu 20.04"
+      placeholder: "e.g., Windows 11 24H2, macOS 15.1, Ubuntu 20.04"
     validations:
       required: true
 
@@ -48,10 +48,10 @@ body:
     id: java-version
     attributes:
       label: "java version"
-      description: "Specify the version of Java that you are using."
+      description: "Specify the version of Java that you are using. If you are not self-hosting a Lavalink server, you can leave this blank."
       placeholder: "e.g., 17"
     validations:
-      required: true
+      required: false
 
   - type: input
     id: app-version

.github/dependabot.yml

@@ -1,19 +1,19 @@
 version: 2
 updates:
 - package-ecosystem: npm
-  directory: "/"
+  directory: /
   schedule:
     interval: daily
-    time: "00:00"
+    time: 00:00
   allow:
     - dependency-type: all
   open-pull-requests-limit: 10
   rebase-strategy: auto
 - package-ecosystem: github-actions
-  directory: "/"
+  directory: /
   schedule:
-    interval: "daily"
-    time: "00:00"
+    interval: daily
+    time: 00:00
   allow:
     - dependency-type: all
   open-pull-requests-limit: 10

Lavalink/example.application.yml

@@ -34,18 +34,21 @@ plugins:
       yandexmusic: false # Enable Yandex Music source
       flowerytts: false # Enable Flowery TTS source
       youtube: true # Enable YouTube search source (https://github.com/topi314/LavaSearch)
+      vkmusic: false # Enable Vk Music source
     lyrics-sources:
       spotify: false # Enable Spotify lyrics source
       deezer: false # Enable Deezer lyrics source
       youtube: false # Enable YouTube lyrics source
       yandexmusic: false # Enable Yandex Music lyrics source
+      vkmusic: false # Enable Vk Music lyrics source
     spotify:
       clientId: "your client id"
       clientSecret: "your client secret"
       # spDc: "your sp dc cookie" # the sp dc cookie used for accessing the spotify lyrics api
       countryCode: "US" # the country code you want to use for filtering the artists top tracks. See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
       playlistLoadLimit: 6 # The number of pages at 100 tracks each
       albumLoadLimit: 6 # The number of pages at 50 tracks each
+      resolveArtistsInSearch: true # Whether to resolve artists in track search results (can be slow)
       localFiles: false # Enable local files support with Spotify playlists. Please note `uri` & `isrc` will be `null` & `identifier` will be `"local"`
     applemusic:
       countryCode: "US" # the country code you want to use for filtering the artists top tracks and language. See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
@@ -61,6 +64,8 @@ plugins:
       albumLoadLimit: 6 # The number of pages at 300 tracks each
     deezer:
       masterDecryptionKey: "your master decryption key" # the master key used for decrypting the deezer tracks. (yes this is not here you need to get it from somewhere else)
+      # arl: "your deezer arl" # the arl cookie used for accessing the deezer api this is optional but required for formats above MP3_128
+      formats: [ "FLAC", "MP3_320", "MP3_256", "MP3_128", "MP3_64", "AAC_64" ] # the formats you want to use for the deezer tracks. "FLAC", "MP3_320", "MP3_256" & "AAC_64" are only available for premium users and require a valid arl
     yandexmusic:
       accessToken: "your access token" # the token used for accessing the yandex music api. See https://github.com/TopiSenpai/LavaSrc#yandex-music
       playlistLoadLimit: 1 # The number of pages at 100 tracks each
@@ -74,6 +79,11 @@ plugins:
       audioFormat: "mp3" # supported formats are: mp3, ogg_opus, ogg_vorbis, aac, wav, and flac. Default format is mp3
     youtube:
       countryCode: "US" # the country code you want to use for searching lyrics via ISRC. See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+    vkmusic:
+      userToken: "your user token" # This token is needed for authorization in the api. Guide: https://github.com/topi314/LavaSrc#vk-music
+      playlistLoadLimit: 1 # The number of pages at 50 tracks each
+      artistLoadLimit: 1 # The number of pages at 10 tracks each
+      recommendationsLoadLimit: 10 # Number of tracks
   youtube:
     enabled: true # Whether this source can be used.
     allowSearch: true # Whether "ytsearch:" and "ytmsearch:" can be used.
@@ -85,8 +95,8 @@ plugins:
       - MUSIC
       - WEB
       - ANDROID_TESTSUITE
-      - ANDROID_MUSIC
       - TVHTML5EMBEDDED
+      - ANDROID_MUSIC
       - ANDROID_LITE
       - MEDIA_CONNECT
       - IOS
@@ -104,11 +114,11 @@ lavalink:
       snapshot: false # set to true if you want to use snapshot builds
     - dependency: "com.github.topi314.lavasearch:lavasearch-plugin:1.0.0"
       snapshot: false # set to true if you want to use snapshot builds
-    - dependency: "com.github.topi314.lavasrc:lavasrc-plugin:4.2.0"
+    - dependency: "com.github.topi314.lavasrc:lavasrc-plugin:4.3.0"
       snapshot: false # set to true if you want to use snapshot builds
     - dependency: "com.github.topi314.sponsorblock:sponsorblock-plugin:3.0.1"
       snapshot: false # set to true if you want to use snapshot builds
-    - dependency: "dev.lavalink.youtube:youtube-plugin:1.8.0"
+    - dependency: "dev.lavalink.youtube:youtube-plugin:1.8.3"
       snapshot: false # set to true if you want to use snapshot builds
   pluginsDir: './plugins'
   server:

locales/Korean.json

@@ -36,7 +36,7 @@
 			"content": "안녕하세요! 저는 [Lavamusic](https://github.com/appujet/lavamusic)와 Discord.js로 만들어진 음악 봇, {bot}이에요. 명령어에 대한 자세한 정보를 얻고 싶다면 `{prefix}help <명령어>`를 사용해보세요.",
 			"title": "도움말 메뉴",
 			"not_found": "`{cmdName}` 명령어는 존재하지 않아요.",
-			"help_cmd": "**설명:** {description}\n**사용 방법:** {usage}\n**예시:** {examples}\n**줄인 명령어:** {aliases}\n**카테고리:** {category}\n**쿨다운:** {cooldown}초\n**필요한 권한:** {premUser}\n**봇에게 필요한 권한:** {premBot}\n**개발자 전용:** {dev}\n**빗금 명령어 사용 가능:** {slash}\n**인수 필요:** {args}\n**노래 재생 중에만 사용 가능:** {player}\n**DJ만 사용 가능:** {dj}\n**DJ에게 필요한 권한:** {djPerm}\n**음성 채널 접속 중에만 사용 가능:** {voice}",
+			"help_cmd": "**설명:** {description}\n**사용 방법:** {usage}\n**예시:** {examples}\n**명령어 별칭:** {aliases}\n**카테고리:** {category}\n**쿨다운:** {cooldown}초\n**필요한 권한:** {premUser}\n**봇에게 필요한 권한:** {premBot}\n**개발자 전용:** {dev}\n**빗금 명령어 사용 가능:** {slash}\n**인수 필요:** {args}\n**노래 재생 중에만 사용 가능:** {player}\n**DJ만 사용 가능:** {dj}\n**DJ에게 필요한 권한:** {djPerm}\n**음성 채널 접속 중에만 사용 가능:** {voice}",
 			"footer": "명령어에 대한 자세한 내용을 보려면 {prefix}help <command>를 사용하세요."
 		},
 		"botinfo": {
@@ -460,9 +460,9 @@
 			}
 		},
 		"list": {
-			"description": "사용자의 모든 플레이리스트를 알려줘요",
+			"description": "사용자의 모든 플레이리스트를 확인해요",
 			"options": {
-				"user": "플레이리스트 목록을 가져올 사용자"
+				"user": "플레이리스트 목록을 확인할 사용자"
 			},
 			"messages": {
 				"no_playlists": "플레이리스트가 없어요.",
@@ -507,7 +507,7 @@
 				"provide_playlist": "플레이리스트를 지정해주세요.",
 				"provide_user": "유저를 지정해주세요.",
 				"playlist_not_exist": "그 플레이리스트는 존재하지 않아요.",
-				"playlist_stolen": "`{playlist}`를 {user}에게서 가져왔어요.",
+				"playlist_stolen": "`{playlist}` 플레이리스트를 {user}님에게서 가져왔어요.",
 				"error_occurred": "플레이리스트를 가져오는 도중 오류가 발생했어요."
 			}
 		}
@@ -636,12 +636,12 @@
 			"forward_limit": "더 이상 빨리감기할 수 없어요.",
 			"forwarded": "노래를 빨리감기했어요.",
 			"forward_footer": "{displayName}님에 의해 빨리감기됨",
-			"button_not_available": "이 버튼은 사용할 수 없어요.",
+			"button_not_available": "사용할 수 없는 버튼이에요.",
 			"no_music_playing": "현재 재생 중인 노래가 없어요."
 		}
 	},
 	"Evaluate code": "코드를 실행해요",
-	"Leave a guild": "서버를 떠나요",
-	"List all guilds the bot is in": "봇이 들어가 있는 서버를 알려줘요",
+	"Leave a guild": "봇을 서버에서 퇴장시켜요",
+	"List all guilds the bot is in": "봇이 들어가 있는 서버를 확인해요",
 	"Restart the bot": "봇을 재시작해요"
 }

prisma/example.mongodb.schema.prisma

@@ -15,53 +15,53 @@ datasource db {
 }
 
 model Bot {
-    botId         String  @id @map("_id")
-    totalPlaySong Int 
+  botId         String @id @map("_id")
+  totalPlaySong Int
 }
 
 model Guild {
-    guildId         String      @id @map("_id")
-    prefix          String
-    language        String?     @default("EnglishUS")
-    stay            Stay?
-    dj              Dj?
-    roles           Role[]
-    setup           Setup?
+  guildId  String  @id @map("_id")
+  prefix   String
+  language String? @default("EnglishUS")
+  stay     Stay?
+  dj       Dj?
+  roles    Role[]
+  setup    Setup?
 }
 
 model Stay {
-    guildId String @id @map("_id")
-    textId  String
-    voiceId String
-    Guild   Guild  @relation(fields: [guildId], references: [guildId])
+  guildId String @id @map("_id")
+  textId  String
+  voiceId String
+  Guild   Guild  @relation(fields: [guildId], references: [guildId])
 }
 
 model Dj {
-    guildId String  @id @map("_id")
-    mode    Boolean
-    Guild   Guild   @relation(fields: [guildId], references: [guildId])
+  guildId String  @id @map("_id")
+  mode    Boolean
+  Guild   Guild   @relation(fields: [guildId], references: [guildId])
 }
 
 model Role {
-    guildId String @id @map("_id")
-    roleId  String
-    Guild   Guild  @relation(fields: [guildId], references: [guildId])
+  guildId String @id @map("_id")
+  roleId  String
+  Guild   Guild  @relation(fields: [guildId], references: [guildId])
 
-    @@unique([guildId, roleId])
+  @@unique([guildId, roleId])
 }
 
 model Playlist {
-    id      String   @id @default(uuid()) @map("_id")
-    userId  String
-    name    String
-    tracks  String?   // Store the array of encoded tracks as a JSON string
+  id     String  @id @default(uuid()) @map("_id")
+  userId String
+  name   String
+  tracks String? // Store the array of encoded tracks as a JSON string
 
-    @@unique([userId, name])
+  @@unique([userId, name])
 }
 
 model Setup {
-    guildId   String @id @map("_id")
-    textId    String
-    messageId String
-    Guild     Guild  @relation(fields: [guildId], references: [guildId])
-}
+  guildId   String @id @map("_id")
+  textId    String
+  messageId String
+  Guild     Guild  @relation(fields: [guildId], references: [guildId])
+}

prisma/example.postgresql.schema.prisma

@@ -5,63 +5,63 @@
 // Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
 
 generator client {
-    provider      = "prisma-client-js"
-    binaryTargets = ["native", "debian-openssl-3.0.x"]
+  provider      = "prisma-client-js"
+  binaryTargets = ["native", "debian-openssl-3.0.x"]
 }
 
 datasource db {
-    provider = "postgresql"
-    url      = env("DATABASE_URL")
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
 }
 
 model Bot {
-    botId         String     @unique
-    totalPlaySong Int 
+  botId         String @unique
+  totalPlaySong Int
 }
 
 model Guild {
-    guildId         String      @id
-    prefix          String
-    language        String?     @default("EnglishUS")
-    stay            Stay?
-    dj              Dj?
-    roles           Role[]
-    setup           Setup?
+  guildId  String  @id
+  prefix   String
+  language String? @default("EnglishUS")
+  stay     Stay?
+  dj       Dj?
+  roles    Role[]
+  setup    Setup?
 }
 
 model Stay {
-    guildId String @id
-    textId  String
-    voiceId String
-    Guild   Guild  @relation(fields: [guildId], references: [guildId])
+  guildId String @id
+  textId  String
+  voiceId String
+  Guild   Guild  @relation(fields: [guildId], references: [guildId])
 }
 
 model Dj {
-    guildId String  @id
-    mode    Boolean
-    Guild   Guild   @relation(fields: [guildId], references: [guildId])
+  guildId String  @id
+  mode    Boolean
+  Guild   Guild   @relation(fields: [guildId], references: [guildId])
 }
 
 model Role {
-    guildId String
-    roleId  String
-    Guild   Guild  @relation(fields: [guildId], references: [guildId])
+  guildId String
+  roleId  String
+  Guild   Guild  @relation(fields: [guildId], references: [guildId])
 
-    @@unique([guildId, roleId])
+  @@unique([guildId, roleId])
 }
 
 model Playlist {
-    id      String   @id @default(uuid())
-    userId  String
-    name    String
-    tracks  String?   // Store the array of encoded tracks as a JSON string
+  id     String  @id @default(uuid())
+  userId String
+  name   String
+  tracks String? // Store the array of encoded tracks as a JSON string
 
-    @@unique([userId, name])
+  @@unique([userId, name])
 }
 
 model Setup {
-    guildId   String @id
-    textId    String
-    messageId String
-    Guild     Guild  @relation(fields: [guildId], references: [guildId])
-}
+  guildId   String @id
+  textId    String
+  messageId String
+  Guild     Guild  @relation(fields: [guildId], references: [guildId])
+}