forked from OpenGamers/abaddon
set user-agent through ini
This commit is contained in:
parent
1463d8da9e
commit
ae77bfd1d1
|
@ -19,6 +19,11 @@ Abaddon::Abaddon()
|
|||
, m_emojis("res/emojis.bin") {
|
||||
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));
|
||||
|
|
|
@ -421,6 +421,11 @@ void DiscordClient::UpdateToken(std::string token) {
|
|||
}
|
||||
}
|
||||
|
||||
void DiscordClient::SetUserAgent(std::string agent) {
|
||||
m_http.SetUserAgent(agent);
|
||||
m_websocket.SetUserAgent(agent);
|
||||
}
|
||||
|
||||
void DiscordClient::HandleGatewayMessageRaw(std::string str) {
|
||||
// handles multiple zlib compressed messages, calling HandleGatewayMessage when a full message is received
|
||||
std::vector<uint8_t> buf(str.begin(), str.end());
|
||||
|
|
|
@ -112,6 +112,7 @@ public:
|
|||
std::optional<Snowflake> FindDM(Snowflake user_id); // wont find group dms
|
||||
|
||||
void UpdateToken(std::string token);
|
||||
void SetUserAgent(std::string agent);
|
||||
|
||||
private:
|
||||
static const constexpr int InflateChunkSize = 0x10000;
|
||||
|
|
|
@ -6,6 +6,10 @@ HTTPClient::HTTPClient(std::string api_base)
|
|||
m_dispatcher.connect(sigc::mem_fun(*this, &HTTPClient::RunCallbacks));
|
||||
}
|
||||
|
||||
void HTTPClient::SetUserAgent(std::string agent) {
|
||||
m_agent = agent;
|
||||
}
|
||||
|
||||
void HTTPClient::SetAuth(std::string auth) {
|
||||
m_authorization = auth;
|
||||
}
|
||||
|
@ -16,16 +20,18 @@ void HTTPClient::MakeDELETE(std::string path, std::function<void(cpr::Response r
|
|||
auto headers = cpr::Header {
|
||||
{ "Authorization", m_authorization },
|
||||
};
|
||||
auto ua = cpr::UserAgent {m_agent != "" ? m_agent : "Abaddon" };
|
||||
|
||||
#ifdef USE_LOCAL_PROXY
|
||||
m_futures.push_back(cpr::DeleteCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers,
|
||||
url, headers, ua,
|
||||
cpr::Proxies { { "http", "127.0.0.1:8888" }, { "https", "127.0.0.1:8888" } },
|
||||
cpr::VerifySsl { false }));
|
||||
#else
|
||||
m_futures.push_back(cpr::DeleteCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers));
|
||||
url, headers, ua));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -36,17 +42,19 @@ void HTTPClient::MakePATCH(std::string path, std::string payload, std::function<
|
|||
{ "Authorization", m_authorization },
|
||||
{ "Content-Type", "application/json" },
|
||||
};
|
||||
auto ua = cpr::UserAgent { m_agent != "" ? m_agent : "Abaddon" };
|
||||
|
||||
auto body = cpr::Body { payload };
|
||||
#ifdef USE_LOCAL_PROXY
|
||||
m_futures.push_back(cpr::PatchCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers, body,
|
||||
url, headers, body, ua,
|
||||
cpr::Proxies { { "http", "127.0.0.1:8888" }, { "https", "127.0.0.1:8888" } },
|
||||
cpr::VerifySsl { false }));
|
||||
#else
|
||||
m_futures.push_back(cpr::PatchCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers, body));
|
||||
url, headers, body, ua));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -57,17 +65,19 @@ void HTTPClient::MakePOST(std::string path, std::string payload, std::function<v
|
|||
{ "Authorization", m_authorization },
|
||||
{ "Content-Type", "application/json" },
|
||||
};
|
||||
auto ua = cpr::UserAgent { m_agent != "" ? m_agent : "Abaddon" };
|
||||
|
||||
auto body = cpr::Body { payload };
|
||||
#ifdef USE_LOCAL_PROXY
|
||||
m_futures.push_back(cpr::PostCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers, body,
|
||||
url, headers, body, ua,
|
||||
cpr::Proxies { { "http", "127.0.0.1:8888" }, { "https", "127.0.0.1:8888" } },
|
||||
cpr::VerifySsl { false }));
|
||||
#else
|
||||
m_futures.push_back(cpr::PostCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers, body));
|
||||
url, headers, body, ua));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -78,17 +88,19 @@ void HTTPClient::MakePUT(std::string path, std::string payload, std::function<vo
|
|||
{ "Authorization", m_authorization },
|
||||
{ "Content-Type", "application/json" },
|
||||
};
|
||||
auto ua = cpr::UserAgent { m_agent != "" ? m_agent : "Abaddon" };
|
||||
|
||||
auto body = cpr::Body { payload };
|
||||
#ifdef USE_LOCAL_PROXY
|
||||
m_futures.push_back(cpr::PutCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers, body,
|
||||
url, headers, body, ua,
|
||||
cpr::Proxies { { "http", "127.0.0.1:8888" }, { "https", "127.0.0.1:8888" } },
|
||||
cpr::VerifySsl { false }));
|
||||
#else
|
||||
m_futures.push_back(cpr::PutCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers, body));
|
||||
url, headers, body, ua));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -99,16 +111,19 @@ void HTTPClient::MakeGET(std::string path, std::function<void(cpr::Response r)>
|
|||
{ "Authorization", m_authorization },
|
||||
{ "Content-Type", "application/json" },
|
||||
};
|
||||
auto ua = cpr::UserAgent { m_agent != "" ? m_agent : "Abaddon" };
|
||||
|
||||
auto x = cpr::UserAgent {};
|
||||
#ifdef USE_LOCAL_PROXY
|
||||
m_futures.push_back(cpr::GetCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers,
|
||||
url, headers, ua,
|
||||
cpr::Proxies { { "http", "127.0.0.1:8888" }, { "https", "127.0.0.1:8888" } },
|
||||
cpr::VerifySsl { false }));
|
||||
#else
|
||||
m_futures.push_back(cpr::GetCallback(
|
||||
std::bind(&HTTPClient::OnResponse, this, std::placeholders::_1, cb),
|
||||
url, headers));
|
||||
url, headers, ua));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ class HTTPClient {
|
|||
public:
|
||||
HTTPClient(std::string api_base);
|
||||
|
||||
void SetUserAgent(std::string agent);
|
||||
void SetAuth(std::string auth);
|
||||
void MakeDELETE(std::string path, std::function<void(cpr::Response r)> cb);
|
||||
void MakeGET(std::string path, std::function<void(cpr::Response r)> cb);
|
||||
|
@ -32,4 +33,5 @@ private:
|
|||
std::vector<std::future<void>> m_futures;
|
||||
std::string m_api_base;
|
||||
std::string m_authorization;
|
||||
std::string m_agent;
|
||||
};
|
||||
|
|
|
@ -7,9 +7,14 @@ void Websocket::StartConnection(std::string url) {
|
|||
m_websocket.disableAutomaticReconnection();
|
||||
m_websocket.setUrl(url);
|
||||
m_websocket.setOnMessageCallback(std::bind(&Websocket::OnMessage, this, std::placeholders::_1));
|
||||
m_websocket.setExtraHeaders(ix::WebSocketHttpHeaders { { "User-Agent", m_agent } }); // idk if this actually works
|
||||
m_websocket.start();
|
||||
}
|
||||
|
||||
void Websocket::SetUserAgent(std::string agent) {
|
||||
m_agent = agent;
|
||||
}
|
||||
|
||||
void Websocket::Stop() {
|
||||
m_websocket.stop();
|
||||
}
|
||||
|
|
|
@ -11,6 +11,8 @@ public:
|
|||
Websocket();
|
||||
void StartConnection(std::string url);
|
||||
|
||||
void SetUserAgent(std::string agent);
|
||||
|
||||
void Send(const std::string &str);
|
||||
void Send(const nlohmann::json &j);
|
||||
void Stop();
|
||||
|
@ -21,6 +23,7 @@ private:
|
|||
void OnMessage(const ix::WebSocketMessagePtr &msg);
|
||||
|
||||
ix::WebSocket m_websocket;
|
||||
std::string m_agent;
|
||||
|
||||
public:
|
||||
typedef sigc::signal<void> type_signal_open;
|
||||
|
|
Loading…
Reference in New Issue
Block a user