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

Merge pull request #251 from AwesomeAim/help_please

Browse Source 
Fix help displaying nothing if it can't find the command + loadCommandHelp variable name fixes
This commit is contained in:
Rosemary Witchaven 2022-03-22 12:17:09 -05:00 committed by GitHub
commit 0e807c8e75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/commands/moderation.cpp
View File

@ -170,10 +170,14 @@ void AOClient::cmdHelp(int argc, QStringList argv)
{ {
if(argc > 1) { if(argc > 1) {
sendServerMessage("Too many arguments. Please only use the command name."); sendServerMessage("Too many arguments. Please only use the command name.");
return;
} }
QString l_command_name = argv[0]; QString l_command_name = argv[0];
ConfigManager::help l_command_info = ConfigManager::commandHelp(l_command_name); ConfigManager::help l_command_info = ConfigManager::commandHelp(l_command_name);
if (l_command_info.usage.isEmpty() || l_command_info.text.isEmpty()) // my picoseconds :(
sendServerMessage("Unable to find the command " + l_command_name + ".");
else
sendServerMessage("==Help==\n" +l_command_info.usage + "\n" + l_command_info.text); sendServerMessage("==Help==\n" +l_command_info.usage + "\n" + l_command_info.text);
} }

8
core/src/config_manager.cpp
View File

@ -185,17 +185,17 @@ QStringList ConfigManager::ordered_songs()
void ConfigManager::loadCommandHelp() void ConfigManager::loadCommandHelp()
{ {
QFile l_music_json("config/text/commandhelp.json"); QFile l_help_json("config/text/commandhelp.json");
l_music_json.open(QIODevice::ReadOnly | QIODevice::Text); l_help_json.open(QIODevice::ReadOnly | QIODevice::Text);
QJsonParseError l_error; QJsonParseError l_error;
QJsonDocument l_music_list_json = QJsonDocument::fromJson(l_music_json.readAll(), &l_error); QJsonDocument l_help_list_json = QJsonDocument::fromJson(l_help_json.readAll(), &l_error);
if (!(l_error.error == QJsonParseError::NoError)) { //Non-Terminating error. if (!(l_error.error == QJsonParseError::NoError)) { //Non-Terminating error.
qWarning() << "Unable to load help information. The following error occurred: " + l_error.errorString(); qWarning() << "Unable to load help information. The following error occurred: " + l_error.errorString();
} }
// Akashi expects the helpfile to contain multiple entires, so it always checks for an array first. // Akashi expects the helpfile to contain multiple entires, so it always checks for an array first.
QJsonArray l_Json_root_array = l_music_list_json.array(); QJsonArray l_Json_root_array = l_help_list_json.array();
QJsonObject l_child_obj; QJsonObject l_child_obj;
for (int i = 0; i <= l_Json_root_array.size() -1; i++){ for (int i = 0; i <= l_Json_root_array.size() -1; i++){