From 7f6b7e4bb61f3021de5fc43886fb54803f680e77 Mon Sep 17 00:00:00 2001 From: fluttershy Date: Tue, 14 Jan 2025 16:14:01 +0500 Subject: [PATCH] fixes --- CMakeLists.txt | 3 ++- libs/api/Author.hpp | 5 ++--- libs/api/Bot.hpp | 1 - libs/api/Channel.hpp | 1 - libs/api/Embed.hpp | 1 - libs/api/Guild.hpp | 1 - libs/api/Message.hpp | 2 -- libs/gateway/Websocket.hpp | 3 --- libs/tls/Network.hpp | 2 -- libs/utils/types.hpp | 4 +++- sources/main.cpp | 8 ++------ 11 files changed, 9 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a77d023..3025b24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,4 +18,5 @@ target_link_libraries(sparkle PRIVATE ) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED True) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -O2 -flto -pipe") \ No newline at end of file +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -O2 -flto -fomit-frame-pointer -pipe") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -pipe") \ No newline at end of file diff --git a/libs/api/Author.hpp b/libs/api/Author.hpp index 4d5f7bc..2967859 100644 --- a/libs/api/Author.hpp +++ b/libs/api/Author.hpp @@ -3,7 +3,6 @@ #include #include #include -#include #include using std::string; using std::cout; @@ -19,8 +18,8 @@ public: try { return data["d"]["content"]; } - catch (std::exception& e) { - return e.what(); + catch (...) { + return ""; } } string channel_id() { diff --git a/libs/api/Bot.hpp b/libs/api/Bot.hpp index a2c21c4..f5c737c 100644 --- a/libs/api/Bot.hpp +++ b/libs/api/Bot.hpp @@ -2,7 +2,6 @@ #define API_BOT_HPP_ #include #include -#include #include #include using std::string; diff --git a/libs/api/Channel.hpp b/libs/api/Channel.hpp index 4e6f999..2400e97 100644 --- a/libs/api/Channel.hpp +++ b/libs/api/Channel.hpp @@ -1,7 +1,6 @@ #ifndef API_CHANNEL_HPP_ #define API_CHANNEL_HPP_ #include -#include #include #include #include diff --git a/libs/api/Embed.hpp b/libs/api/Embed.hpp index 169e764..fdc3107 100644 --- a/libs/api/Embed.hpp +++ b/libs/api/Embed.hpp @@ -2,7 +2,6 @@ #define API_EMBED_HPP_ #include #include -#include #include using std::string; using std::cout; diff --git a/libs/api/Guild.hpp b/libs/api/Guild.hpp index b2b5a0c..b8590e7 100644 --- a/libs/api/Guild.hpp +++ b/libs/api/Guild.hpp @@ -2,7 +2,6 @@ #define API_GUILD_HPP_ #include #include -#include #include using std::string; using std::cout; diff --git a/libs/api/Message.hpp b/libs/api/Message.hpp index cb45af3..b7e0b18 100644 --- a/libs/api/Message.hpp +++ b/libs/api/Message.hpp @@ -2,8 +2,6 @@ #define API_MESSAGE_HPP_ #include #include -#include -#include #include #include using std::string; diff --git a/libs/gateway/Websocket.hpp b/libs/gateway/Websocket.hpp index 4c6cd66..adfe9b2 100644 --- a/libs/gateway/Websocket.hpp +++ b/libs/gateway/Websocket.hpp @@ -1,13 +1,10 @@ #ifndef GATEWAY_WEBSOCKET_HPP_ #define GATEWAY_WEBSOCKET_HPP_ -#include #include -#include #include #include #include #include -#include #include #include using json = nlohmann::json; diff --git a/libs/tls/Network.hpp b/libs/tls/Network.hpp index 68701d1..f321732 100644 --- a/libs/tls/Network.hpp +++ b/libs/tls/Network.hpp @@ -2,14 +2,12 @@ #define TLS_NETWORK_HPP_ #include #include -#include #include #include #include #include #include #include -#include using std::cout; using std::cerr; using std::endl; diff --git a/libs/utils/types.hpp b/libs/utils/types.hpp index 1689662..22c6480 100644 --- a/libs/utils/types.hpp +++ b/libs/utils/types.hpp @@ -5,7 +5,9 @@ #define je(...) {__VA_ARGS__} #define g(x, y) (std::get(y)) #define ALL_INTENTS 131071 +#define RELEASE #include +#include +#include using json = nlohmann::json; -#include #endif \ No newline at end of file diff --git a/sources/main.cpp b/sources/main.cpp index 1e6e391..a1ee76b 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -1,15 +1,11 @@ -#define RELEASE -#include -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include #include int main(int argc, char* argv[]) { if (argc != 3) return -1;