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

Merge pull request #185 from Salanto/more-hook-urls

Browse Source 
Add ban webhook url option
This commit is contained in:
Rose Witchaven 2021-08-10 16:47:25 -05:00 committed by GitHub
commit 21a8f95a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/config_sample/config.ini
View File

@ -89,10 +89,10 @@ max_dice=100
webhook_enabled=false webhook_enabled=false
; The URL of the discord webhook to send messages to. Must contain the webhook ID and token. ; The URL of the discord webhook to send messages to. Must contain the webhook ID and token.
webhook_url= webhook_modcall_url=
; Whether to attach a file containing the area log when a modcall message is sent to the webhook. ; Whether to attach a file containing the area log when a modcall message is sent to the webhook.
webhook_sendfile=false webhook_modcall_sendfile=false
; Additional text to send with the webhook message. Usually for adding tags for role. Ensure the format is <@&[RoleID]>. ; Additional text to send with the webhook message. Usually for adding tags for role. Ensure the format is <@&[RoleID]>.
webhook_content= webhook_content=
@ -100,6 +100,9 @@ webhook_content=
; Enables the ban webhook. ; Enables the ban webhook.
webhook_ban_enabled = false webhook_ban_enabled = false
; The URL of the ban discord webhook to send messages to. Must contain the webhook ID and token.
webhook_ban_url=
[Password] [Password]
; Whether or not to enforce password requirements. Only applicable under advanced authorization. ; Whether or not to enforce password requirements. Only applicable under advanced authorization.
password_requirements = true password_requirements = true

11
core/include/config_manager.h
View File

@ -202,7 +202,7 @@ class ConfigManager {
* *
* @return See short description. * @return See short description.
*/ */
static QString discordWebhookUrl(); static QString discordModcallWebhookUrl();
/** /**
* @brief Returns the discord webhook content. * @brief Returns the discord webhook content.
@ -216,7 +216,7 @@ class ConfigManager {
* *
* @return See short description. * @return See short description.
*/ */
static bool discordWebhookSendFile(); static bool discordModcallWebhookSendFile();
/** /**
* @brief Returns true if the discord ban webhook is enabled. * @brief Returns true if the discord ban webhook is enabled.
@ -225,6 +225,13 @@ class ConfigManager {
*/ */
static bool discordBanWebhookEnabled(); static bool discordBanWebhookEnabled();
/**
* @brief Returns the Discord Ban Webhook URL.
*
* @return See short description.
*/
static QString discordBanWebhookUrl();
/** /**
* @brief Returns true if password requirements should be enforced. * @brief Returns true if password requirements should be enforced.
* *

13
core/src/config_manager.cpp
View File

@ -270,9 +270,9 @@ bool ConfigManager::discordWebhookEnabled()
return m_settings->value("Discord/webhook_enabled", false).toBool(); return m_settings->value("Discord/webhook_enabled", false).toBool();
} }
QString ConfigManager::discordWebhookUrl() QString ConfigManager::discordModcallWebhookUrl()
{ {
return m_settings->value("Discord/webhook_url", "").toString(); return m_settings->value("Discord/webhook_modcall_url", "").toString();
} }
QString ConfigManager::discordWebhookContent() QString ConfigManager::discordWebhookContent()
@ -280,9 +280,9 @@ QString ConfigManager::discordWebhookContent()
return m_settings->value("Discord/webhook_content", "").toString(); return m_settings->value("Discord/webhook_content", "").toString();
} }
bool ConfigManager::discordWebhookSendFile() bool ConfigManager::discordModcallWebhookSendFile()
{ {
return m_settings->value("Discord/webhook_sendfile", false).toBool(); return m_settings->value("Discord/webhook_modcall_sendfile", false).toBool();
} }
bool ConfigManager::discordBanWebhookEnabled() bool ConfigManager::discordBanWebhookEnabled()
@ -290,6 +290,11 @@ bool ConfigManager::discordBanWebhookEnabled()
return m_settings->value("Discord/webhook_ban_enabled", false).toBool(); return m_settings->value("Discord/webhook_ban_enabled", false).toBool();
} }
QString ConfigManager::discordBanWebhookUrl()
{
return m_settings->value("Discord/webhook_ban_url", "").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();

7
core/src/discord.cpp
View File

@ -20,20 +20,18 @@
Discord::Discord(QObject* parent) : Discord::Discord(QObject* parent) :
QObject(parent) QObject(parent)
{ {
if (!QUrl(ConfigManager::discordWebhookUrl()).isValid())
qWarning("Invalid webhook URL!");
m_nam = new QNetworkAccessManager(); m_nam = new QNetworkAccessManager();
connect(m_nam, &QNetworkAccessManager::finished, connect(m_nam, &QNetworkAccessManager::finished,
this, &Discord::onReplyFinished); this, &Discord::onReplyFinished);
m_request.setUrl(QUrl(ConfigManager::discordWebhookUrl()));
} }
void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_area, const QString &f_reason, const QQueue<QString> &f_buffer) void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_area, const QString &f_reason, const QQueue<QString> &f_buffer)
{ {
m_request.setUrl(QUrl(ConfigManager::discordModcallWebhookUrl()));
QJsonDocument l_json = constructModcallJson(f_name, f_area, f_reason); QJsonDocument l_json = constructModcallJson(f_name, f_area, f_reason);
postJsonWebhook(l_json); postJsonWebhook(l_json);
if (ConfigManager::discordWebhookSendFile()) { if (ConfigManager::discordModcallWebhookSendFile()) {
QHttpMultiPart *l_multipart = constructLogMultipart(f_buffer); QHttpMultiPart *l_multipart = constructLogMultipart(f_buffer);
postMultipartWebhook(*l_multipart); postMultipartWebhook(*l_multipart);
} }
@ -41,6 +39,7 @@ void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_
void Discord::onBanWebhookRequested(const QString &f_ipid, const QString &f_moderator, const QString &f_duration, const QString &f_reason, const int &f_banID) void Discord::onBanWebhookRequested(const QString &f_ipid, const QString &f_moderator, const QString &f_duration, const QString &f_reason, const int &f_banID)
{ {
m_request.setUrl(QUrl(ConfigManager::discordBanWebhookUrl()));
QJsonDocument l_json = constructBanJson(f_ipid,f_moderator, f_duration, f_reason, f_banID); QJsonDocument l_json = constructBanJson(f_ipid,f_moderator, f_duration, f_reason, f_banID);
postJsonWebhook(l_json); postJsonWebhook(l_json);
} }