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

Fix crash relating to ConfigManager changes

Browse Source
This commit is contained in:
MangosArentLiterature 2021-06-21 22:05:59 -05:00
parent 5d63ce7a2a
commit 6e2a3a0fca
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/include/discord.h
View File

@ -20,6 +20,7 @@
#include <QtNetwork>
#include <QCoreApplication>
#include "config_manager.h"
/**
* @brief A class for handling all Discord webhook requests.
@ -36,7 +37,7 @@ public:
* @param f_webhook_sendfile Whether or not to send a file containing area logs with the webhook POST request.
* @param parent Qt-based parent, passed along to inherited constructor from QObject.
*/
Discord(const QUrl& f_webhook_url, const QString& f_webhook_content, const bool& f_webhook_sendfile, QObject* parent = nullptr);
Discord(QObject* parent = nullptr);
/**
* @brief Deconstructor for the Discord class.
@ -101,16 +102,6 @@ private:
*/
QNetworkRequest m_request;
/**
* @brief The content to include in the webhook POST request.
*/
const QString& m_webhook_content;
/**
* @brief Whether or not to send a file containing area logs with the webhook POST request.
*/
const bool& m_webhook_sendfile;
private slots:
/**
* @brief Handles a network reply from a webhook POST request.

16
core/src/discord.cpp
View File

@ -17,17 +17,15 @@
//////////////////////////////////////////////////////////////////////////////////////
#include "include/discord.h"
Discord::Discord(const QUrl &f_webhook_url, const QString &f_webhook_content, const bool &f_webhook_sendfile, QObject* parent) :
QObject(parent),
m_webhook_content(f_webhook_content),
m_webhook_sendfile(f_webhook_sendfile)
Discord::Discord(QObject* parent) :
QObject(parent)
{
if (!QUrl(f_webhook_url).isValid())
if (!QUrl(ConfigManager::discordWebhookUrl()).isValid())
qWarning("Invalid webhook URL!");
m_nam = new QNetworkAccessManager();
connect(m_nam, &QNetworkAccessManager::finished,
this, &Discord::onReplyFinished);
m_request.setUrl(f_webhook_url);
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)
@ -35,7 +33,7 @@ void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_
QJsonDocument l_json = constructModcallJson(f_name, f_area, f_reason);
postJsonWebhook(l_json);
if (m_webhook_sendfile) {
if (ConfigManager::discordWebhookSendFile()) {
QHttpMultiPart *l_multipart = constructLogMultipart(f_buffer);
postMultipartWebhook(*l_multipart);
}
@ -52,8 +50,8 @@ QJsonDocument Discord::constructModcallJson(const QString &f_name, const QString
};
l_array.append(l_object);
l_json["embeds"] = l_array;
if (!m_webhook_content.isEmpty())
l_json["content"] = m_webhook_content;
if (!ConfigManager::discordWebhookContent().isEmpty())
l_json["content"] = ConfigManager::discordWebhookContent();
return QJsonDocument(l_json);
}

2
core/src/server.cpp
View File

@ -52,7 +52,7 @@ void Server::start()
}
if (ConfigManager::discordWebhookEnabled()) {
discord = new Discord(webhook_url, webhook_content, webhook_sendfile, this);
discord = new Discord(this);
connect(this, &Server::modcallWebhookRequest,
discord, &Discord::onModcallWebhookRequested);
}