From 5cea6674c97684b90db59890068ddabd7dce563e Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Sat, 11 Jun 2022 23:25:24 +0200
Subject: [PATCH] Add jukebox skip command

* Prevents the jukebox being locked up by long playing songs without any way to skip it
---
 bin/config_sample/command_extensions.ini |  5 ++++-
 bin/config_sample/text/commandhelp.json  |  5 +++++
 core/include/aoclient.h                  |  5 +++++
 core/src/aoclient.cpp                    |  3 ++-
 core/src/commands/music.cpp              | 13 +++++++++++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/bin/config_sample/command_extensions.ini b/bin/config_sample/command_extensions.ini
index dd9ce14..ae68c0c 100644
--- a/bin/config_sample/command_extensions.ini
+++ b/bin/config_sample/command_extensions.ini
@@ -83,4 +83,7 @@ aliases = togglewtce
 aliases = toggleshouts
 
 [kick_other]
-aliases = kickother
\ No newline at end of file
+aliases = kickother
+
+[jukebox_skip]
+aliases = jukeboxskip
\ No newline at end of file
diff --git a/bin/config_sample/text/commandhelp.json b/bin/config_sample/text/commandhelp.json
index 1d148ac..fddd9cc 100644
--- a/bin/config_sample/text/commandhelp.json
+++ b/bin/config_sample/text/commandhelp.json
@@ -678,5 +678,10 @@
       "name":"kick_other",
       "usage":"/kick_other",
       "text":"Removes all multiclients of the user from the server."
+   },
+   {
+      "name":"jukebox_skip",
+      "usage":"/jukebox_skip",
+      "text":"Skips the current song in the Jukebox and plays the next available one."
    }
 ]
diff --git a/core/include/aoclient.h b/core/include/aoclient.h
index d920ef1..60f65d2 100644
--- a/core/include/aoclient.h
+++ b/core/include/aoclient.h
@@ -1969,6 +1969,11 @@ class AOClient : public QObject
      */
     void cmdClearCustom(int argc, QStringList argv);
 
+    /**
+     * @brief Skips the current song in the Jukebox and plays the next available one.
+     */
+    void cmdJukeboxSkip(int argc, QStringList argv);
+
     ///@}
 
     /**
diff --git a/core/src/aoclient.cpp b/core/src/aoclient.cpp
index efa5286..7afeaff 100644
--- a/core/src/aoclient.cpp
+++ b/core/src/aoclient.cpp
@@ -146,7 +146,8 @@ const QMap<QString, AOClient::CommandInfo> AOClient::COMMANDS{
     {"clearcustom", {{ACLRole::CM}, 0, &AOClient::cmdClearCustom}},
     {"toggle_wtce", {{ACLRole::CM}, 0, &AOClient::cmdToggleWtce}},
     {"toggle_shouts", {{ACLRole::CM}, 0, &AOClient::cmdToggleShouts}},
-    {"kick_other", {{ACLRole::NONE}, 0, &AOClient::cmdKickOther}}};
+    {"kick_other", {{ACLRole::NONE}, 0, &AOClient::cmdKickOther}},
+    {"jukebox_skip", {{ACLRole::CM}, 0, &AOClient::cmdJukeboxSkip}}};
 
 void AOClient::clientDisconnected()
 {
diff --git a/core/src/commands/music.cpp b/core/src/commands/music.cpp
index af44135..9f63e79 100644
--- a/core/src/commands/music.cpp
+++ b/core/src/commands/music.cpp
@@ -208,3 +208,16 @@ void AOClient::cmdClearCustom(int argc, QStringList argv)
     m_music_manager->clearCustomList(m_current_area);
     sendServerMessage("Custom songs have been cleared.");
 }
+
+void AOClient::cmdJukeboxSkip(int argc, QStringList argv)
+{
+    Q_UNUSED(argc);
+    Q_UNUSED(argv);
+
+    QString l_name = m_current_char;
+    if (!m_showname.isEmpty()) {
+        l_name = m_showname;
+    }
+    server->getAreaById(m_current_area)->switchJukeboxSong();
+    sendServerMessageArea(l_name + " has forced a skip. Playing the next available song.");
+}