re-add suppport for static (a)png stickers

5 files changed, 52 insertions, 7 deletions

diff --git a/discord/message.cpp b/discord/message.cpp
index b072ba8..70c557d 100644
--- a/discord/message.cpp
+++ b/discord/message.cpp
@@ -218,6 +218,7 @@ void from_json(const nlohmann::json &j, Message &m) {
             m.ReferencedMessage = nullptr;
     }
     JS_O("interaction", m.Interaction);
+    JS_O("sticker_items", m.StickerItems);
 }
 
 void Message::from_json_edited(const nlohmann::json &j) {
@@ -244,6 +245,7 @@ void Message::from_json_edited(const nlohmann::json &j) {
     JS_O("flags", Flags);
     JS_O("stickers", Stickers);
     JS_O("interaction", Interaction);
+    JS_O("sticker_items", StickerItems);
 }
 
 void Message::SetDeleted() {
diff --git a/discord/message.hpp b/discord/message.hpp
index e24f248..a6ea039 100644
--- a/discord/message.hpp
+++ b/discord/message.hpp
@@ -199,6 +199,7 @@ struct Message {
     std::optional<std::vector<StickerData>> Stickers;
     std::optional<std::shared_ptr<Message>> ReferencedMessage; // has_value && null means deleted
     std::optional<MessageInteractionData> Interaction;
+    std::optional<std::vector<StickerItem>> StickerItems;
 
     friend void from_json(const nlohmann::json &j, Message &m);
     void from_json_edited(const nlohmann::json &j); // for MESSAGE_UPDATE
diff --git a/discord/sticker.cpp b/discord/sticker.cpp
index 8e50a47..b92d031 100644
--- a/discord/sticker.cpp
+++ b/discord/sticker.cpp
@@ -30,3 +30,23 @@ std::string StickerData::GetURL() const {
         return "https://media.discordapp.net/stickers/" + std::to_string(ID) + "/" + *AssetHash + ".json";
     return "";
 }
+
+void to_json(nlohmann::json &j, const StickerItem &m) {
+    j["id"] = m.ID;
+    j["name"] = m.Name;
+    j["format_type"] = m.FormatType;
+}
+
+void from_json(const nlohmann::json &j, StickerItem &m) {
+    JS_D("id", m.ID);
+    JS_D("name", m.Name);
+    JS_D("format_type", m.FormatType);
+}
+
+std::string StickerItem::GetURL() const {
+    if (FormatType == StickerFormatType::PNG || FormatType == StickerFormatType::APNG)
+        return "https://media.discordapp.net/stickers/" + std::to_string(ID) + ".png?size=256";
+    else if (FormatType == StickerFormatType::LOTTIE)
+        return "https://media.discordapp.net/stickers/" + std::to_string(ID) + ".json";
+    return "";
+}
diff --git a/discord/sticker.hpp b/discord/sticker.hpp
index 89279b3..d23fe7b 100644
--- a/discord/sticker.hpp
+++ b/discord/sticker.hpp
@@ -27,3 +27,14 @@ struct StickerData {
 
     std::string GetURL() const;
 };
+
+struct StickerItem {
+    StickerFormatType FormatType;
+    Snowflake ID;
+    std::string Name;
+
+    friend void to_json(nlohmann::json &j, const StickerItem &m);
+    friend void from_json(const nlohmann::json &j, StickerItem &m);
+
+    std::string GetURL() const;
+};
diff --git a/discord/store.cpp b/discord/store.cpp
index fc40108..2439da5 100644
--- a/discord/store.cpp
+++ b/discord/store.cpp
@@ -264,6 +264,12 @@ void Store::SetMessage(Snowflake id, const Message &message) {
     Bind(m_set_msg_stmt, 23, message.IsPending);
     Bind(m_set_msg_stmt, 24, message.Nonce); // sorry
 
+    if (message.StickerItems.has_value()) {
+        std::string tmp = nlohmann::json(*message.StickerItems).dump();
+        Bind(m_set_msg_stmt, 25, tmp);
+    } else
+        Bind(m_set_msg_stmt, 25, nullptr);
+
     if (!RunInsert(m_set_msg_stmt))
         fprintf(stderr, "message insert failed: %s\n", sqlite3_errstr(m_db_err));
 
@@ -369,14 +375,18 @@ Message Store::GetMessageBound(sqlite3_stmt *stmt) const {
     Get(stmt, 22, ret.IsPending);
     Get(stmt, 23, ret.Nonce);
 
+    Get(stmt, 24, tmps);
+    if (tmps != "")
+        ret.StickerItems = nlohmann::json::parse(tmps).get<std::vector<StickerItem>>();
+
     // interaction data from join
 
-    if (!IsNull(stmt, 24)) {
+    if (!IsNull(stmt, 25)) {
         auto &interaction = ret.Interaction.emplace();
-        Get(stmt, 24, interaction.ID);
-        Get(stmt, 25, interaction.Name);
-        Get(stmt, 26, interaction.Type);
-        Get(stmt, 27, interaction.User.ID);
+        Get(stmt, 25, interaction.ID);
+        Get(stmt, 26, interaction.Name);
+        Get(stmt, 27, interaction.Type);
+        Get(stmt, 28, interaction.User.ID);
     }
 
     Reset(stmt);
@@ -837,7 +847,8 @@ bool Store::CreateTables() {
             deleted BOOL, /* extra */
             edited BOOL, /* extra */
             pending BOOL, /* extra */
-            nonce TEXT
+            nonce TEXT,
+            sticker_items TEXT /* json */
         )
     )";
 
@@ -1056,7 +1067,7 @@ bool Store::CreateStatements() {
 
     const char *set_msg = R"(
         REPLACE INTO messages VALUES (
-            ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+            ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
         )
     )";