diff --git a/src/main.cpp b/src/main.cpp index 9c28a64..4d227bb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,19 +36,19 @@ int main(int argc, char* argv[]) { return 1; if (settings.get_translator()->get_languages().empty()) { - std::cerr << "[dtranslatebot] [ERROR] Failed to initialise translateable languages" << std::endl; + std::cerr << "[Error] Failed to initialise translateable languages" << std::endl; return 2; } if (!std::filesystem::exists(settings.storage_path())) { - std::cerr << "[dtranslatebot] [ERROR] Storage directory " << settings.storage_path() << " can not be found" << std::endl; + std::cerr << "[Error] Storage directory " << settings.storage_path() << " can not be found" << std::endl; return 2; } dpp::cluster bot(settings.token(), dpp::i_default_intents | dpp::i_message_content); bot.on_log([&bot](const dpp::log_t &event){ - std::cerr << "[dtranslatebot] [LOG] " << event.message << std::endl; + std::cerr << "[Log] " << event.message << std::endl; }); bot::submit_queue submit_queue; diff --git a/src/settings.cpp b/src/settings.cpp index 5008229..96d34e4 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -96,7 +96,7 @@ void process_preflang_settings(const dpp::json &json, std::vector * { for (auto json_preferred_lang = json.begin(); json_preferred_lang != json.end(); json_preferred_lang++) { if (std::distance(json.begin(), json_preferred_lang) >= 25) { - std::cerr << "[dtranslatebot] [ERROR] preferred_lang is limited to 25 languages" << std::endl; + std::cerr << "[Error] Value preferred_lang is limited to 25 languages" << std::endl; break; } preferred_langs->push_back(*json_preferred_lang); @@ -113,34 +113,32 @@ void process_user_settings(const dpp::json &json, uint16_t *avatar_size) else if (*avatar_size > 4096) *avatar_size = 4096; } - else - *avatar_size = 256; } bool process_translator_settings(const dpp::json &json, translator *translator) { if (!json.is_object()) { - std::cerr << "[dtranslatebot] [ERROR] Translator settings needs to be in a object" << std::endl; + std::cerr << "[Error] Value translator needs to be a object" << std::endl; return false; } auto json_translate_hostname = json.find("hostname"); if (json_translate_hostname == json.end()) { - std::cerr << "[dtranslatebot] [ERROR] hostname can not be found in Translator settings" << std::endl; + std::cerr << "[Error] Value hostname not found in translator object" << std::endl; return false; } translator->hostname = *json_translate_hostname; auto json_translate_port = json.find("port"); if (json_translate_port == json.end()) { - std::cerr << "[dtranslatebot] [ERROR] port can not be found in Translator settings" << std::endl; + std::cerr << "[Error] Value port not found in translator object" << std::endl; return false; } translator->port = *json_translate_port; auto json_translate_url = json.find("url"); if (json_translate_url == json.end()) { - std::cerr << "[dtranslatebot] [ERROR] url can not be found in Translate settings" << std::endl; + std::cerr << "[Error] Value url not found in translator object" << std::endl; return false; } translator->url = *json_translate_url; @@ -210,7 +208,7 @@ const channel* settings::get_channel(const guild *guild, dpp::snowflake channel_ { if (!m_externallyLockedCount) { #ifndef NDEBUG - std::cerr << "[DEBUG] settings::get_channel(const guild*, dpp::snowflake) have being called without settings being locked." << std::endl; + std::cerr << "[Debug] settings::get_channel(const guild*, dpp::snowflake) have being called without settings being locked." << std::endl; #endif return nullptr; } @@ -225,7 +223,7 @@ const channel* settings::get_channel(dpp::snowflake guild_id, dpp::snowflake cha { if (!m_externallyLockedCount) { #ifndef NDEBUG - std::cerr << "[DEBUG] settings::get_channel(dpp::snowflake, dpp::snowflake) have being called without settings being locked." << std::endl; + std::cerr << "[Debug] settings::get_channel(dpp::snowflake, dpp::snowflake) have being called without settings being locked." << std::endl; #endif return nullptr; } @@ -245,7 +243,7 @@ const guild* settings::get_guild(dpp::snowflake guild_id) const { if (!m_externallyLockedCount) { #ifndef NDEBUG - std::cerr << "[DEBUG] settings::get_guild(dpp::snowflake) have being called without settings being locked." << std::endl; + std::cerr << "[Debug] settings::get_guild(dpp::snowflake) have being called without settings being locked." << std::endl; #endif return nullptr; } @@ -306,14 +304,14 @@ bool settings::parse(const std::string &data) json = dpp::json::parse(data); } catch (const std::exception &exception) { - std::cerr << "[dtranslatebot] [EXCEPTION] " << exception.what() << std::endl; - std::cerr << "[dtranslatebot] [ERROR] Exception while parsing JSON" << std::endl; + std::cerr << "[Exception] " << exception.what() << std::endl; + std::cerr << "[Error] Exception while parsing JSON" << std::endl; return false; } auto json_token = json.find("token"); if (json_token == json.end()) { - std::cerr << "[dtranslatebot] [ERROR] Bot token can not be found" << std::endl; + std::cerr << "[Error] Value token not found" << std::endl; return false; } @@ -331,7 +329,7 @@ bool settings::parse(const std::string &data) auto json_translator = json.find("translator"); if (json_translator == json.end()) { - std::cerr << "[dtranslatebot] [ERROR] Translator settings can not be found" << std::endl; + std::cerr << "[Error] Value translator not found" << std::endl; return false; } if (!process_translator_settings(*json_translator, &m_translator)) @@ -357,7 +355,7 @@ bool settings::parse(const std::string &data) return true; } catch (const std::exception &exception) { - std::cerr << "[dtranslatebot] [EXCEPTION] " << exception.what() << std::endl; + std::cerr << "[Exception] " << exception.what() << std::endl; } return false; } @@ -366,7 +364,7 @@ bool settings::parse_file(const std::string &filename) { std::ifstream ifs(filename, std::ios::in | std::ios::binary); if (!ifs.is_open()) { - std::cerr << "[dtranslatebot] [ERROR] Failed to open JSON configuration file located at " << filename << std::endl; + std::cerr << "[Error] Failed to open JSON configuration file located at " << filename << std::endl; return false; } diff --git a/src/slashcommands.cpp b/src/slashcommands.cpp index 7612911..8f0fa49 100644 --- a/src/slashcommands.cpp +++ b/src/slashcommands.cpp @@ -115,7 +115,7 @@ void bot::slashcommands::process_translate_command(dpp::cluster *bot, bot::setti } } catch (const std::exception &exception) { - std::cerr << "[dtranslatebot] Exception: " << exception.what() << std::endl; + std::cerr << "[Exception] " << exception.what() << std::endl; event.reply(dpp::message("Exception while processing command:\n"s + exception.what()).set_flags(dpp::m_ephemeral)); } } diff --git a/src/translator_core.cpp b/src/translator_core.cpp index caa0828..d32d544 100644 --- a/src/translator_core.cpp +++ b/src/translator_core.cpp @@ -33,7 +33,7 @@ translator::~translator() const std::vector translator::get_languages() { #ifndef NDEBUG - std::cerr << "[DEBUG] translator::get_languages() have being called." << std::endl; + std::cerr << "[Debug] translator::get_languages() have being called." << std::endl; #endif return {}; } @@ -41,7 +41,7 @@ const std::vector translator::get_languages() const std::string translator::translate(const std::string &text, const std::string &source, const std::string &target) { #ifndef NDEBUG - std::cerr << "[DEBUG] translator:translate(const std::string&, const std::string&, const std::string&) have being called." << std::endl; + std::cerr << "[Debug] translator:translate(const std::string&, const std::string&, const std::string&) have being called." << std::endl; #endif return {}; } diff --git a/src/translator_libretranslate.cpp b/src/translator_libretranslate.cpp index 56240fc..14995dd 100644 --- a/src/translator_libretranslate.cpp +++ b/src/translator_libretranslate.cpp @@ -60,7 +60,7 @@ const std::vector libretranslate::get_languages() } } catch (const std::exception &exception) { - std::cerr << "[dtranslatebot] [EXCEPTION] " << exception.what() << std::endl; + std::cerr << "[Exception] " << exception.what() << std::endl; } return languages; @@ -94,7 +94,7 @@ const std::string libretranslate::translate(const std::string &text, const std:: } } catch (const std::exception &exception) { - std::cerr << "[dtranslatebot] [EXCEPTION] " << exception.what() << std::endl; + std::cerr << "[Exception] " << exception.what() << std::endl; } return text; diff --git a/src/webhook_push.cpp b/src/webhook_push.cpp index 3179845..8c0fb8c 100644 --- a/src/webhook_push.cpp +++ b/src/webhook_push.cpp @@ -79,7 +79,7 @@ void bot::webhook_push::push_request(dpp::snowflake webhook_id, const std::strin std::future _f = _p.get_future(); bot->post_rest(API_PATH "/webhooks", std::to_string(webhook_id), dpp::utility::url_encode(webhook_token), dpp::m_post, json, [bot, &_p](dpp::json &json, const dpp::http_request_completion_t &event) { if (event.status != 204) - std::cerr << "[dtranslatebot] [WARNING] Webhook push returned unexpected code " << event.status << std::endl; + std::cerr << "[Warning] Webhook push returned unexpected code " << event.status << std::endl; _p.set_value(event); }); _f.wait();