Syping/dtranslatebot
1
0
Fork 0
mirror of https://github.com/Syping/dtranslatebot.git synced 2025-09-11 11:16:38 +02: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
Download patch file Download diff file Expand all files Collapse all files

17
src/settings.cpp
View file

@ -455,21 +455,24 @@ bool settings::parse(const std::string &data, bool initialize)
return false;
}
const std::lock_guard<std::recursive_mutex> guard(m_mutex);
auto json_token = json.find("token");
if (json_token == json.end()) {
std::cerr << "[Error] Value token not found" << std::endl;
if (json_token != json.end())
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;
}
const std::lock_guard<std::recursive_mutex> guard(m_mutex);
m_token = *json_token;
std::filesystem::path storage_path;
auto json_storage = json.find("storage");
if (json_storage != json.end())
storage_path = std::string(*json_storage);
else if (char *storagepath = getenv("DTRANSLATEBOT_STORAGE"))
storage_path = storagepath;
storage_path = storagepath;
if (storage_path.empty())
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))
return false;
m_avatarSize = 256;
auto json_guilds = json.find("guilds");
if (json_guilds != json.end() && json_guilds->is_object())
process_guild_settings(*json_guilds, &m_guilds, &m_webhookIds);