Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/main/kotlin/services/config/ConfigBO.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ data class Config(
@SerialName("deezer")
val deezer: DeezerConfig,
@SerialName("spotify")
val spotify: SpotifyConfig
val spotify: SpotifyConfig,
@SerialName("tidal")
val tidal: TidalConfig
)

@Serializable
Expand Down Expand Up @@ -78,3 +80,13 @@ data class SpotifyConfig(
@SerialName("custom_endpoint")
val customEndpoint: String
)

@Serializable
data class TidalConfig(
@SerialName("enabled")
val enabled: Boolean,
@SerialName("country_code")
val countryCode: String,
@SerialName("token")
val token: String
)
11 changes: 11 additions & 0 deletions src/main/kotlin/services/lavaplayer/AudioPlayerManagerProvider.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.github.topi314.lavasrc.deezer.DeezerAudioSourceManager
import com.github.topi314.lavasrc.flowerytts.FloweryTTSSourceManager
import com.github.topi314.lavasrc.mirror.DefaultMirroringAudioTrackResolver
import com.github.topi314.lavasrc.spotify.SpotifySourceManager
import com.github.topi314.lavasrc.tidal.TidalSourceManager
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers
Expand Down Expand Up @@ -68,6 +69,16 @@ class AudioPlayerManagerProvider(
}
)
}
if (configService.config.tidal.enabled) {
this.registerSourceManager(
TidalSourceManager(
configService.config.tidal.countryCode,
{ this },
DefaultMirroringAudioTrackResolver(null),
configService.config.tidal.token
)
)
}
this.registerSourceManager(
FloweryTTSSourceManager(DEFAULT_TTS_VOICE).apply {
setSpeed(1.1f)
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/template/config_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,10 @@
"client_id": "",
"client_secret": "",
"custom_endpoint": ""
},
"tidal": {
"enabled": false,
"country_code": "ES",
"token": ""
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@ class AudioPlayerManagerProviderTest {
fun `When createAudioPlayerManager is called Then return DefaultAudioPlayerManager`() {
// Given
every { configService.config.youtube.oauth2Token } returns null
every { configService.config.deezer.enabled } returns false
every { configService.config.spotify.enabled } returns false
every { configService.config.deezer.enabled } returns true
every { configService.config.deezer.masterDecryptionKey } returns "master_key"
every { configService.config.deezer.arlToken } returns "altoke"
every { configService.config.spotify.enabled } returns true
every { configService.config.spotify.clientId } returns "client_id"
every { configService.config.spotify.clientSecret } returns "client_secret"
every { configService.config.spotify.customEndpoint } returns ""
every { configService.config.tidal.enabled } returns true
every { configService.config.tidal.countryCode } returns "ES"
every { configService.config.tidal.token } returns "altoke"
every { configService.config.youtube.poToken } returns null
every { configService.config.youtube.visitorData } returns null
every { configService.config.youtube.remoteCipherUrl } returns null
Expand Down