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

Merge pull request #190 from Salanto/fix-DiscordNoContentEmbed

Browse Source 
Fix Modcall Embed Construction Order
This commit is contained in:
Rosemary Witchaven 2021-08-19 18:30:11 -05:00 committed by GitHub
commit 72aeee3ec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/include/config_manager.h
View File

@ -217,7 +217,7 @@ class ConfigManager {
*
* @return See short description.
*/
static QString discordWebhookContent();
static QString discordModcallWebhookContent();
/**
* @brief Returns true if the discord webhook should send log files.

6
core/src/config_manager.cpp
View File

@ -17,6 +17,8 @@
//////////////////////////////////////////////////////////////////////////////////////
#include "include/config_manager.h"
#include <include/config_manager.h>
QSettings* ConfigManager::m_settings = new QSettings("config/config.ini", QSettings::IniFormat);
QSettings* ConfigManager::m_discord = new QSettings("config/discord.ini", QSettings::IniFormat);
ConfigManager::CommandSettings* ConfigManager::m_commands = new CommandSettings();
@ -285,9 +287,9 @@ QString ConfigManager::discordModcallWebhookUrl()
return m_discord->value("Discord/webhook_modcall_url", "").toString();
}
QString ConfigManager::discordWebhookContent()
QString ConfigManager::discordModcallWebhookContent()
{
return m_discord->value("Discord/webhook_content", "").toString();
return m_discord->value("Discord/webhook_modcall_content", "").toString();
}
bool ConfigManager::discordModcallWebhookSendFile()

6
core/src/discord.cpp
View File

@ -71,9 +71,11 @@ QJsonDocument Discord::constructModcallJson(const QString &f_name, const QString
{"description", f_reason}
};
l_array.append(l_object);
if (!ConfigManager::discordModcallWebhookContent().isEmpty())
l_json["content"] = ConfigManager::discordModcallWebhookContent();
l_json["embeds"] = l_array;
if (!ConfigManager::discordWebhookContent().isEmpty())
l_json["content"] = ConfigManager::discordWebhookContent();
return QJsonDocument(l_json);
}