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

Add optional color configuration

Browse Source
This commit is contained in:
Salanto 2021-09-20 21:09:28 +02:00
parent e041d4f94a
commit 2c96e2683f
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/config_sample/discord.ini
View File

@ -28,3 +28,6 @@ webhook_uptime_time = 60
; The URL of the Uptime Webhook. Must contain the webhook ID and token. ; The URL of the Uptime Webhook. Must contain the webhook ID and token.
webhook_uptime_url= webhook_uptime_url=
; The color code for the webhook. Allows customization of the color used in the embeed.
webhook_color=

9
core/include/config_manager.h
View File

@ -321,10 +321,17 @@ class ConfigManager {
/** /**
* @brief Returns the Discord Uptime Webhook URL. * @brief Returns the Discord Uptime Webhook URL.
* *
* @return See sshort description. * @return See short description.
*/ */
static QString discordUptimeWebhookUrl(); static QString discordUptimeWebhookUrl();
/**
* @brief Returns a user configurable color code for the embeed object.s
*
* @return See short description.
*/
static QString discordWebhookColor();
/** /**
* @brief Returns true if password requirements should be enforced. * @brief Returns true if password requirements should be enforced.
* *

2
core/include/discord.h
View File

@ -141,8 +141,6 @@ private slots:
*/ */
void postMultipartWebhook(QHttpMultiPart& f_multipart); void postMultipartWebhook(QHttpMultiPart& f_multipart);
/** /**
* @brief Constructs a new JSON document for bans. * @brief Constructs a new JSON document for bans.
* *

5
core/src/config_manager.cpp
View File

@ -470,6 +470,11 @@ QString ConfigManager::discordUptimeWebhookUrl()
return m_discord->value("Discord/webhook_uptime_url", "").toString(); return m_discord->value("Discord/webhook_uptime_url", "").toString();
} }
QString ConfigManager::discordWebhookColor()
{
return m_discord->value("Discord/webhook_color","13312842").toString();
}
bool ConfigManager::passwordRequirements() bool ConfigManager::passwordRequirements()
{ {
return m_settings->value("Password/password_requirements", true).toBool(); return m_settings->value("Password/password_requirements", true).toBool();

6
core/src/discord.cpp
View File

@ -66,7 +66,7 @@ QJsonDocument Discord::constructModcallJson(const QString &f_name, const QString
QJsonObject l_json; QJsonObject l_json;
QJsonArray l_array; QJsonArray l_array;
QJsonObject l_object { QJsonObject l_object {
{"color", "13312842"}, {"color", ConfigManager::discordWebhookColor()},
{"title", f_name + " filed a modcall in " + f_area}, {"title", f_name + " filed a modcall in " + f_area},
{"description", f_reason} {"description", f_reason}
}; };
@ -85,7 +85,7 @@ QJsonDocument Discord::constructBanJson(const QString &f_ipid, const QString &f_
QJsonObject l_json; QJsonObject l_json;
QJsonArray l_array; QJsonArray l_array;
QJsonObject l_object { QJsonObject l_object {
{"color", "13312842"}, {"color", ConfigManager::discordWebhookColor()},
{"title", "Ban issued by " + f_moderator}, {"title", "Ban issued by " + f_moderator},
{"description", "Client IPID : " + f_ipid + "\nBan ID: " + QString::number(f_banID) + "\nBan reason : " + f_reason +"\nBanned until : " +f_duration} {"description", "Client IPID : " + f_ipid + "\nBan ID: " + QString::number(f_banID) + "\nBan reason : " + f_reason +"\nBanned until : " +f_duration}
}; };
@ -100,7 +100,7 @@ QJsonDocument Discord::constructUptimeJson(const QString& f_timeExpired)
QJsonObject l_json; QJsonObject l_json;
QJsonArray l_array; QJsonArray l_array;
QJsonObject l_object { QJsonObject l_object {
{"color", "13312842"}, {"color", ConfigManager::discordWebhookColor()},
{"title", "Your server is online!"}, {"title", "Your server is online!"},
{"description", "Your server has been online for " + f_timeExpired} {"description", "Your server has been online for " + f_timeExpired}
}; };