summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--components/ratelimitindicator.cpp5
-rw-r--r--discord/discord.cpp2
-rw-r--r--discord/store.cpp2
3 files changed, 6 insertions, 3 deletions
diff --git a/components/ratelimitindicator.cpp b/components/ratelimitindicator.cpp
index 6115900..708ab34 100644
--- a/components/ratelimitindicator.cpp
+++ b/components/ratelimitindicator.cpp
@@ -124,7 +124,10 @@ void RateLimitIndicator::OnMessageSendFail(const std::string &nonce, float retry
}
void RateLimitIndicator::OnChannelUpdate(Snowflake channel_id) {
- const auto r = Abaddon::Get().GetDiscordClient().GetChannel(channel_id)->RateLimitPerUser;
+ if (channel_id != m_active_channel) return;
+ const auto chan = Abaddon::Get().GetDiscordClient().GetChannel(m_active_channel);
+ if (!chan.has_value()) return;
+ const auto r = chan->RateLimitPerUser;
if (r.has_value())
m_rate_limit = *r;
else
diff --git a/discord/discord.cpp b/discord/discord.cpp
index 7e61f54..7a33c05 100644
--- a/discord/discord.cpp
+++ b/discord/discord.cpp
@@ -494,7 +494,7 @@ void DiscordClient::SendThreadLazyLoad(Snowflake id) {
}
void DiscordClient::JoinGuild(std::string code) {
- m_http.MakePOST("/invites/" + code, "", [](auto) {});
+ m_http.MakePOST("/invites/" + code, "{}", [](auto) {});
}
void DiscordClient::LeaveGuild(Snowflake id) {
diff --git a/discord/store.cpp b/discord/store.cpp
index 57cfe73..bc73f67 100644
--- a/discord/store.cpp
+++ b/discord/store.cpp
@@ -1223,7 +1223,7 @@ bool Store::CreateStatements() {
)";
const char *get_msg_ids = R"(
- SELECT id FROM messages WHERE channel_id = ? ORDER BY id ASC
+ SELECT id FROM messages WHERE channel_id = ? AND pending = 0 ORDER BY id ASC
)";
const char *get_pins = R"(