Syping/dtranslatebot
1
0
Fork 0
mirror of https://github.com/Syping/dtranslatebot.git synced 2024-11-21 21:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

add DTRANSLATEBOT_TOKEN env value, small fixes

Browse source
This commit is contained in:
Syping 2024-02-26 09:41:55 +01:00
parent 531c24b050
commit 5191dcbefc
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/FindDPP.cmake
View file

@ -1,4 +1,4 @@
find_path(DPP_INCLUDE_DIR NAMES dpp/dpp.h HINTS ${DPP_ROOT_DIR}) find_path(DPP_INCLUDE_DIR NAMES "dpp/dpp.h" HINTS "${DPP_ROOT_DIR}")
find_library(DPP_LIBRARIES NAMES dpp "libdpp.a" HINTS ${DPP_ROOT_DIR}) find_library(DPP_LIBRARIES NAMES "dpp" "libdpp.a" HINTS "${DPP_ROOT_DIR}")
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(DPP DEFAULT_MSG DPP_LIBRARIES DPP_INCLUDE_DIR) find_package_handle_standard_args(DPP DEFAULT_MSG DPP_LIBRARIES DPP_INCLUDE_DIR)

2
src/main.cpp
View file

@ -39,7 +39,7 @@ int main(int argc, char* argv[]) {
std::cout << "[Launch] Requesting supported languages..." << std::endl; std::cout << "[Launch] Requesting supported languages..." << std::endl;
if (settings.get_translator()->get_languages().empty()) { if (settings.get_translator()->get_languages().empty()) {
std::cerr << "[Error] Failed to initialise translateable languages" << std::endl; std::cerr << "[Error] Failed to initialise translateable languages" << std::endl;
return 2; return 1;
} }
dpp::cluster bot(settings.token(), dpp::i_default_intents | dpp::i_message_content); dpp::cluster bot(settings.token(), dpp::i_default_intents | dpp::i_message_content);

17
src/settings.cpp
View file

@ -455,21 +455,24 @@ bool settings::parse(const std::string &data, bool initialize)
return false; return false;
} }
const std::lock_guard<std::recursive_mutex> guard(m_mutex);
auto json_token = json.find("token"); auto json_token = json.find("token");
if (json_token == json.end()) { if (json_token != json.end())
std::cerr << "[Error] Value token not found" << std::endl; m_token = *json_token;
else if (char *token = getenv("DTRANSLATEBOT_TOKEN"))
m_token = token;
if (m_token.empty()) {
std::cerr << "[Error] Discord Bot Token is not configured" << std::endl;
return false; return false;
} }
const std::lock_guard<std::recursive_mutex> guard(m_mutex);
m_token = *json_token;
std::filesystem::path storage_path; std::filesystem::path storage_path;
auto json_storage = json.find("storage"); auto json_storage = json.find("storage");
if (json_storage != json.end()) if (json_storage != json.end())
storage_path = std::string(*json_storage); storage_path = std::string(*json_storage);
else if (char *storagepath = getenv("DTRANSLATEBOT_STORAGE")) else if (char *storagepath = getenv("DTRANSLATEBOT_STORAGE"))
storage_path = storagepath; storage_path = storagepath;
if (storage_path.empty()) if (storage_path.empty())
storage_path = std::filesystem::current_path(); storage_path = std::filesystem::current_path();
@ -484,8 +487,6 @@ bool settings::parse(const std::string &data, bool initialize)
if (!process_translator_settings(*json_translator, &m_translator)) if (!process_translator_settings(*json_translator, &m_translator))
return false; return false;
m_avatarSize = 256;
auto json_guilds = json.find("guilds"); auto json_guilds = json.find("guilds");
if (json_guilds != json.end() && json_guilds->is_object()) if (json_guilds != json.end() && json_guilds->is_object())
process_guild_settings(*json_guilds, &m_guilds, &m_webhookIds); process_guild_settings(*json_guilds, &m_guilds, &m_webhookIds);

4
src/settings.h
View file

@ -61,8 +61,8 @@ namespace bot {
private: private:
mutable std::recursive_mutex m_mutex; mutable std::recursive_mutex m_mutex;
size_t m_externallyLockedCount; size_t m_externallyLockedCount = 0;
uint16_t m_avatarSize; uint16_t m_avatarSize = 256;
std::shared_ptr<bot::database::database> m_database; std::shared_ptr<bot::database::database> m_database;
std::vector<guild> m_guilds; std::vector<guild> m_guilds;
std::vector<std::string> m_prefLangs; std::vector<std::string> m_prefLangs;