summaryrefslogtreecommitdiff
path: root/src/discord
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2024-01-18 20:30:54 -0500
committerouwou <26526779+ouwou@users.noreply.github.com>2024-01-18 20:30:54 -0500
commit30b901b4df7344021ca79af4bccf95f6e799a37c (patch)
tree3ba99b2522ebac48e3e958c15ed0a31376169117 /src/discord
parenteb09a5b2211ebfb37aff218250bc7e4aaffee5d0 (diff)
downloadabaddon-portaudio-30b901b4df7344021ca79af4bccf95f6e799a37c.tar.gz
abaddon-portaudio-30b901b4df7344021ca79af4bccf95f6e799a37c.zip
add a bajillion headers back in to compile if pch is off
Diffstat (limited to 'src/discord')
-rw-r--r--src/discord/activity.hpp1
-rw-r--r--src/discord/channel.cpp2
-rw-r--r--src/discord/discord.cpp6
-rw-r--r--src/discord/discord.hpp2
-rw-r--r--src/discord/member.cpp2
-rw-r--r--src/discord/message.cpp2
-rw-r--r--src/discord/role.cpp2
-rw-r--r--src/discord/snowflake.cpp3
-rw-r--r--src/discord/user.cpp2
-rw-r--r--src/discord/voicestateflags.hpp1
-rw-r--r--src/discord/websocket.cpp6
11 files changed, 26 insertions, 3 deletions
diff --git a/src/discord/activity.hpp b/src/discord/activity.hpp
index 5b2c3ce..378354a 100644
--- a/src/discord/activity.hpp
+++ b/src/discord/activity.hpp
@@ -3,6 +3,7 @@
#include <optional>
#include "json.hpp"
#include "snowflake.hpp"
+#include "misc/bitwise.hpp"
enum class PresenceStatus : uint8_t {
Online,
diff --git a/src/discord/channel.cpp b/src/discord/channel.cpp
index a7102ad..8b3ee19 100644
--- a/src/discord/channel.cpp
+++ b/src/discord/channel.cpp
@@ -1,5 +1,7 @@
#include "channel.hpp"
+#include "abaddon.hpp"
+
void from_json(const nlohmann::json &j, ThreadMetadataData &m) {
JS_D("archived", m.IsArchived);
JS_D("auto_archive_duration", m.AutoArchiveDuration);
diff --git a/src/discord/discord.cpp b/src/discord/discord.cpp
index b69daea..385d6b7 100644
--- a/src/discord/discord.cpp
+++ b/src/discord/discord.cpp
@@ -1,8 +1,12 @@
#include "discord.hpp"
-#include <spdlog/spdlog.h>
+
#include <cinttypes>
#include <utility>
+#include <spdlog/spdlog.h>
+
+#include "abaddon.hpp"
+
using namespace std::string_literals;
DiscordClient::DiscordClient(bool mem_store)
diff --git a/src/discord/discord.hpp b/src/discord/discord.hpp
index cb14a52..21eaa82 100644
--- a/src/discord/discord.hpp
+++ b/src/discord/discord.hpp
@@ -7,6 +7,7 @@
#include "voiceclient.hpp"
#include "voicestateflags.hpp"
#include "websocket.hpp"
+#include <gdkmm/rgba.h>
#include <sigc++/sigc++.h>
#include <nlohmann/json.hpp>
#include <thread>
@@ -21,7 +22,6 @@
#undef GetMessage
#endif
-class Abaddon;
class DiscordClient {
friend class Abaddon;
diff --git a/src/discord/member.cpp b/src/discord/member.cpp
index 2a8ae24..1a1aad8 100644
--- a/src/discord/member.cpp
+++ b/src/discord/member.cpp
@@ -1,5 +1,7 @@
#include "member.hpp"
+#include "abaddon.hpp"
+
void from_json(const nlohmann::json &j, GuildMember &m) {
JS_O("user", m.User);
JS_ON("nick", m.Nickname);
diff --git a/src/discord/message.cpp b/src/discord/message.cpp
index 8a0e271..11335df 100644
--- a/src/discord/message.cpp
+++ b/src/discord/message.cpp
@@ -1,5 +1,7 @@
#include "message.hpp"
+#include "abaddon.hpp"
+
void to_json(nlohmann::json &j, const EmbedFooterData &m) {
j["text"] = m.Text;
JS_IF("icon_url", m.IconURL);
diff --git a/src/discord/role.cpp b/src/discord/role.cpp
index 8a9ed50..456df95 100644
--- a/src/discord/role.cpp
+++ b/src/discord/role.cpp
@@ -1,5 +1,7 @@
#include "role.hpp"
+#include <glibmm/markup.h>
+
void from_json(const nlohmann::json &j, RoleData &m) {
JS_D("id", m.ID);
JS_D("name", m.Name);
diff --git a/src/discord/snowflake.cpp b/src/discord/snowflake.cpp
index 680d4da..43fe91e 100644
--- a/src/discord/snowflake.cpp
+++ b/src/discord/snowflake.cpp
@@ -1,8 +1,11 @@
#include "snowflake.hpp"
+
#include <chrono>
#include <ctime>
#include <iomanip>
+#include "util.hpp"
+
constexpr static uint64_t DiscordEpochSeconds = 1420070400;
const Snowflake Snowflake::Invalid = -1ULL;
diff --git a/src/discord/user.cpp b/src/discord/user.cpp
index 45d70e8..8129273 100644
--- a/src/discord/user.cpp
+++ b/src/discord/user.cpp
@@ -1,5 +1,7 @@
#include "user.hpp"
+#include "abaddon.hpp"
+
bool UserData::IsPomelo() const noexcept {
return Discriminator.size() == 1 && Discriminator[0] == '0';
}
diff --git a/src/discord/voicestateflags.hpp b/src/discord/voicestateflags.hpp
index e369001..01fb762 100644
--- a/src/discord/voicestateflags.hpp
+++ b/src/discord/voicestateflags.hpp
@@ -1,5 +1,6 @@
#pragma once
#include <cstdint>
+#include "misc/bitwise.hpp"
enum class VoiceStateFlags : uint8_t {
Clear = 0,
diff --git a/src/discord/websocket.cpp b/src/discord/websocket.cpp
index 0c79f25..565c94c 100644
--- a/src/discord/websocket.cpp
+++ b/src/discord/websocket.cpp
@@ -1,7 +1,11 @@
#include "websocket.hpp"
-#include <spdlog/sinks/stdout_color_sinks.h>
+
#include <utility>
+#include <gtkmm/main.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+
+
Websocket::Websocket(const std::string &id)
: m_close_info { 1000, "Normal", false } {
if (m_log = spdlog::get(id); !m_log) {