From 33bcb6a098db9d0f834d96a38e96c27d7136e92f Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Sat, 13 May 2023 21:40:30 -0400
Subject: add auto-refresh for main.css

---
 src/abaddon.cpp | 11 +++++++++++
 src/abaddon.hpp |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/src/abaddon.cpp b/src/abaddon.cpp
index e234520..5b5b179 100644
--- a/src/abaddon.cpp
+++ b/src/abaddon.cpp
@@ -255,6 +255,8 @@ int Abaddon::StartGTK() {
     m_main_window->GetChatWindow()->signal_action_reaction_remove().connect(sigc::mem_fun(*this, &Abaddon::ActionReactionRemove));
 
     ActionReloadCSS();
+    AttachCSSMonitor();
+
     if (m_settings.GetSettings().HideToTray) {
         m_tray = Gtk::StatusIcon::create("discord");
         m_tray->signal_activate().connect(sigc::mem_fun(*this, &Abaddon::on_tray_click));
@@ -627,6 +629,15 @@ void Abaddon::LoadState() {
     }
 }
 
+void Abaddon::AttachCSSMonitor() {
+    const auto path = GetCSSPath("/" + GetSettings().MainCSS);
+    const auto file = Gio::File::create_for_path(path);
+    m_main_css_monitor = file->monitor_file();
+    m_main_css_monitor->signal_changed().connect([this](const auto &file, const auto &other_file, Gio::FileMonitorEvent event) {
+        ActionReloadCSS();
+    });
+}
+
 void Abaddon::ManageHeapWindow(Gtk::Window *window) {
     window->signal_hide().connect([this, window]() {
         delete window;
diff --git a/src/abaddon.hpp b/src/abaddon.hpp
index 2fbbcc0..0c22bcd 100644
--- a/src/abaddon.hpp
+++ b/src/abaddon.hpp
@@ -111,6 +111,9 @@ protected:
     void SaveState();
     void LoadState();
 
+    void AttachCSSMonitor();
+    Glib::RefPtr<Gio::FileMonitor> m_main_css_monitor;
+
     Snowflake m_shown_user_menu_id;
     Snowflake m_shown_user_menu_guild_id;
 
-- 
cgit v1.2.3


From 052a58896b68994c026cae22c898414a9b3e9fec Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Sun, 14 May 2023 14:57:00 -0400
Subject: fix hypesquad bravery icon (closes #163)

---
 res/res/hypesquadbravery.png | Bin 7427 -> 1131 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/res/hypesquadbravery.png b/res/res/hypesquadbravery.png
index 0feaa04..3a1e818 100644
Binary files a/res/res/hypesquadbravery.png and b/res/res/hypesquadbravery.png differ
-- 
cgit v1.2.3


From 7dba382e63b1a8b73e3349dc273117bb339b6148 Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Sun, 14 May 2023 16:20:24 -0400
Subject: fix potential crash for guild verification gates

---
 src/discord/objects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/discord/objects.cpp b/src/discord/objects.cpp
index 0837633..0aeaf1f 100644
--- a/src/discord/objects.cpp
+++ b/src/discord/objects.cpp
@@ -536,7 +536,7 @@ void from_json(const nlohmann::json &j, VerificationFieldObject &m) {
 }
 
 void from_json(const nlohmann::json &j, VerificationGateInfoObject &m) {
-    JS_O("description", m.Description);
+    JS_ON("description", m.Description);
     JS_O("form_fields", m.VerificationFields);
     JS_O("version", m.Version);
     JS_O("enabled", m.Enabled);
-- 
cgit v1.2.3