diff --git a/CMakeLists.txt b/CMakeLists.txt index ffdb99d..a77d023 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.10) project(sparkle) find_package(OpenSSL REQUIRED) -find_package(RapidJSON) find_path(IXWEBSOCKET_INCLUDE_DIR ixwebsocket) find_library(IXWEBSOCKET_LIBRARY ixwebsocket) if(NOT IXWEBSOCKET_INCLUDE_DIR OR NOT IXWEBSOCKET_LIBRARY) diff --git a/libs/api/Author.hpp b/libs/api/Author.hpp index 34b6a04..4d5f7bc 100644 --- a/libs/api/Author.hpp +++ b/libs/api/Author.hpp @@ -49,7 +49,7 @@ public: string msg_id() { return data["d"]["id"]; } - inline bool isPinned() { + bool isPinned() { return data["d"]["pinned"]; } string avatar() { diff --git a/libs/gateway/Websocket.hpp b/libs/gateway/Websocket.hpp index 6a5a0ea..1b7b1f7 100644 --- a/libs/gateway/Websocket.hpp +++ b/libs/gateway/Websocket.hpp @@ -129,7 +129,7 @@ private: }; ix::initNetSystem(); webSocket.setUrl("wss://gateway.discord.gg/?v=10&encoding=json"); - webSocket.setOnMessageCallback([this, res = json(""), heartbeat_interval = 0, connected = false](const ix::WebSocketMessagePtr& msg) mutable { + webSocket.setOnMessageCallback([this, res = json(), heartbeat_interval = 0, connected = false](const ix::WebSocketMessagePtr& msg) mutable { if (msg->type == ix::WebSocketMessageType::Message) { res = json::parse(msg->str); chngcol(std::string("WEBSOCKET: " + res["op"].dump() + " " + res["t"].dump()), 0, 0, 120);