Skip to content

Commit

Permalink
the "Pause" button and a pagination minor fix for &queue
Browse files Browse the repository at this point in the history
  • Loading branch information
@ileukocyte
ileukocyte committed Jul 28, 2022
1 parent 9fa5aa3 commit fe87469
Showing 1 changed file with 71 additions and 29 deletions.
100 changes: 71 additions & 29 deletions src/main/kotlin/io/ileukocyte/hibernum/commands/music/QueueCommand.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ class QueueCommand : TextCommand {
}

val playerButtons = mutableSetOf(
Button.primary("$name-${event.author.idLong}-$initialPage-true-update", "Update"),
Button.secondary(
"$name-${event.author.idLong}-$initialPage-true-playpause",
"Pause".applyIf(audioPlayer.player.isPaused) { "Play" },
),
Button.secondary("$name-${event.author.idLong}-$initialPage-true-stop", "Stop"),
audioPlayer.scheduler.loopMode.getButton(name, "${event.author.id}-$initialPage-true"),
)
Expand All @@ -81,7 +84,10 @@ class QueueCommand : TextCommand {
}

actionRows += ActionRow.of(playerButtons)
actionRows += ActionRow.of(Button.danger("$name-${event.author.idLong}-exit", "Close"))
actionRows += ActionRow.of(
Button.primary("$name-${event.author.idLong}-$initialPage-true-update", "Update"),
Button.danger("$name-${event.author.idLong}-exit", "Close"),
)

event.channel.sendMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, initialPage))
.setComponents(actionRows)
Expand Down Expand Up @@ -109,7 +115,10 @@ class QueueCommand : TextCommand {

if (addGui) {
val playerButtons = mutableSetOf(
Button.primary("$name-${event.user.idLong}-$initialPage-true-update", "Update"),
Button.secondary(
"$name-${event.user.idLong}-$initialPage-true-playpause",
"Pause".applyIf(audioPlayer.player.isPaused) { "Play" },
),
Button.secondary("$name-${event.user.idLong}-$initialPage-true-stop", "Stop"),
audioPlayer.scheduler.loopMode.getButton(name, "${event.user.id}-$initialPage-true"),
)
Expand All @@ -127,7 +136,10 @@ class QueueCommand : TextCommand {
actionRows += ActionRow.of(playerButtons)
}

actionRows += ActionRow.of(Button.danger("$name-${event.user.idLong}-exit", "Close"))
actionRows += ActionRow.of(
Button.primary("$name-${event.user.idLong}-$initialPage-$addGui-update", "Update"),
Button.danger("$name-${event.user.idLong}-exit", "Close"),
)

event.replyEmbeds(queueEmbed(event.jda, audioPlayer, track, initialPage))
.setComponents(actionRows)
Expand Down Expand Up @@ -161,7 +173,10 @@ class QueueCommand : TextCommand {

if (addGui) {
val playerButtons = mutableSetOf(
Button.primary("$name-${event.user.idLong}-$initialPage-true-update", "Update"),
Button.secondary(
"$name-${event.user.idLong}-$initialPage-true-playpause",
"Pause".applyIf(audioPlayer.player.isPaused) { "Play" },
),
Button.secondary("$name-${event.user.idLong}-$initialPage-true-stop", "Stop"),
audioPlayer.scheduler.loopMode.getButton(name, "${event.user.id}-$initialPage-true"),
)
Expand All @@ -179,20 +194,24 @@ class QueueCommand : TextCommand {
actionRows += ActionRow.of(playerButtons)
}

actionRows += ActionRow.of(Button.danger("$name-${event.user.idLong}-exit", "Close"))
actionRows += ActionRow.of(
Button.primary("$name-${event.user.idLong}-$initialPage-$addGui-update", "Update"),
Button.danger("$name-${event.user.idLong}-exit", "Close"),
)

return actionRows
}

when (id.last()) {
"first" -> {
event.editMessageEmbeds(
queueEmbed(event.jda, audioPlayer, track, 0)
).setComponents(getUpdatedButtons(0)).queue(null) {
event.message.editMessageEmbeds(
queueEmbed(event.jda, audioPlayer, track, 0)
).setComponents(getUpdatedButtons(0)).queue()
}
event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, 0))
.setComponents(getUpdatedButtons(0))
.queue(null) {
event.message
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, 0))
.setComponents(getUpdatedButtons(0))
.queue()
}
}
"last" -> {
val lastPage = pagesCount.dec()
Expand All @@ -206,7 +225,7 @@ class QueueCommand : TextCommand {
}
}
"back" -> {
val newPage = max(0, pageNumber.dec())
val newPage = min(max(0, pageNumber.dec()), pagesCount.dec())

event.editMessageEmbeds(
queueEmbed(event.jda, audioPlayer, track, newPage)
Expand All @@ -229,12 +248,14 @@ class QueueCommand : TextCommand {
}
}
"update" -> {
event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, pageNumber))
.setComponents(getUpdatedButtons(pageNumber))
val page = min(pageNumber, pagesCount.dec())

event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue(null) {
event.message
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, pageNumber))
.setComponents(getUpdatedButtons(pageNumber))
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue()
}
}
Expand All @@ -244,30 +265,48 @@ class QueueCommand : TextCommand {
}

when (id.last()) {
"playpause" -> {
audioPlayer.player.isPaused = !audioPlayer.player.isPaused

val page = min(pageNumber, pagesCount.dec())

event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue(null) {
event.message
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue()
}
}
"shuffle" -> {
if (audioPlayer.scheduler.queue.isNotEmpty()) {
audioPlayer.scheduler.shuffle()
}

event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, pageNumber))
.setComponents(getUpdatedButtons(pageNumber))
val page = min(pageNumber, pagesCount.dec())

event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue(null) {
event.message
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, pageNumber))
.setComponents(getUpdatedButtons(pageNumber))
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue()
}
}
"loop" -> {
audioPlayer.scheduler.loopMode = audioPlayer.scheduler.loopMode
.getNext(audioPlayer.scheduler.queue.isEmpty())

event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, pageNumber))
.setComponents(getUpdatedButtons(pageNumber))
val page = min(pageNumber, pagesCount.dec())

event.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue(null) {
event.message
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, pageNumber))
.setComponents(getUpdatedButtons(pageNumber))
.editMessageEmbeds(queueEmbed(event.jda, audioPlayer, track, page))
.setComponents(getUpdatedButtons(page))
.queue()
}
}
Expand Down Expand Up @@ -301,14 +340,17 @@ class QueueCommand : TextCommand {
}
}

val embed = queueEmbed(event.jda, audioPlayer, audioPlayer.player.playingTrack, pageNumber)
val page = min(pageNumber, pagesCount.dec())

val embed =
queueEmbed(event.jda, audioPlayer, audioPlayer.player.playingTrack, page)

event.editMessageEmbeds(embed)
.setComponents(getUpdatedButtons(pageNumber))
.setComponents(getUpdatedButtons(page))
.queue(null) {
event.message
.editMessageEmbeds(embed)
.setComponents(getUpdatedButtons(pageNumber))
.setComponents(getUpdatedButtons(page))
.queue()
}
}
Expand Down

0 comments on commit fe87469

Please sign in to comment.