Merge branch 'master' into disk-cache

This commit is contained in:
ouwou
2020-11-28 02:16:59 -05:00
9 changed files with 51 additions and 15 deletions

View File

@@ -20,6 +20,11 @@ Abaddon::Abaddon()
, m_discord(m_settings.GetSettingBool("discord", "memory_db", false)) { // stupid but easy
LoadFromSettings();
// todo: set user agent for non-client(?)
std::string ua = m_settings.GetSettingString("http", "user_agent", "");
if (ua != "")
m_discord.SetUserAgent(ua);
m_discord.signal_gateway_ready().connect(sigc::mem_fun(*this, &Abaddon::DiscordOnReady));
m_discord.signal_message_create().connect(sigc::mem_fun(*this, &Abaddon::DiscordOnMessageCreate));
m_discord.signal_message_delete().connect(sigc::mem_fun(*this, &Abaddon::DiscordOnMessageDelete));