add a bajillion headers back in to compile if pch is off

This commit is contained in:
ouwou 2024-01-18 20:30:54 -05:00
parent eb09a5b221
commit 30b901b4df
109 changed files with 435 additions and 37 deletions

View File

@ -1,9 +1,11 @@
#include "abaddon.hpp"
#include <memory> #include <memory>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <spdlog/cfg/env.h> #include <spdlog/cfg/env.h>
#include <spdlog/sinks/stdout_color_sinks.h> #include <spdlog/sinks/stdout_color_sinks.h>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include <gtkmm.h>
#include "platform.hpp" #include "platform.hpp"
#include "audio/manager.hpp" #include "audio/manager.hpp"
#include "discord/discord.hpp" #include "discord/discord.hpp"
@ -21,6 +23,7 @@
#include "startup.hpp" #include "startup.hpp"
#include "notifications/notifications.hpp" #include "notifications/notifications.hpp"
#include "remoteauth/remoteauthdialog.hpp" #include "remoteauth/remoteauthdialog.hpp"
#include "util.hpp"
#ifdef WITH_LIBHANDY #ifdef WITH_LIBHANDY
#include <handy.h> #include <handy.h>

View File

@ -1,4 +1,5 @@
#include "cellrenderermemberlist.hpp" #include "cellrenderermemberlist.hpp"
#include <gdkmm/general.h>
CellRendererMemberList::CellRendererMemberList() CellRendererMemberList::CellRendererMemberList()
: Glib::ObjectBase(typeid(CellRendererMemberList)) : Glib::ObjectBase(typeid(CellRendererMemberList))

View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <glibmm/property.h>
#include <gtkmm/cellrenderer.h> #include <gtkmm/cellrenderer.h>
#include <gtkmm/cellrenderertext.h>
#include "discord/activity.hpp" #include "discord/activity.hpp"
enum class MemberListRenderType : uint8_t { enum class MemberListRenderType : uint8_t {

View File

@ -1,4 +1,6 @@
#include "cellrendererpixbufanimation.hpp" #include "cellrendererpixbufanimation.hpp"
#include <gdkmm/general.h>
#include <glibmm/main.h>
CellRendererPixbufAnimation::CellRendererPixbufAnimation() CellRendererPixbufAnimation::CellRendererPixbufAnimation()
: Glib::ObjectBase(typeid(CellRendererPixbufAnimation)) : Glib::ObjectBase(typeid(CellRendererPixbufAnimation))

View File

@ -1,5 +1,8 @@
#pragma once #pragma once
#include <unordered_map> #include <unordered_map>
#include <gdkmm/pixbufanimation.h>
#include <glibmm/property.h>
#include <gtkmm/cellrenderer.h>
// handles both static and animated // handles both static and animated
class CellRendererPixbufAnimation : public Gtk::CellRenderer { class CellRendererPixbufAnimation : public Gtk::CellRenderer {

View File

@ -3,6 +3,8 @@
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include <unordered_map> #include <unordered_map>
#include "abaddon.hpp"
#include "util.hpp"
ChannelList::ChannelList() ChannelList::ChannelList()
: Glib::ObjectBase(typeid(ChannelList)) : Glib::ObjectBase(typeid(ChannelList))

View File

@ -1,4 +1,6 @@
#include "channelscellrenderer.hpp" #include "channelscellrenderer.hpp"
#include <gdkmm/general.h>
#include "abaddon.hpp"
constexpr static int MentionsRightPad = 7; constexpr static int MentionsRightPad = 7;
#ifndef M_PI #ifndef M_PI

View File

@ -1,7 +1,10 @@
#pragma once #pragma once
#include <map>
#include <optional>
#include <gdkmm/pixbufanimation.h> #include <gdkmm/pixbufanimation.h>
#include <glibmm/property.h> #include <glibmm/property.h>
#include <map> #include <gtkmm/cellrendererpixbuf.h>
#include <gtkmm/cellrenderertext.h>
#include "discord/snowflake.hpp" #include "discord/snowflake.hpp"
#include "discord/voicestateflags.hpp" #include "discord/voicestateflags.hpp"
#include "misc/bitwise.hpp" #include "misc/bitwise.hpp"

View File

@ -1,6 +1,11 @@
#ifdef WITH_LIBHANDY #ifdef WITH_LIBHANDY
#include "channeltabswitcherhandy.hpp" // clang-format off
#include "channeltabswitcherhandy.hpp"
#include "abaddon.hpp"
// clang-format on
void selected_page_notify_cb(HdyTabView *view, GParamSpec *pspec, ChannelTabSwitcherHandy *switcher) { void selected_page_notify_cb(HdyTabView *view, GParamSpec *pspec, ChannelTabSwitcherHandy *switcher) {
auto *page = hdy_tab_view_get_selected_page(view); auto *page = hdy_tab_view_get_selected_page(view);

View File

@ -1,10 +1,16 @@
#pragma once #pragma once
// perhaps this should be conditionally included within cmakelists? // perhaps this should be conditionally included within cmakelists?
#ifdef WITH_LIBHANDY #ifdef WITH_LIBHANDY
#include <unordered_map>
#include <handy.h> // clang-format off
#include "discord/snowflake.hpp"
#include "state.hpp" #include <unordered_map>
#include <gtkmm/box.h>
#include <handy.h>
#include "discord/snowflake.hpp"
#include "state.hpp"
// clang-format off
class ChannelData; class ChannelData;

View File

@ -1,7 +1,11 @@
#include "chatinput.hpp" #include "chatinput.hpp"
#include <filesystem>
#include <gtkmm/dialog.h>
#include <gtkmm/filechoosernative.h>
#include "abaddon.hpp"
#include "constants.hpp" #include "constants.hpp"
#include "misc/events.hpp" #include "misc/events.hpp"
#include <filesystem> #include "util.hpp"
ChatInputText::ChatInputText() { ChatInputText::ChatInputText() {
get_style_context()->add_class("message-input"); get_style_context()->add_class("message-input");

View File

@ -1,5 +1,14 @@
#pragma once #pragma once
#include <gtkmm/box.h>
#include <gtkmm/button.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/image.h>
#include <gtkmm/menu.h>
#include <gtkmm/revealer.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/textview.h>
#include "discord/chatsubmitparams.hpp" #include "discord/chatsubmitparams.hpp"
#include "discord/message.hpp"
#include "discord/permissions.hpp" #include "discord/permissions.hpp"
class ChatInputAttachmentItem : public Gtk::EventBox { class ChatInputAttachmentItem : public Gtk::EventBox {

View File

@ -1,5 +1,8 @@
#include <filesystem>
#include "chatinputindicator.hpp" #include "chatinputindicator.hpp"
#include <filesystem>
#include <gdkmm/pixbufloader.h>
#include "abaddon.hpp"
#include "util.hpp"
constexpr static const int MaxUsersInIndicator = 4; constexpr static const int MaxUsersInIndicator = 4;

View File

@ -1,5 +1,8 @@
#pragma once #pragma once
#include <unordered_map> #include <unordered_map>
#include <gtkmm/box.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
#include "discord/message.hpp" #include "discord/message.hpp"
#include "discord/user.hpp" #include "discord/user.hpp"

View File

@ -1,4 +1,5 @@
#include "chatlist.hpp" #include "chatlist.hpp"
#include "abaddon.hpp"
#include "chatmessage.hpp" #include "chatmessage.hpp"
#include "constants.hpp" #include "constants.hpp"

View File

@ -1,6 +1,10 @@
#pragma once #pragma once
#include <map> #include <map>
#include <vector> #include <vector>
#include <glibmm/timer.h>
#include <gtkmm/listbox.h>
#include <gtkmm/menu.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/message.hpp" #include "discord/message.hpp"
#include "discord/snowflake.hpp" #include "discord/snowflake.hpp"

View File

@ -1,8 +1,11 @@
#include "chatmessage.hpp" #include "chatmessage.hpp"
#include <unordered_map>
#include <gtkmm/flowbox.h>
#include "abaddon.hpp"
#include "constants.hpp" #include "constants.hpp"
#include "lazyimage.hpp" #include "lazyimage.hpp"
#include "misc/chatutil.hpp" #include "misc/chatutil.hpp"
#include <unordered_map> #include "util.hpp"
ChatMessageItemContainer::ChatMessageItemContainer() ChatMessageItemContainer::ChatMessageItemContainer()
: m_main(Gtk::ORIENTATION_VERTICAL) { : m_main(Gtk::ORIENTATION_VERTICAL) {

View File

@ -1,4 +1,10 @@
#pragma once #pragma once
#include <gdkmm/pixbufanimation.h>
#include <gtkmm/box.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/image.h>
#include <gtkmm/listboxrow.h>
#include <gtkmm/textview.h>
#include "discord/discord.hpp" #include "discord/discord.hpp"
class ChatMessageItemContainer : public Gtk::EventBox { class ChatMessageItemContainer : public Gtk::EventBox {

View File

@ -1,4 +1,5 @@
#include "chatwindow.hpp" #include "chatwindow.hpp"
#include "abaddon.hpp"
#include "chatinputindicator.hpp" #include "chatinputindicator.hpp"
#include "ratelimitindicator.hpp" #include "ratelimitindicator.hpp"
#include "chatinput.hpp" #include "chatinput.hpp"

View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <set> #include <set>
#include <gtkmm/eventbox.h>
#include "discord/discord.hpp" #include "discord/discord.hpp"
#include "discord/chatsubmitparams.hpp" #include "discord/chatsubmitparams.hpp"
#include "completer.hpp" #include "completer.hpp"

View File

@ -1,6 +1,8 @@
#include <unordered_set> #include <unordered_set>
#include <utility> #include <utility>
#include "completer.hpp" #include "completer.hpp"
#include "abaddon.hpp"
#include "util.hpp"
constexpr const int CompleterHeight = 150; constexpr const int CompleterHeight = 150;
constexpr const int MaxCompleterEntries = 30; constexpr const int MaxCompleterEntries = 30;

View File

@ -1,5 +1,12 @@
#pragma once #pragma once
#include <functional> #include <functional>
#include <gdkmm/pixbuf.h>
#include <gtkmm/box.h>
#include <gtkmm/listbox.h>
#include <gtkmm/listboxrow.h>
#include <gtkmm/revealer.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/textview.h>
#include "lazyimage.hpp" #include "lazyimage.hpp"
#include "discord/snowflake.hpp" #include "discord/snowflake.hpp"

View File

@ -1,4 +1,6 @@
#include "draglistbox.hpp" #include "draglistbox.hpp"
#include <glibmm/main.h>
#include <gtkmm/adjustment.h>
DragListBox::DragListBox() { DragListBox::DragListBox() {
drag_dest_set(m_entries, Gtk::DEST_DEFAULT_MOTION | Gtk::DEST_DEFAULT_DROP, Gdk::ACTION_MOVE); drag_dest_set(m_entries, Gtk::DEST_DEFAULT_MOTION | Gtk::DEST_DEFAULT_DROP, Gdk::ACTION_MOVE);

View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <gtkmm/listbox.h>
class DragListBox : public Gtk::ListBox { class DragListBox : public Gtk::ListBox {
public: public:

View File

@ -1,5 +1,9 @@
#include "friendslist.hpp" #include "friendslist.hpp"
#include <gtkmm/messagedialog.h>
#include <gtkmm/radiobutton.h>
#include "abaddon.hpp"
#include "lazyimage.hpp" #include "lazyimage.hpp"
#include "util.hpp"
using namespace std::string_literals; using namespace std::string_literals;

View File

@ -1,4 +1,13 @@
#pragma once #pragma once
#include <gtkmm/box.h>
#include <gtkmm/button.h>
#include <gtkmm/buttonbox.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include <gtkmm/listbox.h>
#include <gtkmm/radiobuttongroup.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/window.h>
#include "discord/objects.hpp" #include "discord/objects.hpp"
class FriendsListAddComponent : public Gtk::Box { class FriendsListAddComponent : public Gtk::Box {

View File

@ -1,6 +1,8 @@
#include "lazyimage.hpp" #include "lazyimage.hpp"
#include <utility> #include <utility>
#include "abaddon.hpp"
#include "util.hpp"
LazyImage::LazyImage(int w, int h, bool use_placeholder) LazyImage::LazyImage(int w, int h, bool use_placeholder)
: m_width(w) : m_width(w)

View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <gtkmm/image.h>
// loads an image only when the widget is drawn for the first time // loads an image only when the widget is drawn for the first time
class LazyImage : public Gtk::Image { class LazyImage : public Gtk::Image {

View File

@ -1,5 +1,8 @@
#include "memberlist.hpp" #include "memberlist.hpp"
#include "abaddon.hpp"
#include "util.hpp"
constexpr static int MemberListUserLimit = 200; constexpr static int MemberListUserLimit = 200;
MemberList::MemberList() MemberList::MemberList()

View File

@ -1,12 +1,14 @@
#pragma once #pragma once
#include <unordered_map>
#include <gdkmm/pixbuf.h> #include <gdkmm/pixbuf.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/treemodel.h> #include <gtkmm/treemodel.h>
#include <gtkmm/treestore.h> #include <gtkmm/treestore.h>
#include <gtkmm/treeview.h> #include <gtkmm/treeview.h>
#include <unordered_map>
#include "cellrenderermemberlist.hpp" #include "cellrenderermemberlist.hpp"
#include "discord/user.hpp"
#include "discord/snowflake.hpp" #include "discord/snowflake.hpp"
class MemberList { class MemberList {

View File

@ -1,5 +1,7 @@
#include "progressbar.hpp" #include "progressbar.hpp"
#include "abaddon.hpp"
MessageUploadProgressBar::MessageUploadProgressBar() { MessageUploadProgressBar::MessageUploadProgressBar() {
get_style_context()->add_class("message-progress"); get_style_context()->add_class("message-progress");
auto &discord = Abaddon::Get().GetDiscordClient(); auto &discord = Abaddon::Get().GetDiscordClient();

View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <gtkmm/progressbar.h>
class MessageUploadProgressBar : public Gtk::ProgressBar { class MessageUploadProgressBar : public Gtk::ProgressBar {
public: public:

View File

@ -1,6 +1,10 @@
#include "ratelimitindicator.hpp" #include "ratelimitindicator.hpp"
#include <filesystem> #include <filesystem>
#include "abaddon.hpp"
#include "util.hpp"
RateLimitIndicator::RateLimitIndicator() RateLimitIndicator::RateLimitIndicator()
: Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) { : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) {
m_label.set_text(""); m_label.set_text("");

View File

@ -1,6 +1,11 @@
#pragma once #pragma once
#include <unordered_map> #include <unordered_map>
#include <chrono> #include <chrono>
#include <gtkmm/box.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
#include "discord/message.hpp" #include "discord/message.hpp"
class RateLimitIndicator : public Gtk::Box { class RateLimitIndicator : public Gtk::Box {

View File

@ -1,8 +1,12 @@
#ifdef WITH_VOICE #ifdef WITH_VOICE
#include "voiceinfobox.hpp" // clang-format off
#include "abaddon.hpp"
#include "util.hpp" #include "voiceinfobox.hpp"
#include "abaddon.hpp"
#include "util.hpp"
// clang-format on
VoiceInfoBox::VoiceInfoBox() VoiceInfoBox::VoiceInfoBox()
: Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)

View File

@ -2,10 +2,14 @@
#ifdef WITH_VOICE #ifdef WITH_VOICE
#include <gtkmm/box.h> // clang-format off
#include <gtkmm/eventbox.h>
#include <gtkmm/image.h> #include <gtkmm/box.h>
#include <gtkmm/label.h> #include <gtkmm/eventbox.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
// clang-format on
class VoiceInfoBox : public Gtk::Box { class VoiceInfoBox : public Gtk::Box {
public: public:

View File

@ -1,5 +1,8 @@
#pragma once #pragma once
#include <gtkmm/dialog.h>
#include <gtkmm/label.h>
class ConfirmDialog : public Gtk::Dialog { class ConfirmDialog : public Gtk::Dialog {
public: public:
ConfirmDialog(Gtk::Window &parent); ConfirmDialog(Gtk::Window &parent);

View File

@ -1,5 +1,7 @@
#include "friendpicker.hpp" #include "friendpicker.hpp"
#include "abaddon.hpp"
FriendPickerDialog::FriendPickerDialog(Gtk::Window &parent) FriendPickerDialog::FriendPickerDialog(Gtk::Window &parent)
: Gtk::Dialog("Pick a friend", parent, true) : Gtk::Dialog("Pick a friend", parent, true)
, m_bbox(Gtk::ORIENTATION_HORIZONTAL) { , m_bbox(Gtk::ORIENTATION_HORIZONTAL) {

View File

@ -1,4 +1,11 @@
#pragma once #pragma once
#include <gtkmm/dialog.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
#include <gtkmm/listbox.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/snowflake.hpp" #include "discord/snowflake.hpp"
class FriendPickerDialog : public Gtk::Dialog { class FriendPickerDialog : public Gtk::Dialog {

View File

@ -1,5 +1,7 @@
#include "setstatus.hpp" #include "setstatus.hpp"
#include "abaddon.hpp"
static const std::array feelings = { static const std::array feelings = {
"wonderful", "wonderful",
"splendiferous", "splendiferous",

View File

@ -1,4 +1,9 @@
#pragma once #pragma once
#include <gtkmm/comboboxtext.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include "discord/objects.hpp" #include "discord/objects.hpp"
class SetStatusDialog : public Gtk::Dialog { class SetStatusDialog : public Gtk::Dialog {

View File

@ -1,5 +1,9 @@
#pragma once #pragma once
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
class TextInputDialog : public Gtk::Dialog { class TextInputDialog : public Gtk::Dialog {
public: public:
TextInputDialog(const Glib::ustring &prompt, const Glib::ustring &title, const Glib::ustring &placeholder, Gtk::Window &parent); TextInputDialog(const Glib::ustring &prompt, const Glib::ustring &title, const Glib::ustring &placeholder, Gtk::Window &parent);

View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <string>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
class TokenDialog : public Gtk::Dialog { class TokenDialog : public Gtk::Dialog {
public: public:

View File

@ -1,5 +1,7 @@
#include "verificationgate.hpp" #include "verificationgate.hpp"
#include "abaddon.hpp"
VerificationGateDialog::VerificationGateDialog(Gtk::Window &parent, Snowflake guild_id) VerificationGateDialog::VerificationGateDialog(Gtk::Window &parent, Snowflake guild_id)
: Gtk::Dialog("Verification Required", parent, true) : Gtk::Dialog("Verification Required", parent, true)
, m_bbox(Gtk::ORIENTATION_HORIZONTAL) { , m_bbox(Gtk::ORIENTATION_HORIZONTAL) {

View File

@ -1,5 +1,12 @@
#pragma once #pragma once
#include <optional> #include <optional>
#include <gtkmm/dialog.h>
#include <gtkmm/label.h>
#include <gtkmm/listbox.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/objects.hpp" #include "discord/objects.hpp"
class VerificationGateDialog : public Gtk::Dialog { class VerificationGateDialog : public Gtk::Dialog {

View File

@ -3,6 +3,7 @@
#include <optional> #include <optional>
#include "json.hpp" #include "json.hpp"
#include "snowflake.hpp" #include "snowflake.hpp"
#include "misc/bitwise.hpp"
enum class PresenceStatus : uint8_t { enum class PresenceStatus : uint8_t {
Online, Online,

View File

@ -1,5 +1,7 @@
#include "channel.hpp" #include "channel.hpp"
#include "abaddon.hpp"
void from_json(const nlohmann::json &j, ThreadMetadataData &m) { void from_json(const nlohmann::json &j, ThreadMetadataData &m) {
JS_D("archived", m.IsArchived); JS_D("archived", m.IsArchived);
JS_D("auto_archive_duration", m.AutoArchiveDuration); JS_D("auto_archive_duration", m.AutoArchiveDuration);

View File

@ -1,8 +1,12 @@
#include "discord.hpp" #include "discord.hpp"
#include <spdlog/spdlog.h>
#include <cinttypes> #include <cinttypes>
#include <utility> #include <utility>
#include <spdlog/spdlog.h>
#include "abaddon.hpp"
using namespace std::string_literals; using namespace std::string_literals;
DiscordClient::DiscordClient(bool mem_store) DiscordClient::DiscordClient(bool mem_store)

View File

@ -7,6 +7,7 @@
#include "voiceclient.hpp" #include "voiceclient.hpp"
#include "voicestateflags.hpp" #include "voicestateflags.hpp"
#include "websocket.hpp" #include "websocket.hpp"
#include <gdkmm/rgba.h>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <thread> #include <thread>
@ -21,7 +22,6 @@
#undef GetMessage #undef GetMessage
#endif #endif
class Abaddon;
class DiscordClient { class DiscordClient {
friend class Abaddon; friend class Abaddon;

View File

@ -1,5 +1,7 @@
#include "member.hpp" #include "member.hpp"
#include "abaddon.hpp"
void from_json(const nlohmann::json &j, GuildMember &m) { void from_json(const nlohmann::json &j, GuildMember &m) {
JS_O("user", m.User); JS_O("user", m.User);
JS_ON("nick", m.Nickname); JS_ON("nick", m.Nickname);

View File

@ -1,5 +1,7 @@
#include "message.hpp" #include "message.hpp"
#include "abaddon.hpp"
void to_json(nlohmann::json &j, const EmbedFooterData &m) { void to_json(nlohmann::json &j, const EmbedFooterData &m) {
j["text"] = m.Text; j["text"] = m.Text;
JS_IF("icon_url", m.IconURL); JS_IF("icon_url", m.IconURL);

View File

@ -1,5 +1,7 @@
#include "role.hpp" #include "role.hpp"
#include <glibmm/markup.h>
void from_json(const nlohmann::json &j, RoleData &m) { void from_json(const nlohmann::json &j, RoleData &m) {
JS_D("id", m.ID); JS_D("id", m.ID);
JS_D("name", m.Name); JS_D("name", m.Name);

View File

@ -1,8 +1,11 @@
#include "snowflake.hpp" #include "snowflake.hpp"
#include <chrono> #include <chrono>
#include <ctime> #include <ctime>
#include <iomanip> #include <iomanip>
#include "util.hpp"
constexpr static uint64_t DiscordEpochSeconds = 1420070400; constexpr static uint64_t DiscordEpochSeconds = 1420070400;
const Snowflake Snowflake::Invalid = -1ULL; const Snowflake Snowflake::Invalid = -1ULL;

View File

@ -1,5 +1,7 @@
#include "user.hpp" #include "user.hpp"
#include "abaddon.hpp"
bool UserData::IsPomelo() const noexcept { bool UserData::IsPomelo() const noexcept {
return Discriminator.size() == 1 && Discriminator[0] == '0'; return Discriminator.size() == 1 && Discriminator[0] == '0';
} }

View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include "misc/bitwise.hpp"
enum class VoiceStateFlags : uint8_t { enum class VoiceStateFlags : uint8_t {
Clear = 0, Clear = 0,

View File

@ -1,7 +1,11 @@
#include "websocket.hpp" #include "websocket.hpp"
#include <spdlog/sinks/stdout_color_sinks.h>
#include <utility> #include <utility>
#include <gtkmm/main.h>
#include <spdlog/sinks/stdout_color_sinks.h>
Websocket::Websocket(const std::string &id) Websocket::Websocket(const std::string &id)
: m_close_info { 1000, "Normal", false } { : m_close_info { 1000, "Normal", false } {
if (m_log = spdlog::get(id); !m_log) { if (m_log = spdlog::get(id); !m_log) {

View File

@ -1,7 +1,10 @@
#include "emojis.hpp" #include "emojis.hpp"
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include <gdkmm/pixbufloader.h>
#ifdef ABADDON_IS_BIG_ENDIAN #ifdef ABADDON_IS_BIG_ENDIAN
/* Allows processing emojis.bin correctly on big-endian systems. */ /* Allows processing emojis.bin correctly on big-endian systems. */
int emojis_int32_correct_endian(int little_endian_in) { int emojis_int32_correct_endian(int little_endian_in) {

View File

@ -1,9 +1,13 @@
#pragma once #pragma once
#include <string> #include <string>
#include <cstdio> #include <cstdio>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <gdkmm/pixbuf.h>
#include <gtkmm/textbuffer.h>
// shoutout to gtk for only supporting .svg's sometimes // shoutout to gtk for only supporting .svg's sometimes
class EmojiResource { class EmojiResource {

View File

@ -1,6 +1,8 @@
#include "filecache.hpp" #include "filecache.hpp"
#include <utility> #include <utility>
#include "abaddon.hpp"
#include "MurmurHash3.h" #include "MurmurHash3.h"
std::string GetCachedName(const std::string &str) { std::string GetCachedName(const std::string &str) {

View File

@ -8,6 +8,7 @@
#include <unordered_map> #include <unordered_map>
#include <future> #include <future>
#include <mutex> #include <mutex>
#include <queue>
#include "http.hpp" #include "http.hpp"
class FileCacheWorkerThread { class FileCacheWorkerThread {

View File

@ -2,6 +2,11 @@
#include <utility> #include <utility>
#include <gdkmm/pixbufloader.h>
#include "abaddon.hpp"
#include "util.hpp"
ImageManager::ImageManager() { ImageManager::ImageManager() {
m_cb_dispatcher.connect(sigc::mem_fun(*this, &ImageManager::RunCallbacks)); m_cb_dispatcher.connect(sigc::mem_fun(*this, &ImageManager::RunCallbacks));
} }

View File

@ -1,8 +1,14 @@
#pragma once #pragma once
#include <string>
#include <unordered_map>
#include <functional> #include <functional>
#include <queue> #include <queue>
#include <string>
#include <unordered_map>
#include <gdkmm/pixbuf.h>
#include <gdkmm/pixbufanimation.h>
#include <glibmm/dispatcher.h>
#include "filecache.hpp" #include "filecache.hpp"
class ImageManager { class ImageManager {

View File

@ -1,5 +1,8 @@
#include "chatutil.hpp" #include "chatutil.hpp"
#include "abaddon.hpp"
#include "constants.hpp" #include "constants.hpp"
#include "util.hpp"
namespace ChatUtil { namespace ChatUtil {
Glib::ustring GetText(const Glib::RefPtr<Gtk::TextBuffer> &buf) { Glib::ustring GetText(const Glib::RefPtr<Gtk::TextBuffer> &buf) {

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <gdk/gdkkeys.h> #include <gdk/gdk.h>
// idk it wont let me forward declare // idk it wont let me forward declare
namespace EventsUtil { namespace EventsUtil {

View File

@ -1,6 +1,8 @@
#include "notifications.hpp" #include "notifications.hpp"
#include "misc/chatutil.hpp"
#include "abaddon.hpp"
#include "discord/message.hpp" #include "discord/message.hpp"
#include "misc/chatutil.hpp"
Notifications::Notifications() { Notifications::Notifications() {
} }

View File

@ -1,8 +1,11 @@
#pragma once #pragma once
#include "notifier.hpp"
#include <map> #include <map>
#include <vector> #include <vector>
#include "discord/snowflake.hpp"
#include "notifier.hpp"
class Message; class Message;
class Notifications { class Notifications {

View File

@ -1,5 +1,7 @@
#include "notifier.hpp" #include "notifier.hpp"
#include "abaddon.hpp"
/* no actual notifications, just sounds /* no actual notifications, just sounds
GNotification has no win32 backend, and WinToast uses headers msys2 doesnt provide GNotification has no win32 backend, and WinToast uses headers msys2 doesnt provide
maybe it can be LoadLibrary'd in :s maybe it can be LoadLibrary'd in :s

View File

@ -1,6 +1,9 @@
#include "notifier.hpp" #include "notifier.hpp"
#include <giomm/notification.h> #include <giomm/notification.h>
#include "abaddon.hpp"
Notifier::Notifier() { Notifier::Notifier() {
#ifdef ENABLE_NOTIFICATION_SOUNDS #ifdef ENABLE_NOTIFICATION_SOUNDS
if (ma_engine_init(nullptr, &m_engine) != MA_SUCCESS) { if (ma_engine_init(nullptr, &m_engine) != MA_SUCCESS) {

View File

@ -3,10 +3,14 @@
// clang-format off // clang-format off
#include "remoteauthclient.hpp" #include "remoteauthclient.hpp"
#include "http.hpp"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <spdlog/fmt/bin_to_hex.h> #include <spdlog/fmt/bin_to_hex.h>
#include "abaddon.hpp"
#include "http.hpp"
// clang-format on // clang-format on
RemoteAuthClient::RemoteAuthClient() RemoteAuthClient::RemoteAuthClient()

View File

@ -4,12 +4,17 @@
// clang-format off // clang-format off
#include <optional>
#include <string> #include <string>
#include <queue> #include <queue>
#include <spdlog/logger.h> #include <spdlog/logger.h>
#include "ssl.hpp"
#include "discord/errors.hpp"
#include "discord/snowflake.hpp"
#include "discord/waiter.hpp" #include "discord/waiter.hpp"
#include "discord/websocket.hpp" #include "discord/websocket.hpp"
#include "ssl.hpp"
// clang-format on // clang-format on

View File

@ -3,8 +3,12 @@
// clang-format off // clang-format off
#include "remoteauthdialog.hpp" #include "remoteauthdialog.hpp"
#include <gdkmm/pixbufloader.h>
#include <qrcodegen.hpp> #include <qrcodegen.hpp>
#include "abaddon.hpp"
// clang-format on // clang-format on
RemoteAuthDialog::RemoteAuthDialog(Gtk::Window &parent) RemoteAuthDialog::RemoteAuthDialog(Gtk::Window &parent)

View File

@ -5,6 +5,9 @@
// clang-format off // clang-format off
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
#include "remoteauthclient.hpp" #include "remoteauthclient.hpp"
// clang-format on // clang-format on

View File

@ -1,7 +1,10 @@
#include "settings.hpp" #include "settings.hpp"
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include <spdlog/spdlog.h>
#ifdef WITH_KEYCHAIN #ifdef WITH_KEYCHAIN
#include <keychain/keychain.h> #include <keychain/keychain.h>

View File

@ -1,7 +1,10 @@
#include "startup.hpp" #include "startup.hpp"
#include <future> #include <future>
#include <memory> #include <memory>
#include "abaddon.hpp"
DiscordStartupDialog::DiscordStartupDialog(Gtk::Window &window) DiscordStartupDialog::DiscordStartupDialog(Gtk::Window &window)
: Gtk::MessageDialog(window, "", false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE, true) { : Gtk::MessageDialog(window, "", false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE, true) {
m_dispatcher.connect(sigc::mem_fun(*this, &DiscordStartupDialog::DispatchCallback)); m_dispatcher.connect(sigc::mem_fun(*this, &DiscordStartupDialog::DispatchCallback));

View File

@ -1,7 +1,10 @@
#pragma once #pragma once
#include <glibmm/dispatcher.h>
#include <optional> #include <optional>
#include <glibmm/dispatcher.h>
#include <gtkmm/messagedialog.h>
// fetch cookies, build number async // fetch cookies, build number async
class DiscordStartupDialog : public Gtk::MessageDialog { class DiscordStartupDialog : public Gtk::MessageDialog {

View File

@ -1,7 +1,11 @@
#include "util.hpp"
#include <array> #include <array>
#include <cstring> #include <cstring>
#include <filesystem> #include <filesystem>
#include <gtkmm.h>
void LaunchBrowser(const Glib::ustring &url) { void LaunchBrowser(const Glib::ustring &url) {
GError *err = nullptr; GError *err = nullptr;
if (!gtk_show_uri_on_window(nullptr, url.c_str(), GDK_CURRENT_TIME, &err)) if (!gtk_show_uri_on_window(nullptr, url.c_str(), GDK_CURRENT_TIME, &err))

View File

@ -1,5 +1,10 @@
#include "auditlogpane.hpp" #include "auditlogpane.hpp"
#include <gtkmm/expander.h>
#include "abaddon.hpp"
#include "util.hpp"
using namespace std::string_literals; using namespace std::string_literals;
GuildSettingsAuditLogPane::GuildSettingsAuditLogPane(Snowflake id) GuildSettingsAuditLogPane::GuildSettingsAuditLogPane(Snowflake id)

View File

@ -1,4 +1,8 @@
#pragma once #pragma once
#include <gtkmm/listbox.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/objects.hpp" #include "discord/objects.hpp"
class GuildSettingsAuditLogPane : public Gtk::ScrolledWindow { class GuildSettingsAuditLogPane : public Gtk::ScrolledWindow {

View File

@ -1,7 +1,8 @@
#include "banspane.hpp" #include "banspane.hpp"
// gtk_list_store_set_value: assertion 'column >= 0 && column < priv->n_columns' failed #include <gtkmm/messagedialog.h>
// dont care to figure out why this happens cuz it doesnt seem to break anything
#include "abaddon.hpp"
GuildSettingsBansPane::GuildSettingsBansPane(Snowflake id) GuildSettingsBansPane::GuildSettingsBansPane(Snowflake id)
: Gtk::Box(Gtk::ORIENTATION_VERTICAL) : Gtk::Box(Gtk::ORIENTATION_VERTICAL)

View File

@ -1,4 +1,11 @@
#pragma once #pragma once
#include <gtkmm/box.h>
#include <gtkmm/liststore.h>
#include <gtkmm/menu.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/treeview.h>
#include "discord/snowflake.hpp" #include "discord/snowflake.hpp"
#include "discord/ban.hpp" #include "discord/ban.hpp"

View File

@ -1,5 +1,11 @@
#include "emojispane.hpp" #include "emojispane.hpp"
#include <gtkmm/messagedialog.h>
#include <gtkmm/treemodelfilter.h>
#include "abaddon.hpp"
#include "components/cellrendererpixbufanimation.hpp" #include "components/cellrendererpixbufanimation.hpp"
#include "util.hpp"
GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id) GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id)
: Gtk::Box(Gtk::ORIENTATION_VERTICAL) : Gtk::Box(Gtk::ORIENTATION_VERTICAL)

View File

@ -1,4 +1,13 @@
#pragma once #pragma once
#include <gtkmm/box.h>
#include <gtkmm/entry.h>
#include <gtkmm/liststore.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/treemodel.h>
#include <gtkmm/treemodelfilter.h>
#include <gtkmm/treeview.h>
#include "discord/emoji.hpp" #include "discord/emoji.hpp"
class GuildSettingsEmojisPane : public Gtk::Box { class GuildSettingsEmojisPane : public Gtk::Box {

View File

@ -1,6 +1,14 @@
#include "infopane.hpp" #include "infopane.hpp"
#include <filesystem> #include <filesystem>
#include <gdkmm/pixbufloader.h>
#include <gtkmm/filechoosernative.h>
#include <gtkmm/messagedialog.h>
#include "abaddon.hpp"
#include "util.hpp"
GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id) GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id)
: m_guild_name_label("Guild name") : m_guild_name_label("Guild name")
, GuildID(id) { , GuildID(id) {

View File

@ -1,4 +1,12 @@
#pragma once #pragma once
#include <gdkmm/pixbuf.h>
#include <gtkmm/entry.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/grid.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
#include "discord/guild.hpp" #include "discord/guild.hpp"
class GuildSettingsInfoPane : public Gtk::Grid { class GuildSettingsInfoPane : public Gtk::Grid {

View File

@ -1,5 +1,10 @@
#include "invitespane.hpp" #include "invitespane.hpp"
#include <gtkmm/messagedialog.h>
#include "abaddon.hpp"
#include "util.hpp"
GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id) GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id)
: GuildID(id) : GuildID(id)
, m_model(Gtk::ListStore::create(m_columns)) , m_model(Gtk::ListStore::create(m_columns))

View File

@ -1,4 +1,10 @@
#pragma once #pragma once
#include <gtkmm/liststore.h>
#include <gtkmm/menu.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/treeview.h>
#include "discord/objects.hpp" #include "discord/objects.hpp"
class GuildSettingsInvitesPane : public Gtk::ScrolledWindow { class GuildSettingsInvitesPane : public Gtk::ScrolledWindow {

View File

@ -1,5 +1,8 @@
#include "memberspane.hpp" #include "memberspane.hpp"
#include "abaddon.hpp"
#include "util.hpp"
GuildSettingsMembersPane::GuildSettingsMembersPane(Snowflake id) GuildSettingsMembersPane::GuildSettingsMembersPane(Snowflake id)
: Gtk::Box(Gtk::ORIENTATION_VERTICAL) : Gtk::Box(Gtk::ORIENTATION_VERTICAL)
, GuildID(id) , GuildID(id)

View File

@ -1,5 +1,15 @@
#pragma once #pragma once
#include <unordered_set> #include <unordered_set>
#include <gtkmm/box.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/entry.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/label.h>
#include <gtkmm/listbox.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/member.hpp" #include "discord/member.hpp"
#include "discord/guild.hpp" #include "discord/guild.hpp"
#include "components/lazyimage.hpp" #include "components/lazyimage.hpp"

View File

@ -1,5 +1,10 @@
#include "rolespane.hpp" #include "rolespane.hpp"
#include <gtkmm/messagedialog.h>
#include "abaddon.hpp"
#include "util.hpp"
GuildSettingsRolesPane::GuildSettingsRolesPane(Snowflake id) GuildSettingsRolesPane::GuildSettingsRolesPane(Snowflake id)
: Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)
, GuildID(id) , GuildID(id)

View File

@ -1,5 +1,16 @@
#pragma once #pragma once
#include <unordered_map> #include <unordered_map>
#include <gtkmm/box.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/colorbutton.h>
#include <gtkmm/entry.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/grid.h>
#include <gtkmm/label.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/guild.hpp" #include "discord/guild.hpp"
#include "components/draglistbox.hpp" #include "components/draglistbox.hpp"

View File

@ -1,5 +1,7 @@
#include "guildsettingswindow.hpp" #include "guildsettingswindow.hpp"
#include "abaddon.hpp"
GuildSettingsWindow::GuildSettingsWindow(Snowflake id) GuildSettingsWindow::GuildSettingsWindow(Snowflake id)
: m_main(Gtk::ORIENTATION_VERTICAL) : m_main(Gtk::ORIENTATION_VERTICAL)
, m_pane_info(id) , m_pane_info(id)

View File

@ -1,4 +1,9 @@
#pragma once #pragma once
#include <gtkmm/stack.h>
#include <gtkmm/stackswitcher.h>
#include <gtkmm/window.h>
#include "discord/snowflake.hpp" #include "discord/snowflake.hpp"
#include "guildsettings/infopane.hpp" #include "guildsettings/infopane.hpp"
#include "guildsettings/banspane.hpp" #include "guildsettings/banspane.hpp"

View File

@ -1,5 +1,8 @@
#include "mainwindow.hpp" #include "mainwindow.hpp"
#include "abaddon.hpp"
#include "util.hpp"
MainWindow::MainWindow() MainWindow::MainWindow()
: m_main_box(Gtk::ORIENTATION_VERTICAL) : m_main_box(Gtk::ORIENTATION_VERTICAL)
, m_content_box(Gtk::ORIENTATION_HORIZONTAL) , m_content_box(Gtk::ORIENTATION_HORIZONTAL)

View File

@ -1,5 +1,7 @@
#include "pinnedwindow.hpp" #include "pinnedwindow.hpp"
#include "abaddon.hpp"
PinnedWindow::PinnedWindow(const ChannelData &data) PinnedWindow::PinnedWindow(const ChannelData &data)
: ChannelID(data.ID) { : ChannelID(data.ID) {
if (data.GuildID.has_value()) if (data.GuildID.has_value())

View File

@ -1,4 +1,7 @@
#pragma once #pragma once
#include <gtkmm/window.h>
#include "discord/errors.hpp" #include "discord/errors.hpp"
#include "discord/channel.hpp" #include "discord/channel.hpp"
#include "discord/message.hpp" #include "discord/message.hpp"

View File

@ -1,5 +1,7 @@
#include "mutualfriendspane.hpp" #include "mutualfriendspane.hpp"
#include "abaddon.hpp"
MutualFriendItem::MutualFriendItem(const UserData &user) MutualFriendItem::MutualFriendItem(const UserData &user)
: Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) { : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) {
get_style_context()->add_class("mutual-friend-item"); get_style_context()->add_class("mutual-friend-item");

View File

@ -1,4 +1,11 @@
#pragma once #pragma once
#include <gtkmm/box.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
#include <gtkmm/listbox.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/objects.hpp" #include "discord/objects.hpp"
class MutualFriendItem : public Gtk::Box { class MutualFriendItem : public Gtk::Box {

View File

@ -1,5 +1,7 @@
#include "mutualguildspane.hpp" #include "mutualguildspane.hpp"
#include "abaddon.hpp"
MutualGuildItem::MutualGuildItem(const MutualGuildData &guild) MutualGuildItem::MutualGuildItem(const MutualGuildData &guild)
: Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)
, m_box(Gtk::ORIENTATION_VERTICAL) { , m_box(Gtk::ORIENTATION_VERTICAL) {

View File

@ -1,4 +1,11 @@
#pragma once #pragma once
#include <gtkmm/box.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
#include <gtkmm/listbox.h>
#include <gtkmm/scrolledwindow.h>
#include "discord/objects.hpp" #include "discord/objects.hpp"
class MutualGuildItem : public Gtk::Box { class MutualGuildItem : public Gtk::Box {

View File

@ -1,6 +1,12 @@
#include "userinfopane.hpp" #include "userinfopane.hpp"
#include <unordered_set> #include <unordered_set>
#include <gtkmm/messagedialog.h>
#include "abaddon.hpp"
#include "util.hpp"
static std::string GetConnectionURL(const ConnectionData &conn) { static std::string GetConnectionURL(const ConnectionData &conn) {
if (conn.Type == "github") { if (conn.Type == "github") {
return "https://github.com/" + conn.Name; return "https://github.com/" + conn.Name;

Some files were not shown because too many files have changed in this diff Show More