diff --git a/src/providers/twitch/pubsub.cpp b/src/providers/twitch/pubsub.cpp index 710334df..e8af28b0 100644 --- a/src/providers/twitch/pubsub.cpp +++ b/src/providers/twitch/pubsub.cpp @@ -68,7 +68,7 @@ bool PubSubClient::listen(rapidjson::Document &message) rj::set(message, "nonce", uuid); - std::string payload = stringify(message); + std::string payload = rj::stringify(message); sentMessages[uuid.toStdString()] = payload; this->send(payload.c_str()); @@ -100,7 +100,7 @@ void PubSubClient::unlistenPrefix(const std::string &prefix) rj::set(message, "nonce", CreateUUID()); - std::string payload = stringify(message); + std::string payload = rj::stringify(message); sentMessages[uuid.toStdString()] = payload; this->send(payload.c_str()); @@ -747,7 +747,7 @@ void PubSub::handleMessageResponse(const rapidjson::Value &outerData) std::string moderationAction; if (!rj::getSafe(data, "moderation_action", moderationAction)) { - debug::Log("Missing moderation action in data: {}", stringify(data)); + debug::Log("Missing moderation action in data: {}", rj::stringify(data)); return; } diff --git a/src/providers/twitch/pubsubhelpers.cpp b/src/providers/twitch/pubsubhelpers.cpp index 658123ff..f27ac94d 100644 --- a/src/providers/twitch/pubsubhelpers.cpp +++ b/src/providers/twitch/pubsubhelpers.cpp @@ -34,11 +34,6 @@ bool getTargetUser(const rapidjson::Value &data, ActionUser &user) return rj::getSafe(data, "target_user_id", user.id); } -std::string stringify(const rapidjson::Value &v) -{ - return pajlada::Settings::SettingManager::stringify(v); -} - rapidjson::Document createListenMessage(const std::vector &topicsVec, std::shared_ptr account) { diff --git a/src/providers/twitch/pubsubhelpers.hpp b/src/providers/twitch/pubsubhelpers.hpp index 4d3d838c..60aa28e4 100644 --- a/src/providers/twitch/pubsubhelpers.hpp +++ b/src/providers/twitch/pubsubhelpers.hpp @@ -21,8 +21,6 @@ bool getCreatedByUser(const rapidjson::Value &data, ActionUser &user); bool getTargetUser(const rapidjson::Value &data, ActionUser &user); -std::string stringify(const rapidjson::Value &v); - rapidjson::Document createListenMessage(const std::vector &topicsVec, std::shared_ptr account); rapidjson::Document createUnlistenMessage(const std::vector &topicsVec); diff --git a/src/util/rapidjson-helpers.cpp b/src/util/rapidjson-helpers.cpp index 89c49f12..571b50f5 100644 --- a/src/util/rapidjson-helpers.cpp +++ b/src/util/rapidjson-helpers.cpp @@ -1,5 +1,7 @@ #include "util/rapidjson-helpers.hpp" +#include + namespace chatterino { namespace rj { @@ -15,5 +17,14 @@ void addMember(rapidjson::Value &obj, const char *key, rapidjson::Value &value, obj.AddMember(rapidjson::Value(key, a).Move(), value.Move(), a); } +std::string stringify(const rapidjson::Value &value) +{ + rapidjson::StringBuffer buffer; + rapidjson::Writer writer(buffer); + value.Accept(writer); + + return std::string(buffer.GetString()); +} + } // namespace rj } // namespace chatterino diff --git a/src/util/rapidjson-helpers.hpp b/src/util/rapidjson-helpers.hpp index 26ac2cc4..b5c6f635 100644 --- a/src/util/rapidjson-helpers.hpp +++ b/src/util/rapidjson-helpers.hpp @@ -6,6 +6,7 @@ #include #include +#include namespace chatterino { namespace rj { @@ -93,5 +94,7 @@ bool getSafe(const rapidjson::Value &value, Type &out) return true; } +std::string stringify(const rapidjson::Value &value); + } // namespace rj } // namespace chatterino