Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add jukebox skip command

Browse Source 
* Prevents the jukebox being locked up by long playing songs without any way to skip it
This commit is contained in:
Salanto 2022-06-11 23:25:24 +02:00 committed by Rosemary Witchaven
parent e80f452352
commit 5cea6674c9
5 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/config_sample/command_extensions.ini
View File

@ -83,4 +83,7 @@ aliases = togglewtce
aliases = toggleshouts
[kick_other]
aliases = kickother
aliases = kickother
[jukebox_skip]
aliases = jukeboxskip

5
bin/config_sample/text/commandhelp.json
View File

@ -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."
}
]

5
core/include/aoclient.h
View File

@ -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);
///@}
/**

3
core/src/aoclient.cpp
View File

@ -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()
{

13
core/src/commands/music.cpp
View File

@ -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.");
}