Merge branch 'master' into classic-channels

33 files changed, 168 insertions, 7 deletions

diff --git a/src/windows/guildsettings/auditlogpane.cpp b/src/windows/guildsettings/auditlogpane.cpp
index f2f4a17..42e817e 100644
--- a/src/windows/guildsettings/auditlogpane.cpp
+++ b/src/windows/guildsettings/auditlogpane.cpp
@@ -1,5 +1,10 @@
 #include "auditlogpane.hpp"
 
+#include <gtkmm/expander.h>
+
+#include "abaddon.hpp"
+#include "util.hpp"
+
 using namespace std::string_literals;
 
 GuildSettingsAuditLogPane::GuildSettingsAuditLogPane(Snowflake id)
diff --git a/src/windows/guildsettings/auditlogpane.hpp b/src/windows/guildsettings/auditlogpane.hpp
index dc44d8f..a3f2051 100644
--- a/src/windows/guildsettings/auditlogpane.hpp
+++ b/src/windows/guildsettings/auditlogpane.hpp
@@ -1,4 +1,8 @@
 #pragma once
+
+#include <gtkmm/listbox.h>
+#include <gtkmm/scrolledwindow.h>
+
 #include "discord/objects.hpp"
 
 class GuildSettingsAuditLogPane : public Gtk::ScrolledWindow {
diff --git a/src/windows/guildsettings/banspane.cpp b/src/windows/guildsettings/banspane.cpp
index 68a232d..550114d 100644
--- a/src/windows/guildsettings/banspane.cpp
+++ b/src/windows/guildsettings/banspane.cpp
@@ -1,7 +1,8 @@
 #include "banspane.hpp"
 
-// gtk_list_store_set_value: assertion 'column >= 0 && column < priv->n_columns' failed
-// dont care to figure out why this happens cuz it doesnt seem to break anything
+#include <gtkmm/messagedialog.h>
+
+#include "abaddon.hpp"
 
 GuildSettingsBansPane::GuildSettingsBansPane(Snowflake id)
     : Gtk::Box(Gtk::ORIENTATION_VERTICAL)
diff --git a/src/windows/guildsettings/banspane.hpp b/src/windows/guildsettings/banspane.hpp
index d50b372..c0934b6 100644
--- a/src/windows/guildsettings/banspane.hpp
+++ b/src/windows/guildsettings/banspane.hpp
@@ -1,4 +1,11 @@
 #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/ban.hpp"
 
diff --git a/src/windows/guildsettings/emojispane.cpp b/src/windows/guildsettings/emojispane.cpp
index fd0abd5..00f39ea 100644
--- a/src/windows/guildsettings/emojispane.cpp
+++ b/src/windows/guildsettings/emojispane.cpp
@@ -1,5 +1,11 @@
 #include "emojispane.hpp"
+
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/treemodelfilter.h>
+
+#include "abaddon.hpp"
 #include "components/cellrendererpixbufanimation.hpp"
+#include "util.hpp"
 
 GuildSettingsEmojisPane::GuildSettingsEmojisPane(Snowflake guild_id)
     : Gtk::Box(Gtk::ORIENTATION_VERTICAL)
diff --git a/src/windows/guildsettings/emojispane.hpp b/src/windows/guildsettings/emojispane.hpp
index 43676c2..3890ffb 100644
--- a/src/windows/guildsettings/emojispane.hpp
+++ b/src/windows/guildsettings/emojispane.hpp
@@ -1,4 +1,13 @@
 #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"
 
 class GuildSettingsEmojisPane : public Gtk::Box {
diff --git a/src/windows/guildsettings/infopane.cpp b/src/windows/guildsettings/infopane.cpp
index e52e27d..45a87a4 100644
--- a/src/windows/guildsettings/infopane.cpp
+++ b/src/windows/guildsettings/infopane.cpp
@@ -1,6 +1,14 @@
 #include "infopane.hpp"
+
 #include <filesystem>
 
+#include <gdkmm/pixbufloader.h>
+#include <gtkmm/filechoosernative.h>
+#include <gtkmm/messagedialog.h>
+
+#include "abaddon.hpp"
+#include "util.hpp"
+
 GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id)
     : m_guild_name_label("Guild name")
     , GuildID(id) {
diff --git a/src/windows/guildsettings/infopane.hpp b/src/windows/guildsettings/infopane.hpp
index 4d4e87e..e531e8d 100644
--- a/src/windows/guildsettings/infopane.hpp
+++ b/src/windows/guildsettings/infopane.hpp
@@ -1,4 +1,12 @@
 #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"
 
 class GuildSettingsInfoPane : public Gtk::Grid {
diff --git a/src/windows/guildsettings/invitespane.cpp b/src/windows/guildsettings/invitespane.cpp
index a76b3f2..157f913 100644
--- a/src/windows/guildsettings/invitespane.cpp
+++ b/src/windows/guildsettings/invitespane.cpp
@@ -1,5 +1,10 @@
 #include "invitespane.hpp"
 
+#include <gtkmm/messagedialog.h>
+
+#include "abaddon.hpp"
+#include "util.hpp"
+
 GuildSettingsInvitesPane::GuildSettingsInvitesPane(Snowflake id)
     : GuildID(id)
     , m_model(Gtk::ListStore::create(m_columns))
diff --git a/src/windows/guildsettings/invitespane.hpp b/src/windows/guildsettings/invitespane.hpp
index 24086ca..ce05c31 100644
--- a/src/windows/guildsettings/invitespane.hpp
+++ b/src/windows/guildsettings/invitespane.hpp
@@ -1,4 +1,10 @@
 #pragma once
+
+#include <gtkmm/liststore.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treeview.h>
+
 #include "discord/objects.hpp"
 
 class GuildSettingsInvitesPane : public Gtk::ScrolledWindow {
diff --git a/src/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp
index 8c613d0..a4acba1 100644
--- a/src/windows/guildsettings/memberspane.cpp
+++ b/src/windows/guildsettings/memberspane.cpp
@@ -1,5 +1,8 @@
 #include "memberspane.hpp"
 
+#include "abaddon.hpp"
+#include "util.hpp"
+
 GuildSettingsMembersPane::GuildSettingsMembersPane(Snowflake id)
     : Gtk::Box(Gtk::ORIENTATION_VERTICAL)
     , GuildID(id)
diff --git a/src/windows/guildsettings/memberspane.hpp b/src/windows/guildsettings/memberspane.hpp
index 3aa558a..72039e8 100644
--- a/src/windows/guildsettings/memberspane.hpp
+++ b/src/windows/guildsettings/memberspane.hpp
@@ -1,5 +1,15 @@
 #pragma once
+
 #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/guild.hpp"
 #include "components/lazyimage.hpp"
diff --git a/src/windows/guildsettings/rolespane.cpp b/src/windows/guildsettings/rolespane.cpp
index 25088d7..fcb34bd 100644
--- a/src/windows/guildsettings/rolespane.cpp
+++ b/src/windows/guildsettings/rolespane.cpp
@@ -1,5 +1,10 @@
 #include "rolespane.hpp"
 
+#include <gtkmm/messagedialog.h>
+
+#include "abaddon.hpp"
+#include "util.hpp"
+
 GuildSettingsRolesPane::GuildSettingsRolesPane(Snowflake id)
     : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)
     , GuildID(id)
diff --git a/src/windows/guildsettings/rolespane.hpp b/src/windows/guildsettings/rolespane.hpp
index 82594d4..b374cc7 100644
--- a/src/windows/guildsettings/rolespane.hpp
+++ b/src/windows/guildsettings/rolespane.hpp
@@ -1,5 +1,16 @@
 #pragma once
+
 #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 "components/draglistbox.hpp"
 
diff --git a/src/windows/guildsettingswindow.cpp b/src/windows/guildsettingswindow.cpp
index 3f19100..ce390e0 100644
--- a/src/windows/guildsettingswindow.cpp
+++ b/src/windows/guildsettingswindow.cpp
@@ -1,5 +1,7 @@
 #include "guildsettingswindow.hpp"
 
+#include "abaddon.hpp"
+
 GuildSettingsWindow::GuildSettingsWindow(Snowflake id)
     : m_main(Gtk::ORIENTATION_VERTICAL)
     , m_pane_info(id)
diff --git a/src/windows/guildsettingswindow.hpp b/src/windows/guildsettingswindow.hpp
index 0b1ab97..8d14a3b 100644
--- a/src/windows/guildsettingswindow.hpp
+++ b/src/windows/guildsettingswindow.hpp
@@ -1,4 +1,9 @@
 #pragma once
+
+#include <gtkmm/stack.h>
+#include <gtkmm/stackswitcher.h>
+#include <gtkmm/window.h>
+
 #include "discord/snowflake.hpp"
 #include "guildsettings/infopane.hpp"
 #include "guildsettings/banspane.hpp"
diff --git a/src/windows/mainwindow.cpp b/src/windows/mainwindow.cpp
index 4579a6f..e814051 100644
--- a/src/windows/mainwindow.cpp
+++ b/src/windows/mainwindow.cpp
@@ -1,5 +1,8 @@
 #include "mainwindow.hpp"
 
+#include "abaddon.hpp"
+#include "util.hpp"
+
 MainWindow::MainWindow()
     : m_main_box(Gtk::ORIENTATION_VERTICAL)
     , m_content_box(Gtk::ORIENTATION_HORIZONTAL)
diff --git a/src/windows/pinnedwindow.cpp b/src/windows/pinnedwindow.cpp
index 467c2e3..05435cb 100644
--- a/src/windows/pinnedwindow.cpp
+++ b/src/windows/pinnedwindow.cpp
@@ -1,5 +1,7 @@
 #include "pinnedwindow.hpp"
 
+#include "abaddon.hpp"
+
 PinnedWindow::PinnedWindow(const ChannelData &data)
     : ChannelID(data.ID) {
     if (data.GuildID.has_value())
diff --git a/src/windows/pinnedwindow.hpp b/src/windows/pinnedwindow.hpp
index dd90a77..69fdbe0 100644
--- a/src/windows/pinnedwindow.hpp
+++ b/src/windows/pinnedwindow.hpp
@@ -1,4 +1,7 @@
 #pragma once
+
+#include <gtkmm/window.h>
+
 #include "discord/errors.hpp"
 #include "discord/channel.hpp"
 #include "discord/message.hpp"
diff --git a/src/windows/profile/mutualfriendspane.cpp b/src/windows/profile/mutualfriendspane.cpp
index 75fb4a6..612966f 100644
--- a/src/windows/profile/mutualfriendspane.cpp
+++ b/src/windows/profile/mutualfriendspane.cpp
@@ -1,5 +1,7 @@
 #include "mutualfriendspane.hpp"
 
+#include "abaddon.hpp"
+
 MutualFriendItem::MutualFriendItem(const UserData &user)
     : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) {
     get_style_context()->add_class("mutual-friend-item");
diff --git a/src/windows/profile/mutualfriendspane.hpp b/src/windows/profile/mutualfriendspane.hpp
index 5f2c964..3cd2fcb 100644
--- a/src/windows/profile/mutualfriendspane.hpp
+++ b/src/windows/profile/mutualfriendspane.hpp
@@ -1,4 +1,11 @@
 #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"
 
 class MutualFriendItem : public Gtk::Box {
diff --git a/src/windows/profile/mutualguildspane.cpp b/src/windows/profile/mutualguildspane.cpp
index ff3f0c1..86d6619 100644
--- a/src/windows/profile/mutualguildspane.cpp
+++ b/src/windows/profile/mutualguildspane.cpp
@@ -1,5 +1,7 @@
 #include "mutualguildspane.hpp"
 
+#include "abaddon.hpp"
+
 MutualGuildItem::MutualGuildItem(const MutualGuildData &guild)
     : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)
     , m_box(Gtk::ORIENTATION_VERTICAL) {
diff --git a/src/windows/profile/mutualguildspane.hpp b/src/windows/profile/mutualguildspane.hpp
index 33a4af9..0cd005b 100644
--- a/src/windows/profile/mutualguildspane.hpp
+++ b/src/windows/profile/mutualguildspane.hpp
@@ -1,4 +1,11 @@
 #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"
 
 class MutualGuildItem : public Gtk::Box {
diff --git a/src/windows/profile/userinfopane.cpp b/src/windows/profile/userinfopane.cpp
index ab4f50f..dc96e0f 100644
--- a/src/windows/profile/userinfopane.cpp
+++ b/src/windows/profile/userinfopane.cpp
@@ -1,6 +1,12 @@
 #include "userinfopane.hpp"
+
 #include <unordered_set>
 
+#include <gtkmm/messagedialog.h>
+
+#include "abaddon.hpp"
+#include "util.hpp"
+
 static std::string GetConnectionURL(const ConnectionData &conn) {
     if (conn.Type == "github") {
         return "https://github.com/" + conn.Name;
diff --git a/src/windows/profile/userinfopane.hpp b/src/windows/profile/userinfopane.hpp
index d83557b..7ac4c2b 100644
--- a/src/windows/profile/userinfopane.hpp
+++ b/src/windows/profile/userinfopane.hpp
@@ -1,4 +1,13 @@
 #pragma once
+
+#include <gtkmm/box.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/grid.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
+#include <gtkmm/overlay.h>
+#include <gtkmm/textview.h>
+
 #include "discord/objects.hpp"
 
 class ConnectionItem : public Gtk::EventBox {
diff --git a/src/windows/profilewindow.cpp b/src/windows/profilewindow.cpp
index 72996aa..8c4b67f 100644
--- a/src/windows/profilewindow.cpp
+++ b/src/windows/profilewindow.cpp
@@ -1,5 +1,8 @@
 #include "profilewindow.hpp"
 
+#include "abaddon.hpp"
+#include "util.hpp"
+
 ProfileWindow::ProfileWindow(Snowflake user_id)
     : ID(user_id)
     , m_main(Gtk::ORIENTATION_VERTICAL)
diff --git a/src/windows/profilewindow.hpp b/src/windows/profilewindow.hpp
index fbc30e0..4d71392 100644
--- a/src/windows/profilewindow.hpp
+++ b/src/windows/profilewindow.hpp
@@ -1,4 +1,9 @@
 #pragma once
+
+#include <gtkmm/stack.h>
+#include <gtkmm/stackswitcher.h>
+#include <gtkmm/window.h>
+
 #include "discord/snowflake.hpp"
 #include "profile/userinfopane.hpp"
 #include "profile/mutualguildspane.hpp"
diff --git a/src/windows/threadswindow.cpp b/src/windows/threadswindow.cpp
index 247edf6..81046d2 100644
--- a/src/windows/threadswindow.cpp
+++ b/src/windows/threadswindow.cpp
@@ -1,5 +1,7 @@
 #include "threadswindow.hpp"
 
+#include "abaddon.hpp"
+
 ThreadsWindow::ThreadsWindow(const ChannelData &channel)
     : m_channel_id(channel.ID)
     , m_filter_public(m_group, "Public")
diff --git a/src/windows/threadswindow.hpp b/src/windows/threadswindow.hpp
index f644e35..3ef01fc 100644
--- a/src/windows/threadswindow.hpp
+++ b/src/windows/threadswindow.hpp
@@ -1,4 +1,16 @@
 #pragma once
+
+#include <gtkmm/box.h>
+#include <gtkmm/buttonbox.h>
+#include <gtkmm/label.h>
+#include <gtkmm/listbox.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/radiobuttongroup.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/stack.h>
+#include <gtkmm/stackswitcher.h>
+#include <gtkmm/window.h>
+
 #include "discord/objects.hpp"
 
 class ActiveThreadsList : public Gtk::ScrolledWindow {
diff --git a/src/windows/voicesettingswindow.cpp b/src/windows/voicesettingswindow.cpp
index c114c04..90d0717 100644
--- a/src/windows/voicesettingswindow.cpp
+++ b/src/windows/voicesettingswindow.cpp
@@ -2,10 +2,11 @@
 
 // clang-format off
 
-#include "voicesettingswindow.hpp"
+#include <spdlog/spdlog.h>
+
 #include "abaddon.hpp"
 #include "audio/manager.hpp"
-#include <spdlog/spdlog.h>
+#include "voicesettingswindow.hpp"
 
 // clang-format on
 
diff --git a/src/windows/voicesettingswindow.hpp b/src/windows/voicesettingswindow.hpp
index 9b3498e..5e5e0fb 100644
--- a/src/windows/voicesettingswindow.hpp
+++ b/src/windows/voicesettingswindow.hpp
@@ -6,6 +6,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/scale.h>
+#include <gtkmm/spinbutton.h>
 #include <gtkmm/window.h>
 
 // clang-format on
diff --git a/src/windows/voicewindow.cpp b/src/windows/voicewindow.cpp
index 825681c..94ea700 100644
--- a/src/windows/voicewindow.cpp
+++ b/src/windows/voicewindow.cpp
@@ -2,11 +2,12 @@
 
 // clang-format off
 
-#include "voicewindow.hpp"
-#include "components/lazyimage.hpp"
 #include "abaddon.hpp"
 #include "audio/manager.hpp"
+#include "components/lazyimage.hpp"
 #include "voicesettingswindow.hpp"
+#include "voicewindow.hpp"
+
 // clang-format on
 
 class VoiceWindowUserListEntry : public Gtk::ListBoxRow {
diff --git a/src/windows/voicewindow.hpp b/src/windows/voicewindow.hpp
index 02e006f..018934b 100644
--- a/src/windows/voicewindow.hpp
+++ b/src/windows/voicewindow.hpp
@@ -6,7 +6,7 @@
 #include "discord/snowflake.hpp"
 #include <gtkmm/box.h>
 #include <gtkmm/checkbutton.h>
-#include <gtkmm/combobox.h>
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/listbox.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/progressbar.h>