celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-27 16:16:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

update rate limit indicator on failed message send

Browse Source 
this happens when you start the client while already rate-limited
This commit is contained in:
ouwou
2021-04-14 02:11:36 -04:00
parent 9a7a468607
commit 9733ae54c3
8 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
discord/discord.cpp
View File

@@ -353,7 +353,16 @@ bool DiscordClient::CanManageMember(Snowflake guild_id, Snowflake actor, Snowfla
void DiscordClient::ChatMessageCallback(std::string nonce, const http::response_type &response) {
if (!CheckCode(response)) {
m_signal_message_send_fail.emit(nonce);
if (response.status_code == http::TooManyRequests) {
try { // not sure if this body is guaranteed
RateLimitedResponse r = nlohmann::json::parse(response.text);
m_signal_message_send_fail.emit(nonce, r.RetryAfter);
} catch (...) {
m_signal_message_send_fail.emit(nonce, 0);
}
} else {
m_signal_message_send_fail.emit(nonce, 0);
}
}
}

4
discord/discord.hpp
View File

@@ -313,8 +313,8 @@ public:
typedef sigc::signal<void, GuildJoinRequestUpdateData> type_signal_guild_join_request_update;
typedef sigc::signal<void, GuildJoinRequestDeleteData> type_signal_guild_join_request_delete;
typedef sigc::signal<void, Message> type_signal_message_sent;
typedef sigc::signal<void, std::string> type_signal_message_send_fail;
typedef sigc::signal<void, bool, GatewayCloseCode> type_signal_disconnected; // bool true if reconnecting
typedef sigc::signal<void, std::string /* nonce */, float /* retry_after */> type_signal_message_send_fail; // retry after param will be 0 if it failed for a reason that isnt slowmode
typedef sigc::signal<void, bool, GatewayCloseCode> type_signal_disconnected; // bool true if reconnecting
typedef sigc::signal<void> type_signal_connected;
type_signal_gateway_ready signal_gateway_ready();

7
discord/objects.cpp
View File

@@ -444,3 +444,10 @@ void to_json(nlohmann::json &j, const VerificationGateInfoObject &m) {
JS_IF("version", m.Version);
JS_IF("enabled", m.Enabled);
}
void from_json(const nlohmann::json &j, RateLimitedResponse &m) {
JS_D("code", m.Code);
JS_D("global", m.Global);
JS_O("message", m.Message);
JS_D("retry_after", m.RetryAfter);
}

10
discord/objects.hpp
View File

@@ -615,3 +615,13 @@ struct VerificationGateInfoObject {
friend void from_json(const nlohmann::json &j, VerificationGateInfoObject &m);
friend void to_json(nlohmann::json &j, const VerificationGateInfoObject &m);
};
// not sure what the structure for this really is
struct RateLimitedResponse {
int Code;
bool Global;
std::optional<std::string> Message;
float RetryAfter;
friend void from_json(const nlohmann::json &j, RateLimitedResponse &m);
};