diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e42515..1f77034 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,12 +19,14 @@ cmake_minimum_required(VERSION 3.16) project(dtranslatebot VERSION 0.1 DESCRIPTION "Discord Translation Bot") -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") add_executable(${PROJECT_NAME} src/main.cpp - src/queue.cpp + src/message_queue.cpp + src/message_queue.h src/settings.cpp + src/settings.h ) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/src/main.cpp b/src/main.cpp index 2b0b55d..1374798 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,7 @@ #include #include #include -#include "queue.h" +#include "message_queue.h" #include "settings.h" int main(int argc, char* argv[]) { @@ -36,10 +36,10 @@ int main(int argc, char* argv[]) { bot.on_log(dpp::utility::cout_logger()); - bot::queue queue; - std::thread queue_loop(&bot::queue::run, &queue, &bot, &settings); + bot::message_queue message_queue; + std::thread message_queue_loop(&bot::message_queue::run, &message_queue, &bot, &settings); - bot.on_message_create([&bot, &queue, &settings](const dpp::message_create_t &event) { + bot.on_message_create([&bot, &message_queue, &settings](const dpp::message_create_t &event) { if (event.msg.author.is_bot()) return; @@ -55,7 +55,7 @@ int main(int argc, char* argv[]) { message.webhook = channel->webhook; message.source = channel->source; message.target = channel->target; - queue.add(message); + message_queue.add(message); } } settings.unlock(); diff --git a/src/queue.cpp b/src/message_queue.cpp similarity index 94% rename from src/queue.cpp rename to src/message_queue.cpp index 3ab5e71..58a3147 100644 --- a/src/queue.cpp +++ b/src/message_queue.cpp @@ -18,18 +18,18 @@ #include #include -#include "queue.h" +#include "message_queue.h" #include "settings.h" using namespace std::chrono_literals; -void bot::queue::add(const bot::message &message) +void bot::message_queue::add(const bot::message &message) { m_mutex.lock(); m_queue.push_back(message); m_mutex.unlock(); } -void bot::queue::run(dpp::cluster *bot, bot::settings::settings *settings) +void bot::message_queue::run(dpp::cluster *bot, bot::settings::settings *settings) { while (true) { m_mutex.lock(); diff --git a/src/queue.h b/src/message_queue.h similarity index 93% rename from src/queue.h rename to src/message_queue.h index 07b2fa8..f608ff9 100644 --- a/src/queue.h +++ b/src/message_queue.h @@ -16,8 +16,8 @@ * responsible for anything with use of the software, you are self responsible. *****************************************************************************/ -#ifndef QUEUE_H -#define QUEUE_H +#ifndef MESSAGE_QUEUE_H +#define MESSAGE_QUEUE_H #include #include #include @@ -36,7 +36,7 @@ namespace bot { std::string target; }; - class queue { + class message_queue { public: void add(const bot::message &message); void run(dpp::cluster *bot, bot::settings::settings *settings); @@ -47,4 +47,4 @@ namespace bot { }; } -#endif //QUEUE_H +#endif //MESSAGE_QUEUE_H diff --git a/src/settings.cpp b/src/settings.cpp index d15b2f7..1a5ea3e 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -17,6 +17,7 @@ *****************************************************************************/ #include +#include #include #include "settings.h" @@ -76,84 +77,87 @@ bool bot::settings::settings::parse(const std::string &filename) return false; } - m_mutex.lock(); - m_token = json_token.value(); + const std::lock_guard guard(m_mutex); + try { + m_token = json_token.value(); - auto json_translate = json.find("translate"); - if (json_translate == json.end()) { - std::cerr << "Translate settings can not be found" << std::endl; - m_mutex.unlock(); - return false; - } + auto json_translate = json.find("translate"); + if (json_translate == json.end()) { + std::cerr << "Translate settings can not be found" << std::endl; + return false; + } - auto json_translate_hostname = json_translate.value().find("hostname"); - if (json_translate_hostname == json_translate.value().end()) { - std::cerr << "\"hostname\" can not be found in Translate settings" << std::endl; - m_mutex.unlock(); - return false; - } - m_translate_settings.hostname = json_translate_hostname.value(); + auto json_translate_hostname = json_translate.value().find("hostname"); + if (json_translate_hostname == json_translate.value().end()) { + std::cerr << "\"hostname\" can not be found in Translate settings" << std::endl; + return false; + } + m_translate_settings.hostname = json_translate_hostname.value(); - auto json_translate_port = json_translate.value().find("port"); - if (json_translate_port == json_translate.value().end()) { - std::cerr << "\"port\" can not be found in Translate settings" << std::endl; - m_mutex.unlock(); - return false; - } - m_translate_settings.port = json_translate_port.value(); + auto json_translate_port = json_translate.value().find("port"); + if (json_translate_port == json_translate.value().end()) { + std::cerr << "\"port\" can not be found in Translate settings" << std::endl; + return false; + } + m_translate_settings.port = json_translate_port.value(); - auto json_translate_url = json_translate.value().find("url"); - if (json_translate_url == json_translate.value().end()) { - std::cerr << "\"url\" can not be found in Translate settings" << std::endl; - m_mutex.unlock(); - return false; - } - m_translate_settings.url = json_translate_url.value(); + auto json_translate_url = json_translate.value().find("url"); + if (json_translate_url == json_translate.value().end()) { + std::cerr << "\"url\" can not be found in Translate settings" << std::endl; + return false; + } + m_translate_settings.url = json_translate_url.value(); - auto json_translate_tls = json_translate.value().find("tls"); - if (json_translate_tls != json_translate.value().end()) - m_translate_settings.tls = json_translate_tls.value(); - else - m_translate_settings.tls = false; + auto json_translate_tls = json_translate.value().find("tls"); + if (json_translate_tls != json_translate.value().end()) + m_translate_settings.tls = json_translate_tls.value(); + else + m_translate_settings.tls = false; - auto json_translate_apiKey = json_translate.value().find("apiKey"); - if (json_translate_apiKey != json_translate.value().end()) - m_translate_settings.apiKey = json_translate_apiKey.value(); - else - m_translate_settings.apiKey.clear(); + auto json_translate_apiKey = json_translate.value().find("apiKey"); + if (json_translate_apiKey != json_translate.value().end()) + m_translate_settings.apiKey = json_translate_apiKey.value(); + else + m_translate_settings.apiKey.clear(); - auto json_guilds = json.find("guilds"); - if (json_guilds != json.end()) { - for (auto json_guild = json_guilds.value().begin(); json_guild != json_guilds.value().end(); json_guild++) { - if (json_guild.value().is_object()) { - bot::settings::guild guild; - guild.id = std::stoull(json_guild.key()); - for (auto json_channel = json_guild.value().begin(); json_channel != json_guild.value().end(); json_channel++) { - bot::settings::channel channel; - channel.id = std::stoull(json_channel.key()); + auto json_guilds = json.find("guilds"); + if (json_guilds != json.end()) { + for (auto json_guild = json_guilds.value().begin(); json_guild != json_guilds.value().end(); json_guild++) { + if (json_guild.value().is_object()) { + bot::settings::guild guild; + guild.id = std::stoull(json_guild.key()); + for (auto json_channel = json_guild.value().begin(); json_channel != json_guild.value().end(); json_channel++) { + bot::settings::channel channel; + channel.id = std::stoull(json_channel.key()); - auto json_channel_source = json_channel.value().find("source"); - if (json_channel_source != json_channel.value().end()) - channel.source = json_channel_source.value(); + auto json_channel_source = json_channel.value().find("source"); + if (json_channel_source != json_channel.value().end()) + channel.source = json_channel_source.value(); - auto json_channel_target = json_channel.value().find("target"); - if (json_channel_target != json_channel.value().end()) - channel.target = json_channel_target.value(); + auto json_channel_target = json_channel.value().find("target"); + if (json_channel_target != json_channel.value().end()) + channel.target = json_channel_target.value(); - auto json_channel_webhook = json_channel.value().find("webhook"); - if (json_channel_webhook != json_channel.value().end()) - channel.webhook = json_channel_webhook.value(); + auto json_channel_webhook = json_channel.value().find("webhook"); + if (json_channel_webhook != json_channel.value().end()) + channel.webhook = json_channel_webhook.value(); - if (!channel.source.empty() && !channel.target.empty() && !channel.webhook.empty()) - guild.channel.push_back(channel); + if (!channel.source.empty() && !channel.target.empty() && !channel.webhook.empty()) + guild.channel.push_back(channel); + } + m_guilds.push_back(guild); } - m_guilds.push_back(guild); } } + return true; } - - m_mutex.unlock(); - return true; + catch (const std::exception &exception) { + std::cerr << "Exception thrown while parsing configuration: " << exception.what() << std::endl; + } + catch (...) { + std::cerr << "Exception thrown while parsing configuration: unknown" << std::endl; + } + return false; } void bot::settings::settings::unlock() diff --git a/src/settings.h b/src/settings.h index 34c0802..187aceb 100644 --- a/src/settings.h +++ b/src/settings.h @@ -20,6 +20,7 @@ #define SETTINGS_H #include #include +#include #include namespace bot {