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

fix webhook messages not using right username + avatar (fixes #209)

Browse Source
This commit is contained in:
ouwou
2023-08-28 21:47:04 -04:00
parent 9724023758
commit 36f2ec0996
10 changed files with 164 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/discord/store.cpp
View File

@@ -57,6 +57,20 @@ void Store::SetBan(Snowflake guild_id, Snowflake user_id, const BanData &ban) {
s->Reset();
}
void Store::SetWebhookMessage(const Message &message) {
auto &s = m_stmt_set_webhook_msg;
s->Bind(1, message.ID);
s->Bind(2, message.WebhookID);
s->Bind(3, message.Author.Username);
s->Bind(4, message.Author.Avatar);
if (!s->Insert())
fprintf(stderr, "webhook message insert failed for %" PRIu64 ": %s\n", static_cast<uint64_t>(message.ID), m_db.ErrStr());
s->Reset();
}
void Store::SetChannel(Snowflake id, const ChannelData &chan) {
auto &s = m_stmt_set_chan;
@@ -483,6 +497,29 @@ std::vector<BanData> Store::GetBans(Snowflake guild_id) const {
return ret;
}
std::optional<WebhookMessageData> Store::GetWebhookMessage(Snowflake message_id) const {
auto &s = m_stmt_get_webhook_msg;
s->Bind(1, message_id);
if (!s->FetchOne()) {
if (m_db.Error() != SQLITE_DONE)
fprintf(stderr, "error while fetching webhook message %" PRIu64 ": %s\n", static_cast<uint64_t>(message_id), m_db.ErrStr());
s->Reset();
return {};
}
WebhookMessageData data;
s->Get(0, data.MessageID);
s->Get(1, data.WebhookID);
s->Get(2, data.Username);
s->Get(3, data.Avatar);
s->Reset();
return data;
}
Snowflake Store::GetGuildOwner(Snowflake guild_id) const {
auto &s = m_stmt_get_guild_owner;
@@ -1503,6 +1540,15 @@ bool Store::CreateTables() {
)
)";
const char *create_webhook_messages = R"(
CREATE TABLE IF NOT EXISTS webhook_messages (
message_id INTEGER NOT NULL,
webhook_id INTEGER NOT NULL,
username TEXT,
avatar TEXT
)
)";
if (m_db.Execute(create_users) != SQLITE_OK) {
fprintf(stderr, "failed to create user table: %s\n", m_db.ErrStr());
return false;
@@ -1608,6 +1654,11 @@ bool Store::CreateTables() {
return false;
}
if (m_db.Execute(create_webhook_messages) != SQLITE_OK) {
fprintf(stderr, "failed to create webhook messages table: %s\n", m_db.ErrStr());
return false;
}
if (m_db.Execute(R"(
CREATE TRIGGER remove_zero_reactions AFTER UPDATE ON reactions WHEN new.count = 0
BEGIN
@@ -2288,6 +2339,24 @@ bool Store::CreateStatements() {
return false;
}
m_stmt_set_webhook_msg = std::make_unique<Statement>(m_db, R"(
REPLACE INTO webhook_messages VALUES (
?, ?, ?, ?
)
)");
if (!m_stmt_set_webhook_msg->OK()) {
fprintf(stderr, "failed to prepare set webhook message statement: %s\n", m_db.ErrStr());
return false;
}
m_stmt_get_webhook_msg = std::make_unique<Statement>(m_db, R"(
SELECT * FROM webhook_messages WHERE message_id = ?
)");
if (!m_stmt_get_webhook_msg->OK()) {
fprintf(stderr, "failed to prepare get webhook message statement: %s\n", m_db.ErrStr());
return false;
}
return true;
}