rcxpony/sparkle
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Activity

fixes

Browse Source
This commit is contained in:
fluttershy 2025-01-20 16:07:42 +05:00
parent 7079675d94
commit fd16e499b3
12 changed files with 89 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libs/api/Author.hpp
View File

@ -2,56 +2,44 @@
#define API_AUTHOR_HPP_
#include <includes.h>
#include <net.h>
using std::string, std::cout, std::endl, nlohmann::json;
class Author {
private:
json data;
nlohmann::json data;
const nlohmann::json &d;
WebSocket& web;
NetworkManager& req;
public:
Author(const json& data) :
Author(const nlohmann::json& data) :
data(data),
d(data["d"]),
web(WebSocket::getInstance()),
req(NetworkManager::getInstance()),
channel_id(functions::isNull(data["d"]["channel_id"])),
global_name(functions::isNull(data["d"]["author"]["global_name"])),
id(data["d"]["author"]["id"])
channel_id(functions::isNull(d["channel_id"])),
global_name(functions::isNull(d["author"]["global_name"])),
id(d["author"]["id"]),
content(d["content"]),
isBot(d["author"].contains("bot") ? d["author"]["bot"].get<bool>() : false)
{
};
string content() const {
try {
return data["d"]["content"];
}
catch (...) {
return "";
}
}
const string channel_id, global_name, id;
string discriminator() const {
const std::string channel_id, global_name, id, content;
bool isBot;
std::string discriminator() const {
return data["d"]["author"]["discriminator"];
}
bool isBot() const {
try {
return data["d"]["author"]["bot"];
}
catch (...) {
return 0;
}
}
string guild_id() {
std::string guild_id() {
return data["d"]["guild_id"];
}
string msg_id() {
std::string msg_id() {
return data["d"]["id"];
}
bool isPinned() {
return data["d"]["pinned"];
}
string avatar() {
std::string avatar() {
return data["d"]["author"]["avatar"];
}
string send(const json& msg) {
return req.request(HttpMethods::POST, DiscordEndpoints::details::latest + "/channels/" + data["d"]["channel_id"].get<string>() + "/messages", msg.dump());
std::string send(const nlohmann::json& msg) {
return req.request(HttpMethods::POST, DiscordEndpoints::details::latest + "/channels/" + data["d"]["channel_id"].get<std::string>() + "/messages", msg.dump());
}
};
#endif

16
libs/api/Bot.hpp
View File

@ -1,20 +1,20 @@
#ifndef API_BOT_HPP_
#define API_BOT_HPP_
#include <includes.h>
using std::string, std::cout, std::endl, nlohmann::json;
template<typename...Args>
class Discord {
private:
std::tuple<std::unique_ptr<Args>...> net;
json data;
void initializeNets(const json& data) {
nlohmann::json data;
void initializeNets(const nlohmann::json& data) {
initializeNetsImpl(data, std::index_sequence_for<Args...>{});
}
template<unsigned long... Is>void initializeNetsImpl(const json& data, std::index_sequence<Is...>) {
template<unsigned long... Is>
void initializeNetsImpl(const nlohmann::json& data, std::index_sequence<Is...>) {
net = std::make_tuple(std::make_unique<Args>(data)...);
}
public:
Discord(const json& data) : data(data) {
Discord(const nlohmann::json& data) : data(data) {
initializeNets(data);
}
template<unsigned long Index>
@ -24,10 +24,10 @@ public:
};
class Bot {
private:
json data;
nlohmann::json data;
public:
Bot(const json& data) : data(data) {};
string id() const {
Bot(const nlohmann::json& data) : data(data) {};
std::string id() const {
return data["d"]["id"];
}
bool isBot() const {

9
libs/api/Channel.hpp
View File

@ -2,16 +2,15 @@
#define API_CHANNEL_HPP_
#include <includes.h>
#include <net.h>
using std::string, std::cout, std::endl, nlohmann::json;
class Channel {
private:
json data;
nlohmann::json data;
WebSocket& web;
NetworkManager& req;
public:
Channel(const json& data = "") : data(data), web(WebSocket::getInstance()), req(NetworkManager::getInstance()) {}
string send(const json& msg) {
return req.request(HttpMethods::POST, DiscordEndpoints::details::latest + "/channels/" + data["d"]["channel_id"].get<string>() + "/messages", msg.dump());
Channel(const nlohmann::json& data = "") : data(data), web(WebSocket::getInstance()), req(NetworkManager::getInstance()) {}
std::string send(const nlohmann::json& msg) {
return req.request(HttpMethods::POST, DiscordEndpoints::details::latest + "/channels/" + data["d"]["channel_id"].get<std::string>() + "/messages", msg.dump());
}
};
#endif

31
libs/api/Embed.hpp
View File

@ -1,58 +1,57 @@
#ifndef API_EMBED_HPP_
#define API_EMBED_HPP_
#include <includes.h>
using std::string, std::cout, std::endl, nlohmann::json;
class EmbedBuilder {
private:
json embed = {
nlohmann::json embed = {
{"content", ""},
{"tts", false},
{"embeds", json::array()}
{"embeds", nlohmann::json::array()}
}, data;
public:
EmbedBuilder(const json& data) : data(data) {
EmbedBuilder(const nlohmann::json& data) : data(data) {
embed = {
{"content", ""},
{"tts", false},
{"embeds", json::array()}
{"embeds", nlohmann::json::array()}
};
}
EmbedBuilder& addTitle(const string& title) {
EmbedBuilder& addTitle(const std::string& title) {
if (embed["embeds"].size() == 0) {
embed["embeds"].push_back(json::object());
embed["embeds"].push_back(nlohmann::json::object());
}
embed["embeds"].back()["title"] = title;
return *this;
}
EmbedBuilder& addDescription(const string& desc) {
EmbedBuilder& addDescription(const std::string& desc) {
if (embed["embeds"].size() == 0) {
embed["embeds"].push_back(json::object());
embed["embeds"].push_back(nlohmann::json::object());
}
embed["embeds"].back()["description"] = desc;
return *this;
}
EmbedBuilder& addColor(const string& color) {
EmbedBuilder& addColor(const std::string& color) {
if (embed["embeds"].size() == 0) {
embed["embeds"].push_back(json::object());
embed["embeds"].push_back(nlohmann::json::object());
}
embed["embeds"].back()["color"] = color;
return *this;
}
EmbedBuilder& addUrl(const string& url) {
EmbedBuilder& addUrl(const std::string& url) {
if (embed["embeds"].size() == 0) {
embed["embeds"].push_back(json::object());
embed["embeds"].push_back(nlohmann::json::object());
}
embed["embeds"].back()["url"] = url;
return *this;
}
EmbedBuilder& addImage(const string& imageurl) {
EmbedBuilder& addImage(const std::string& imageurl) {
if (embed["embeds"].size() == 0) {
embed["embeds"].push_back(json::object());
embed["embeds"].push_back(nlohmann::json::object());
}
embed["embeds"].back()["image"] = { {"url", imageurl} };
return *this;
}
json getEmbed() const {
nlohmann::json getEmbed() const {
return embed;
}
};

9
libs/api/Guild.hpp
View File

@ -1,14 +1,13 @@
#ifndef API_GUILD_HPP_
#define API_GUILD_HPP_
#include <includes.h>
//#include <net.h>
using std::string, std::cout, std::endl, nlohmann::json;
#include <net.h>
class Guild {
private:
json data;
nlohmann::json data;
public:
Guild(const json& data) : data(data) {}
string id() const {
Guild(const nlohmann::json& data) : data(data) {}
std::string id() const {
return data["d"]["user"]["id"];
}
};

16
libs/api/Message.hpp
View File

@ -2,18 +2,18 @@
#define API_MESSAGE_HPP_
#include <includes.h>
#include <net.h>
using std::string, std::cout, std::endl, nlohmann::json;
class Message {
private:
json data;
nlohmann::json data;
WebSocket& web;
NetworkManager& req;
public:
Message(const json& data) : data(data), web(WebSocket::getInstance()), req(NetworkManager::getInstance()) {};
string send(const string& id, const json& msg) {
Message(const nlohmann::json& data) : data(data), web(WebSocket::getInstance()), req(NetworkManager::getInstance()) {};
std::string send(const std::string& id, const nlohmann::json& msg) {
std::cout << id << msg << std::endl;
return req.request(HttpMethods::POST, DiscordEndpoints::details::latest + "/channels/" + id + "/messages", msg.dump());
}
string getMessages(const string& id, const string& count, const string& before = "") {
std::string getMessages(const std::string& id, const std::string& count, const std::string& before = "") {
if (before.empty()) {
return req.request(HttpMethods::GET, DiscordEndpoints::details::latest + "/channels/" + id + "/messages?limit=" + count);
}
@ -22,11 +22,11 @@ public:
}
return "";
}
string deleteMessage(const string& channel_id, const string& message_id) {
std::string deleteMessage(const std::string& channel_id, const std::string& message_id) {
return req.request(HttpMethods::DELETE, DiscordEndpoints::details::latest + "/channels/" + channel_id + "/messages/" + message_id);
}
json pack(const json& pack) const {
return { pack };
nlohmann::json pack(const nlohmann::json& key, const std::string& value) const {
return {{ key, value }};
}
};
#endif

15
libs/api/User.hpp
View File

@ -3,18 +3,18 @@
#include <includes.h>
#include <net.h>
#include <vector>
using std::string, std::cout, std::endl, nlohmann::json;
class User {
private:
json data;
nlohmann::json data;
WebSocket& web;
NetworkManager& req;
public:
User(const json& data = "") : data(data), web(WebSocket::getInstance()), req(NetworkManager::getInstance()) {}
json extract(const std::vector<string>& keys) {
std::vector<string> d = { "d" };
User(const nlohmann::json& data = "") : data(data), web(WebSocket::getInstance()), req(NetworkManager::getInstance()) {}
#ifdef DEBUG
nlohmann::json extract(const std::vector<std::string>& keys) {
std::vector<std::string> d = { "d" };
d.insert(d.end(), keys.begin(), keys.end());
json current = data;
nlohmann::json current = data;
for (const auto& key : d) {
if (current.contains(key)) {
current = current[key];
@ -25,7 +25,8 @@ public:
}
return current;
}
virtual string me() {
#endif
std::string me() {
return req.request(HttpMethods::GET, DiscordEndpoints::details::latest + "/users/@me");
}
bool isBot() const {

25
libs/gateway/Websocket.hpp
View File

@ -5,7 +5,6 @@
#include <chrono>
#include <ixwebsocket/IXNetSystem.h>
#include <ixwebsocket/IXWebSocket.h>
using std::string, std::cout, std::endl, nlohmann::json;
using namespace std::chrono;
using namespace std::chrono_literals;
class WebSocket {
@ -14,11 +13,11 @@ private:
int intents;
std::string token;
ix::WebSocket webSocket;
json payload = { {"op", 1},{"d", nullptr} }, id;
std::unordered_map<std::string, std::function<void(const json&)>> eventHandlers;
nlohmann::json payload = { {"op", 1},{"d", nullptr} }, id;
std::unordered_map<std::string, std::function<void(const nlohmann::json&)>> eventHandlers;
WebSocket& operator=(const WebSocket&) = delete;
WebSocket(const WebSocket&) = delete;
WebSocket(const std::string& token, const int& intents, bool& isBot) {
WebSocket(const std::string& token, const int& intents, const bool& isBot) {
WebSocket::token = token;
WebSocket::intents = intents;
WebSocket::isBot = isBot;
@ -34,7 +33,7 @@ private:
}},
//{"compress", 1},
{"presence", {
{"activities", json::array({
{"activities", nlohmann::json::array({
{
//{"name", "asdsadsadsadsa"},
//{"type", 2}
@ -50,9 +49,9 @@ private:
webSocket.setUrl("wss://gateway.discord.gg/?v=10&encoding=json");
webSocket.setHandshakeTimeout(5);
Log::create(INFO, WEBSOCKET, "ixwebsocket init");
webSocket.setOnMessageCallback([this, res = json(), heartbeat_interval = 0, connected = false](const ix::WebSocketMessagePtr& msg) mutable {
webSocket.setOnMessageCallback([this, res = nlohmann::json(), heartbeat_interval = 0, connected = false](const ix::WebSocketMessagePtr& msg) mutable {
if (msg->type == ix::WebSocketMessageType::Message) {
res = json::parse(msg->str);
res = nlohmann::json::parse(msg->str);
Log::create(INFO, WEBSOCKET, res["op"].dump() + " " + res["t"].dump());
switch (res["op"].get<int>()) {
case 10:
@ -106,14 +105,14 @@ public:
int getIntents() const {
return WebSocket::intents;
}
void on(const string& event, std::function<void(const json&)> handler) {
eventHandlers[event] = [handler](const json& message) {
handler(message.get<json>());
void on(const std::string& event, std::function<void(const nlohmann::json&)> handler) {
eventHandlers[event] = [handler](const nlohmann::json& message) {
handler(message.get<nlohmann::json>());
};
}
void once(const string& event, std::function<void(const json&)> handler) {
eventHandlers[event] = [event, handler, isCalled = false](const json& message) mutable {
isCalled == false ? isCalled = true : 0, handler(message.get<json>());
void once(const std::string& event, std::function<void(const nlohmann::json&)> handler) {
eventHandlers[event] = [event, handler, isCalled = false](const nlohmann::json& message) mutable {
isCalled == false ? isCalled = true : 0, handler(message.get<nlohmann::json>());
};
}
void start() {

4
libs/tls/Network.hpp
View File

@ -3,7 +3,6 @@
#include <includes.h>
#include <gateway/Websocket.hpp>
#include <curl/curl.h>
using std::string, std::cout, std::endl, nlohmann::json;
class NetworkManager {
private:
CURL* curl;
@ -53,6 +52,9 @@ public:
if ((res = curl_easy_perform(curl)) != 0) Log::create(ERROR, NETWORK, "curl_easy_perform() failed: " + std::string(curl_easy_strerror(res)));
curl_slist_free_all(headers);
}
#ifdef DEBUG
Log::create(INFO, NETWORK, response);
#endif
return response;
}
};

6
libs/utils/log.hpp
View File

@ -5,7 +5,6 @@
#include <iostream>
#include <iomanip>
#include <ctime>
using std::setfill, std::setw;
enum level { INFO, WARNING, ERROR, CRITICAL };
enum type { WEBSOCKET, NETWORK, API };
class Log {
@ -28,7 +27,10 @@ private:
std::time_t now_c = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
std::tm* timer = std::localtime(&now_c);
std::ostringstream oss;
oss << setfill('0') << setw(2) << timer->tm_hour << ":" << setfill('0') << setw(2) << timer->tm_min << ":" << setfill('0') << setw(2) << timer->tm_sec;
oss << std::setfill('0') << std::setw(2)
<< timer->tm_hour << ":" << std::setfill('0') << std::setw(2)
<< timer->tm_min << ":" << std::setfill('0') << std::setw(2)
<< timer->tm_sec;
return oss.str();
}
static std::string str(const level& lvl) {

2
libs/utils/types.hpp
View File

@ -1,4 +1,4 @@
#ifndef UTILS_TYPES_HPP_
#define UTILS_TYPES_HPP_
#define RELEASE
#define DEBUG
#endif

8
sources/main.cpp
View File

@ -3,11 +3,13 @@
int main(int argc, char* argv[]) {
if (argc != 3) return -1;
WebSocket* bot = &WebSocket::getInstance(argv[2], GatewayIntents::AllIntents);
bot->on(GatewayEvents::READY, [](const Discord<Message, User>&a) {
cout << DiscordEndpoints::details::latest << endl;
bot->on(GatewayEvents::READY, [](const Discord<Message, User>& a) {
std::cout << DiscordEndpoints::details::latest << std::endl;
});
bot->on(GatewayEvents::MESSAGE_CREATE, [bot](const Discord<Message, User, Author>& msg) {
msg.get<0>().send("939957962972229634", msg.get<0>().pack({ "content", msg.get<2>().id }));
if (msg.get<2>().isBot == false) {
msg.get<0>().send("939957962972229634", msg.get<0>().pack("content", msg.get<2>().global_name));
}
});
bot->start();
return 0;