Skip to content

Commit

Permalink
Finish splatoon command
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hoi15A
Hoi15A committed Feb 21, 2023
1 parent d610e0c commit 019e8b4
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 22 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official

ktorVersion=2.2.2
ktorVersion=2.2.3
105 changes: 86 additions & 19 deletions src/main/kotlin/command/Splatoon.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import util.splatoon.Splatoon3
class Splatoon : GuildCommand {
enum class GameModes(val displayName: String, val color: Color, val icon: String) {
TURF_WAR("Turf War", Color(209, 213, 40), "https://gamepedia.cursecdn.com/splatoon_gamepedia/thumb/a/a2/Turf-wars-icon.png/350px-Turf-wars-icon.png"),
ANARCHY_OPEN("Anarchy Battles (Open)", Color(0, 0, 0), "https://gamepedia.cursecdn.com/splatoon_gamepedia/f/f2/Ranked-battle-icon.png"),
ANARCHY_SERIES("Anarchy Battles (Series)", Color(0, 0, 0), "https://gamepedia.cursecdn.com/splatoon_gamepedia/f/f2/Ranked-battle-icon.png"),
X_BATTLE("X Battles", Color(0, 0, 0), "https://i.imgur.com/uSxa2hz.png")
ANARCHY_OPEN("Anarchy Battles (Open)", Color(245, 73, 16), "https://gamepedia.cursecdn.com/splatoon_gamepedia/f/f2/Ranked-battle-icon.png"),
ANARCHY_SERIES("Anarchy Battles (Series)", Color(245, 73, 16), "https://gamepedia.cursecdn.com/splatoon_gamepedia/f/f2/Ranked-battle-icon.png"),
X_BATTLE("X Battles", Color(14, 219, 155), "https://i.imgur.com/uSxa2hz.png")
}

override val name = "splatoon"
Expand Down Expand Up @@ -59,30 +59,30 @@ class Splatoon : GuildCommand {
}

private val splat = Splatoon3()
private val fieldNames = listOf("Now", "Up Next", "Soon")
private suspend fun schedule(
interaction: GuildChatInputCommandInteraction,
response: DeferredPublicMessageInteractionResponseBehavior
) {
val schedules = splat.getSchedules()

if (schedules == null) {
response.respond {
content = "There was an issue receiving the schedule or there's a splatfest going on which this bot does not currently support."
}
return
}

response.respond {
when(GameModes.values().first { it.name == interaction.command.strings["mode"] }) {
GameModes.TURF_WAR -> embed {
val upcoming = schedules.data.regularSchedules.nodes.take(3)

field {
name = "Now | ${Instant.parse(upcoming[0].startTime).toMessageFormat(DiscordTimestampStyle.ShortTime)} - ${Instant.parse(upcoming[0].endTime).toMessageFormat(DiscordTimestampStyle.ShortTime)}"
value = upcoming[0].regularMatchSetting.vsStages.joinToString(", ") { it.name }
}

field {
name = "Up Next | ${Instant.parse(upcoming[1].startTime).toMessageFormat(DiscordTimestampStyle.ShortTime)} - ${Instant.parse(upcoming[1].endTime).toMessageFormat(DiscordTimestampStyle.ShortTime)}"
value = upcoming[1].regularMatchSetting.vsStages.joinToString(", ") { it.name }
}

field {
name = "Soon | ${Instant.parse(upcoming[2].startTime).toMessageFormat(DiscordTimestampStyle.ShortTime)} - ${Instant.parse(upcoming[2].endTime).toMessageFormat(DiscordTimestampStyle.ShortTime)}"
value = upcoming[2].regularMatchSetting.vsStages.joinToString(", ") { it.name }
for (i in 0..2) {
field {
name = "${fieldNames[i]} | ${Instant.parse(upcoming[i].startTime).toMessageFormat(DiscordTimestampStyle.ShortTime)} - ${Instant.parse(upcoming[i].endTime).toMessageFormat(DiscordTimestampStyle.ShortTime)}"
value = upcoming[i].regularMatchSetting.vsStages.joinToString(", ") { it.name }
}
}

title = GameModes.TURF_WAR.displayName
Expand All @@ -98,9 +98,76 @@ class Splatoon : GuildCommand {
url = GameModes.TURF_WAR.icon
}
}
GameModes.ANARCHY_OPEN -> TODO()
GameModes.ANARCHY_SERIES -> TODO()
GameModes.X_BATTLE -> TODO()
GameModes.ANARCHY_OPEN -> embed {
val upcoming = schedules.data.bankaraSchedules.nodes.take(3)

for (i in 0..2) {
field {
val settings = upcoming[i].bankaraMatchSettings.find { it.mode == "OPEN" }!!
name = "${fieldNames[i]} | ${settings.vsRule.name} | ${Instant.parse(upcoming[i].startTime).toMessageFormat(DiscordTimestampStyle.ShortTime)} - ${Instant.parse(upcoming[i].endTime).toMessageFormat(DiscordTimestampStyle.ShortTime)}"
value = settings.vsStages.joinToString(", ") { it.name }
}
}

title = GameModes.ANARCHY_OPEN.displayName
description = "The following maps are up next"
color = GameModes.ANARCHY_OPEN.color
val randStage = upcoming[0].bankaraMatchSettings.find { it.mode == "OPEN" }!!.vsStages.random()
image = randStage.image.url
footer {
text = "Image: ${randStage.name}"
}
timestamp = Clock.System.now()
thumbnail {
url = GameModes.ANARCHY_OPEN.icon
}
}
GameModes.ANARCHY_SERIES -> embed {
val upcoming = schedules.data.bankaraSchedules.nodes.take(3)
for (i in 0..2) {
field {
val settings = upcoming[i].bankaraMatchSettings.find { it.mode == "CHALLENGE" }!!
name = "${fieldNames[i]} | ${settings.vsRule.name} | ${Instant.parse(upcoming[i].startTime).toMessageFormat(DiscordTimestampStyle.ShortTime)} - ${Instant.parse(upcoming[i].endTime).toMessageFormat(DiscordTimestampStyle.ShortTime)}"
value = settings.vsStages.joinToString(", ") { it.name }
}
}

title = GameModes.ANARCHY_SERIES.displayName
description = "The following maps are up next"
color = GameModes.ANARCHY_SERIES.color
val randStage = upcoming[0].bankaraMatchSettings.find { it.mode == "CHALLENGE" }!!.vsStages.random()
image = randStage.image.url
footer {
text = "Image: ${randStage.name}"
}
timestamp = Clock.System.now()
thumbnail {
url = GameModes.ANARCHY_SERIES.icon
}
}
GameModes.X_BATTLE -> embed {
val upcoming = schedules.data.xSchedules.nodes.take(3)

for (i in 0..2) {
field {
name = "${fieldNames[i]} | ${upcoming[i].xMatchSetting.vsRule.name} | ${Instant.parse(upcoming[i].startTime).toMessageFormat(DiscordTimestampStyle.ShortTime)} - ${Instant.parse(upcoming[i].endTime).toMessageFormat(DiscordTimestampStyle.ShortTime)}"
value = upcoming[i].xMatchSetting.vsStages.joinToString(", ") { it.name }
}
}

title = GameModes.X_BATTLE.displayName
description = "The following maps are up next"
color = GameModes.X_BATTLE.color
val randStage = upcoming[0].xMatchSetting.vsStages.random()
image = randStage.image.url
footer {
text = "Image: ${randStage.name}"
}
timestamp = Clock.System.now()
thumbnail {
url = GameModes.X_BATTLE.icon
}
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/util/splatoon/Splatoon3.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ val client = HttpClient(CIO) {
}

class Splatoon3 {
fun getSchedules(): Schedules {
fun getSchedules(): Schedules? {
var data: Schedules? = null
runBlocking {
val resp = client.get("data/schedules.json")
Expand All @@ -41,6 +41,6 @@ class Splatoon3 {
println(e)
}
}
return data!!
return data
}
}

0 comments on commit 019e8b4

Please sign in to comment.