update msys dependencies

because 1. joining a guild seems to often require captchas now which are never going to be supported and 2. joining guilds is one of the things that upsets discords spam filter the most, so it kinda makes sense to remove anyways just like open dm

ci/msys-deps.txt

@@ -14,7 +14,7 @@
 /bin/libdeflate.dll
 /bin/libepoxy-0.dll
 /bin/libexpat-1.dll
-/bin/libffi-7.dll
+/bin/libffi-8.dll
 /bin/libfontconfig-1.dll
 /bin/libfreetype-6.dll
 /bin/libfribidi-0.dll
@@ -42,7 +42,7 @@
 /bin/libpangoft2-1.0-0.dll
 /bin/libpangomm-1.4-1.dll
 /bin/libpangowin32-1.0-0.dll
-/bin/libpcre-1.dll
+/bin/libpcre2-8-0.dll
 /bin/libpixman-1-0.dll
 /bin/libpng16-16.dll
 /bin/libpsl-5.dll
@@ -56,4 +56,4 @@
 /bin/libwinpthread-1.dll
 /bin/libzstd.dll
 /bin/zlib1.dll
-../usr/bin/msys-2.0.dll
+/../usr/bin/msys-2.0.dll

src/abaddon.cpp

@@ -6,7 +6,6 @@
 #include "discord/discord.hpp"
 #include "dialogs/token.hpp"
 #include "dialogs/editmessage.hpp"
-#include "dialogs/joinguild.hpp"
 #include "dialogs/confirm.hpp"
 #include "dialogs/setstatus.hpp"
 #include "dialogs/friendpicker.hpp"
@@ -17,6 +16,7 @@
 #include "windows/profilewindow.hpp"
 #include "windows/pinnedwindow.hpp"
 #include "windows/threadswindow.hpp"
+#include "startup.hpp"
 
 #ifdef WITH_LIBHANDY
     #include <handy.h>
@@ -228,7 +228,6 @@ int Abaddon::StartGTK() {
     m_main_window->signal_action_disconnect().connect(sigc::mem_fun(*this, &Abaddon::ActionDisconnect));
     m_main_window->signal_action_set_token().connect(sigc::mem_fun(*this, &Abaddon::ActionSetToken));
     m_main_window->signal_action_reload_css().connect(sigc::mem_fun(*this, &Abaddon::ActionReloadCSS));
-    m_main_window->signal_action_join_guild().connect(sigc::mem_fun(*this, &Abaddon::ActionJoinGuildDialog));
     m_main_window->signal_action_set_status().connect(sigc::mem_fun(*this, &Abaddon::ActionSetStatus));
     m_main_window->signal_action_add_recipient().connect(sigc::mem_fun(*this, &Abaddon::ActionAddRecipient));
     m_main_window->signal_action_view_pins().connect(sigc::mem_fun(*this, &Abaddon::ActionViewPins));
@@ -247,12 +246,29 @@ int Abaddon::StartGTK() {
     m_main_window->GetChatWindow()->signal_action_reaction_remove().connect(sigc::mem_fun(*this, &Abaddon::ActionReactionRemove));
 
     ActionReloadCSS();
+    if (m_settings.GetSettings().HideToTray) {
+        m_tray = Gtk::StatusIcon::create("discord");
+        m_tray->signal_activate().connect(sigc::mem_fun(*this, &Abaddon::on_tray_click));
+        m_tray->signal_popup_menu().connect(sigc::mem_fun(*this, &Abaddon::on_tray_popup_menu));
+    }
+    m_tray_menu = Gtk::make_managed<Gtk::Menu>();
+    m_tray_exit = Gtk::make_managed<Gtk::MenuItem>("Quit", false);
 
+    m_tray_exit->signal_activate().connect(sigc::mem_fun(*this, &Abaddon::on_tray_menu_click));
+
+    m_tray_menu->append(*m_tray_exit);
+    m_tray_menu->show_all();
+
+    m_main_window->signal_hide().connect(sigc::mem_fun(*this, &Abaddon::on_window_hide));
     m_gtk_app->signal_shutdown().connect(sigc::mem_fun(*this, &Abaddon::OnShutdown), false);
 
     m_main_window->UpdateMenus();
 
+    m_gtk_app->hold();
     m_main_window->show();
+
+    RunFirstTimeDiscordStartup();
+
     return m_gtk_app->run(*m_main_window);
 }
 
@@ -435,6 +451,43 @@ void Abaddon::ShowUserMenu(const GdkEvent *event, Snowflake id, Snowflake guild_
     m_user_menu->popup_at_pointer(event);
 }
 
+void Abaddon::RunFirstTimeDiscordStartup() {
+    DiscordStartupDialog dlg(*m_main_window);
+    dlg.set_position(Gtk::WIN_POS_CENTER);
+
+    std::optional<std::string> cookie;
+    std::optional<uint32_t> build_number;
+
+    dlg.signal_response().connect([&](int response) {
+        if (response == Gtk::RESPONSE_OK) {
+            cookie = dlg.GetCookie();
+            build_number = dlg.GetBuildNumber();
+        }
+    });
+
+    dlg.run();
+
+    Glib::signal_idle().connect_once([this, cookie, build_number]() {
+        if (cookie.has_value()) {
+            m_discord.SetCookie(*cookie);
+        } else {
+            ConfirmDialog confirm(*m_main_window);
+            confirm.SetConfirmText("Cookies could not be fetched. This may increase your chances of being flagged by Discord's anti-spam");
+            confirm.SetAcceptOnly(true);
+            confirm.run();
+        }
+
+        if (build_number.has_value()) {
+            m_discord.SetBuildNumber(*build_number);
+        } else {
+            ConfirmDialog confirm(*m_main_window);
+            confirm.SetConfirmText("Build number could not be fetched. This may increase your chances of being flagged by Discord's anti-spam");
+            confirm.SetAcceptOnly(true);
+            confirm.run();
+        }
+    });
+}
+
 void Abaddon::ShowGuildVerificationGateDialog(Snowflake guild_id) {
     VerificationGateDialog dlg(*m_main_window, guild_id);
     if (dlg.run() == Gtk::RESPONSE_OK) {
@@ -638,15 +691,6 @@ void Abaddon::ActionSetToken() {
     m_main_window->UpdateMenus();
 }
 
-void Abaddon::ActionJoinGuildDialog() {
-    JoinGuildDialog dlg(*m_main_window);
-    auto response = dlg.run();
-    if (response == Gtk::RESPONSE_OK) {
-        auto code = dlg.GetCode();
-        m_discord.JoinGuild(code);
-    }
-}
-
 void Abaddon::ActionChannelOpened(Snowflake id, bool expand_to) {
     if (!id.IsValid()) {
         m_discord.SetReferringChannel(Snowflake::Invalid);
@@ -896,6 +940,21 @@ EmojiResource &Abaddon::GetEmojis() {
     return m_emojis;
 }
 
+void Abaddon::on_tray_click() {
+    m_main_window->set_visible(!m_main_window->is_visible());
+}
+void Abaddon::on_tray_menu_click() {
+    m_gtk_app->quit();
+}
+void Abaddon::on_tray_popup_menu(int button, int activate_time) {
+    m_tray->popup_menu_at_position(*m_tray_menu, button, activate_time);
+}
+void Abaddon::on_window_hide() {
+    if (!m_settings.GetSettings().HideToTray) {
+        m_gtk_app->quit();
+    }
+}
+
 int main(int argc, char **argv) {
     if (std::getenv("ABADDON_NO_FC") == nullptr)
         Platform::SetupFonts();

src/abaddon.hpp

@@ -1,3 +1,4 @@
+#pragma once
 #include <gtkmm.h>
 #include <memory>
 #include <mutex>
@@ -93,6 +94,8 @@ public:
     static std::string GetStateCachePath(const std::string &path);
 
 protected:
+    void RunFirstTimeDiscordStartup();
+
     void ShowGuildVerificationGateDialog(Snowflake guild_id);
 
     void CheckMessagesForMembers(const ChannelData &chan, const std::vector<Message> &msgs);
@@ -114,6 +117,8 @@ protected:
     Gtk::MenuItem *m_user_menu_roles;
     Gtk::MenuItem *m_user_menu_remove_recipient;
     Gtk::Menu *m_user_menu_roles_submenu;
+    Gtk::Menu *m_tray_menu;
+    Gtk::MenuItem *m_tray_exit;
 
     void on_user_menu_insert_mention();
     void on_user_menu_ban();
@@ -121,6 +126,10 @@ protected:
     void on_user_menu_copy_id();
     void on_user_menu_open_dm();
     void on_user_menu_remove_recipient();
+    void on_tray_click();
+    void on_tray_popup_menu(int button, int activate_time);
+    void on_tray_menu_click();
+    void on_window_hide();
 
 private:
     SettingsManager m_settings;
@@ -139,5 +148,6 @@ private:
     Glib::RefPtr<Gtk::Application> m_gtk_app;
     Glib::RefPtr<Gtk::CssProvider> m_css_provider;
     Glib::RefPtr<Gtk::CssProvider> m_css_low_provider; // registered with a lower priority to allow better customization
-    std::unique_ptr<MainWindow> m_main_window;         // wah wah cant create a gtkstylecontext fuck you
+    Glib::RefPtr<Gtk::StatusIcon> m_tray;
+    std::unique_ptr<MainWindow> m_main_window; // wah wah cant create a gtkstylecontext fuck you
 };

src/components/chatmessage.cpp

@@ -150,8 +150,8 @@ void ChatMessageItemContainer::UpdateAttributes() {
 
 void ChatMessageItemContainer::AddClickHandler(Gtk::Widget *widget, const std::string &url) {
     // clang-format off
-    widget->signal_button_press_event().connect([url](GdkEventButton *event) -> bool {
-        if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY) {
+    widget->signal_button_release_event().connect([url](GdkEventButton *event) -> bool {
+        if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY) {
             LaunchBrowser(url);
             return true;
         }
@@ -357,8 +357,8 @@ Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &emb
         if (embed.URL.has_value()) {
             AddPointerCursor(*title_ev);
             auto url = *embed.URL;
-            title_ev->signal_button_press_event().connect([url = std::move(url)](GdkEventButton *event) -> bool {
-                if (event->button == GDK_BUTTON_PRIMARY) {
+            title_ev->signal_button_release_event().connect([url = std::move(url)](GdkEventButton *event) -> bool {
+                if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY) {
                     LaunchBrowser(url);
                     return true;
                 }
@@ -655,13 +655,19 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
                 const auto role = discord.GetRole(role_id);
                 if (role.has_value()) {
                     const auto author = discord.GetUser(author_id);
-                    return "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">" + author->GetEscapedString() + "</span></b>";
+                    if (author.has_value()) {
+                        return "<b><span color=\"#" + IntToCSSColor(role->Color) + "\">" + author->GetEscapedString() + "</span></b>";
+                    }
                 }
             }
         }
 
         const auto author = discord.GetUser(author_id);
-        return author->GetEscapedBoldString<false>();
+        if (author.has_value()) {
+            return author->GetEscapedBoldString<false>();
+        }
+
+        return "<b>Unknown User</b>";
     };
 
     // if the message wasnt fetched from store it might have an un-fetched reference
@@ -673,15 +679,15 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
     }
 
     if (data.Interaction.has_value()) {
-        const auto user = *discord.GetUser(data.Interaction->User.ID);
-
         if (data.GuildID.has_value()) {
-            lbl->set_markup(get_author_markup(user.ID, *data.GuildID) +
+            lbl->set_markup(get_author_markup(data.Interaction->User.ID, *data.GuildID) +
                             " used <span color='#697ec4'>/" +
                             Glib::Markup::escape_text(data.Interaction->Name) +
                             "</span>");
+        } else if (const auto user = discord.GetUser(data.Interaction->User.ID); user.has_value()) {
+            lbl->set_markup(user->GetEscapedBoldString<false>());
         } else {
-            lbl->set_markup(user.GetEscapedBoldString<false>());
+            lbl->set_markup("<b>Unknown User</b>");
         }
     } else if (referenced_message.has_value()) {
         if (referenced_message.value() == nullptr) {

src/dialogs/confirm.cpp

@@ -34,3 +34,7 @@ ConfirmDialog::ConfirmDialog(Gtk::Window &parent)
 void ConfirmDialog::SetConfirmText(const Glib::ustring &text) {
     m_label.set_text(text);
 }
+
+void ConfirmDialog::SetAcceptOnly(bool accept_only) {
+    m_cancel.set_visible(!accept_only);
+}

src/dialogs/confirm.hpp

@@ -5,6 +5,7 @@ class ConfirmDialog : public Gtk::Dialog {
 public:
     ConfirmDialog(Gtk::Window &parent);
     void SetConfirmText(const Glib::ustring &text);
+    void SetAcceptOnly(bool accept_only);
 
 protected:
     Gtk::Label m_label;

src/dialogs/joinguild.cpp

@@ -1,97 +0,0 @@
-#include "joinguild.hpp"
-#include "abaddon.hpp"
-#include <nlohmann/json.hpp>
-#include <regex>
-
-JoinGuildDialog::JoinGuildDialog(Gtk::Window &parent)
-    : Gtk::Dialog("Join Server", parent, true)
-    , m_layout(Gtk::ORIENTATION_VERTICAL)
-    , m_ok("OK")
-    , m_cancel("Cancel")
-    , m_info("Enter code") {
-    set_default_size(300, 50);
-    get_style_context()->add_class("app-window");
-    get_style_context()->add_class("app-popup");
-
-    Glib::signal_idle().connect(sigc::mem_fun(*this, &JoinGuildDialog::on_idle_slot));
-
-    m_entry.signal_changed().connect(sigc::mem_fun(*this, &JoinGuildDialog::on_entry_changed));
-
-    m_ok.set_sensitive(false);
-
-    m_ok.signal_clicked().connect([&]() {
-        response(Gtk::RESPONSE_OK);
-    });
-
-    m_cancel.signal_clicked().connect([&]() {
-        response(Gtk::RESPONSE_CANCEL);
-    });
-
-    m_entry.set_hexpand(true);
-    m_layout.add(m_entry);
-    m_lower.set_hexpand(true);
-    m_lower.pack_start(m_info);
-    m_info.set_halign(Gtk::ALIGN_START);
-    m_lower.pack_start(m_ok, Gtk::PACK_SHRINK);
-    m_lower.pack_start(m_cancel, Gtk::PACK_SHRINK);
-    m_ok.set_halign(Gtk::ALIGN_END);
-    m_cancel.set_halign(Gtk::ALIGN_END);
-    m_layout.add(m_lower);
-    get_content_area()->add(m_layout);
-
-    show_all_children();
-}
-
-void JoinGuildDialog::on_entry_changed() {
-    std::string s = m_entry.get_text();
-    std::regex invite_regex(R"((https?:\/\/)?discord\.(gg(\/invite)?\/|com\/invite\/)([A-Za-z0-9\-]+))", std::regex_constants::ECMAScript);
-    std::smatch match;
-    bool full_url = std::regex_search(s, match, invite_regex);
-    if (full_url || IsCode(s)) {
-        m_code = full_url ? match[4].str() : s;
-        m_needs_request = true;
-        m_ok.set_sensitive(false);
-    } else {
-        m_ok.set_sensitive(false);
-    }
-}
-
-void JoinGuildDialog::CheckCode() {
-    auto cb = [this](const std::optional<InviteData> &invite) {
-        if (invite.has_value()) {
-            m_ok.set_sensitive(true);
-            if (invite->Guild.has_value()) {
-                if (invite->MemberCount.has_value())
-                    m_info.set_text(invite->Guild->Name + " (" + std::to_string(*invite->MemberCount) + " members)");
-                else
-                    m_info.set_text(invite->Guild->Name);
-            } else {
-                m_info.set_text("Group DM (" + std::to_string(*invite->MemberCount) + " members)");
-            }
-        } else {
-            m_ok.set_sensitive(false);
-            m_info.set_text("Invalid invite");
-        }
-    };
-    Abaddon::Get().GetDiscordClient().FetchInvite(m_code, sigc::track_obj(cb, *this));
-}
-
-bool JoinGuildDialog::IsCode(std::string str) {
-    return str.length() >= 2 && std::all_of(str.begin(), str.end(), [](char c) -> bool { return std::isalnum(c) || c == '-'; });
-}
-
-std::string JoinGuildDialog::GetCode() {
-    return m_code;
-}
-
-static const constexpr int RateLimitMS = 1500;
-bool JoinGuildDialog::on_idle_slot() {
-    const auto now = std::chrono::steady_clock::now();
-    if (m_needs_request && ((now - m_last_req_time) > std::chrono::milliseconds(RateLimitMS))) {
-        m_needs_request = false;
-        m_last_req_time = now;
-        CheckCode();
-    }
-
-    return true;
-}

src/dialogs/joinguild.hpp

@@ -1,31 +0,0 @@
-#pragma once
-#include <gtkmm.h>
-#include <string>
-#include <chrono>
-
-class JoinGuildDialog : public Gtk::Dialog {
-public:
-    JoinGuildDialog(Gtk::Window &parent);
-    std::string GetCode();
-
-protected:
-    void on_entry_changed();
-    static bool IsCode(std::string str);
-
-    Gtk::Box m_layout;
-    Gtk::Button m_ok;
-    Gtk::Button m_cancel;
-    Gtk::Box m_lower;
-    Gtk::Label m_info;
-    Gtk::Entry m_entry;
-
-    void CheckCode();
-
-    // needs a rate limit cuz if u hit it u get ip banned from /invites for a long time :(
-    bool m_needs_request = false;
-    std::chrono::time_point<std::chrono::steady_clock> m_last_req_time;
-    bool on_idle_slot();
-
-private:
-    std::string m_code;
-};

src/discord/discord.cpp

@@ -573,10 +573,6 @@ void DiscordClient::SendThreadLazyLoad(Snowflake id) {
     m_websocket.Send(msg);
 }
 
-void DiscordClient::JoinGuild(const std::string &code) {
-    m_http.MakePOST("/invites/" + code, "{}", [](auto) {});
-}
-
 void DiscordClient::LeaveGuild(Snowflake id) {
     m_http.MakeDELETE("/users/@me/guilds/" + std::to_string(id), [](auto) {});
 }
@@ -1188,6 +1184,14 @@ void DiscordClient::SetReferringChannel(Snowflake id) {
     }
 }
 
+void DiscordClient::SetBuildNumber(uint32_t build_number) {
+    m_build_number = build_number;
+}
+
+void DiscordClient::SetCookie(std::string_view cookie) {
+    m_http.SetCookie(cookie);
+}
+
 void DiscordClient::UpdateToken(const std::string &token) {
     if (!IsStarted()) {
         m_token = token;
@@ -2314,7 +2318,7 @@ void DiscordClient::SendIdentify() {
     msg.Properties.ReferrerCurrent = "";
     msg.Properties.ReferringDomainCurrent = "";
     msg.Properties.ReleaseChannel = "stable";
-    msg.Properties.ClientBuildNumber = 141021;
+    msg.Properties.ClientBuildNumber = m_build_number;
     msg.Properties.ClientEventSource = "";
     msg.Presence.Status = "online";
     msg.Presence.Since = 0;
@@ -2433,9 +2437,11 @@ void DiscordClient::StoreMessageData(Message &msg) {
     if (msg.Member.has_value())
         m_store.SetGuildMember(*msg.GuildID, msg.Author.ID, *msg.Member);
 
-    if (msg.Interaction.has_value() && msg.Interaction->Member.has_value()) {
+    if (msg.Interaction.has_value()) {
         m_store.SetUser(msg.Interaction->User.ID, msg.Interaction->User);
-        m_store.SetGuildMember(*msg.GuildID, msg.Interaction->User.ID, *msg.Interaction->Member);
+        if (msg.Interaction->Member.has_value()) {
+            m_store.SetGuildMember(*msg.GuildID, msg.Interaction->User.ID, *msg.Interaction->Member);
+        }
     }
 
     m_store.EndTransaction();

src/discord/discord.hpp

@@ -113,7 +113,6 @@ public:
     void EditMessage(Snowflake channel_id, Snowflake id, std::string content);
     void SendLazyLoad(Snowflake id);
     void SendThreadLazyLoad(Snowflake id);
-    void JoinGuild(const std::string &code);
     void LeaveGuild(Snowflake id);
     void KickUser(Snowflake user_id, Snowflake guild_id);
     void BanUser(Snowflake user_id, Snowflake guild_id); // todo: reason, delete messages
@@ -206,6 +205,9 @@ public:
 
     void SetReferringChannel(Snowflake id);
 
+    void SetBuildNumber(uint32_t build_number);
+    void SetCookie(std::string_view cookie);
+
     void UpdateToken(const std::string &token);
     void SetUserAgent(const std::string &agent);
 
@@ -303,6 +305,8 @@ private:
 
     std::string m_token;
 
+    uint32_t m_build_number = 142000;
+
     void AddUserToGuild(Snowflake user_id, Snowflake guild_id);
     std::map<Snowflake, std::set<Snowflake>> m_guild_to_users;
     std::map<Snowflake, std::set<Snowflake>> m_guild_to_channels;

src/discord/httpclient.cpp

@@ -2,7 +2,6 @@
 
 #include <utility>
 
-//#define USE_LOCAL_PROXY
 HTTPClient::HTTPClient() {
     m_dispatcher.connect(sigc::mem_fun(*this, &HTTPClient::RunCallbacks));
 }
@@ -23,6 +22,10 @@ void HTTPClient::SetPersistentHeader(std::string name, std::string value) {
     m_headers.insert_or_assign(std::move(name), std::move(value));
 }
 
+void HTTPClient::SetCookie(std::string_view cookie) {
+    m_cookie = cookie;
+}
+
 void HTTPClient::MakeDELETE(const std::string &path, const std::function<void(http::response_type r)> &cb) {
     printf("DELETE %s\n", path.c_str());
     m_futures.push_back(std::async(std::launch::async, [this, path, cb] {
@@ -31,10 +34,6 @@ void HTTPClient::MakeDELETE(const std::string &path, const std::function<void(ht
         req.set_header("Authorization", m_authorization);
         req.set_header("Origin", "https://discord.com");
         req.set_user_agent(!m_agent.empty() ? m_agent : "Abaddon");
-#ifdef USE_LOCAL_PROXY
-        req.set_proxy("http://127.0.0.1:8888");
-        req.set_verify_ssl(false);
-#endif
 
         auto res = req.execute();
 
@@ -52,10 +51,6 @@ void HTTPClient::MakePATCH(const std::string &path, const std::string &payload,
         req.set_header("Origin", "https://discord.com");
         req.set_user_agent(!m_agent.empty() ? m_agent : "Abaddon");
         req.set_body(payload);
-#ifdef USE_LOCAL_PROXY
-        req.set_proxy("http://127.0.0.1:8888");
-        req.set_verify_ssl(false);
-#endif
 
         auto res = req.execute();
 
@@ -73,10 +68,6 @@ void HTTPClient::MakePOST(const std::string &path, const std::string &payload, c
         req.set_header("Origin", "https://discord.com");
         req.set_user_agent(!m_agent.empty() ? m_agent : "Abaddon");
         req.set_body(payload);
-#ifdef USE_LOCAL_PROXY
-        req.set_proxy("http://127.0.0.1:8888");
-        req.set_verify_ssl(false);
-#endif
 
         auto res = req.execute();
 
@@ -95,10 +86,6 @@ void HTTPClient::MakePUT(const std::string &path, const std::string &payload, co
             req.set_header("Content-Type", "application/json");
         req.set_user_agent(!m_agent.empty() ? m_agent : "Abaddon");
         req.set_body(payload);
-#ifdef USE_LOCAL_PROXY
-        req.set_proxy("http://127.0.0.1:8888");
-        req.set_verify_ssl(false);
-#endif
 
         auto res = req.execute();
 
@@ -113,10 +100,6 @@ void HTTPClient::MakeGET(const std::string &path, const std::function<void(http:
         AddHeaders(req);
         req.set_header("Authorization", m_authorization);
         req.set_user_agent(!m_agent.empty() ? m_agent : "Abaddon");
-#ifdef USE_LOCAL_PROXY
-        req.set_proxy("http://127.0.0.1:8888");
-        req.set_verify_ssl(false);
-#endif
 
         auto res = req.execute();
 
@@ -128,10 +111,6 @@ http::request HTTPClient::CreateRequest(http::EMethod method, std::string path)
     http::request req(method, m_api_base + path);
     req.set_header("Authorization", m_authorization);
     req.set_user_agent(!m_agent.empty() ? m_agent : "Abaddon");
-#ifdef USE_LOCAL_PROXY
-    req.set_proxy("http://127.0.0.1:8888");
-    req.set_verify_ssl(false);
-#endif
     return req;
 }
 
@@ -163,7 +142,8 @@ void HTTPClient::AddHeaders(http::request &r) {
     for (const auto &[name, val] : m_headers) {
         r.set_header(name, val);
     }
-    curl_easy_setopt(r.get_curl(), CURLOPT_ACCEPT_ENCODING, "gzip, deflate, br");
+    curl_easy_setopt(r.get_curl(), CURLOPT_COOKIE, m_cookie.c_str());
+    curl_easy_setopt(r.get_curl(), CURLOPT_ACCEPT_ENCODING, "");
 }
 
 void HTTPClient::OnResponse(const http::response_type &r, const std::function<void(http::response_type r)> &cb) {

src/discord/httpclient.hpp

@@ -18,6 +18,7 @@ public:
     void SetUserAgent(std::string agent);
     void SetAuth(std::string auth);
     void SetPersistentHeader(std::string name, std::string value);
+    void SetCookie(std::string_view cookie);
 
     void MakeDELETE(const std::string &path, const std::function<void(http::response_type r)> &cb);
     void MakeGET(const std::string &path, const std::function<void(http::response_type r)> &cb);
@@ -44,4 +45,5 @@ private:
     std::string m_authorization;
     std::string m_agent;
     std::unordered_map<std::string, std::string> m_headers;
+    std::string m_cookie;
 };

src/discord/usersettings.cpp

@@ -8,33 +8,5 @@ void from_json(const nlohmann::json &j, UserSettingsGuildFoldersEntry &m) {
 }
 
 void from_json(const nlohmann::json &j, UserSettings &m) {
-    JS_D("timezone_offset", m.TimezoneOffset);
-    JS_D("theme", m.Theme);
-    JS_D("stream_notifications_enabled", m.AreStreamNotificationsEnabled);
-    JS_D("status", m.Status);
-    JS_D("show_current_game", m.ShouldShowCurrentGame);
-    // JS_D("restricted_guilds", m.RestrictedGuilds);
-    JS_D("render_reactions", m.ShouldRenderReactions);
-    JS_D("render_embeds", m.ShouldRenderEmbeds);
-    JS_D("native_phone_integration_enabled", m.IsNativePhoneIntegrationEnabled);
-    JS_D("message_display_compact", m.ShouldMessageDisplayCompact);
-    JS_D("locale", m.Locale);
-    JS_D("inline_embed_media", m.ShouldInlineEmbedMedia);
-    JS_D("inline_attachment_media", m.ShouldInlineAttachmentMedia);
-    JS_D("guild_positions", m.GuildPositions);
     JS_D("guild_folders", m.GuildFolders);
-    JS_D("gif_auto_play", m.ShouldGIFAutoplay);
-    // JS_D("friend_source_flags", m.FriendSourceFlags);
-    JS_D("explicit_content_filter", m.ExplicitContentFilter);
-    JS_D("enable_tts_command", m.IsTTSCommandEnabled);
-    JS_D("disable_games_tab", m.ShouldDisableGamesTab);
-    JS_D("developer_mode", m.DeveloperMode);
-    JS_D("detect_platform_accounts", m.ShouldDetectPlatformAccounts);
-    JS_D("default_guilds_restricted", m.AreDefaultGuildsRestricted);
-    // JS_N("custom_status", m.CustomStatus);
-    JS_D("convert_emoticons", m.ShouldConvertEmoticons);
-    JS_D("contact_sync_enabled", m.IsContactSyncEnabled);
-    JS_D("animate_emoji", m.ShouldAnimateEmojis);
-    JS_D("allow_accessibility_detection", m.IsAccessibilityDetectionAllowed);
-    JS_D("afk_timeout", m.AFKTimeout);
 }

src/discord/usersettings.hpp

@@ -13,35 +13,36 @@ struct UserSettingsGuildFoldersEntry {
 };
 
 struct UserSettings {
-    int TimezoneOffset;                 //
-    std::string Theme;                  //
-    bool AreStreamNotificationsEnabled; //
-    std::string Status;                 //
-    bool ShouldShowCurrentGame;         //
-    // std::vector<Unknown> RestrictedGuilds; //
-    bool ShouldRenderReactions;                              //
-    bool ShouldRenderEmbeds;                                 //
-    bool IsNativePhoneIntegrationEnabled;                    //
-    bool ShouldMessageDisplayCompact;                        //
-    std::string Locale;                                      //
-    bool ShouldInlineEmbedMedia;                             //
-    bool ShouldInlineAttachmentMedia;                        //
-    std::vector<Snowflake> GuildPositions;                   // deprecated?
-    std::vector<UserSettingsGuildFoldersEntry> GuildFolders; //
-    bool ShouldGIFAutoplay;                                  //
-    // Unknown FriendSourceFlags; //
-    int ExplicitContentFilter;         //
-    bool IsTTSCommandEnabled;          //
-    bool ShouldDisableGamesTab;        //
-    bool DeveloperMode;                //
-    bool ShouldDetectPlatformAccounts; //
-    bool AreDefaultGuildsRestricted;   //
+    std::vector<UserSettingsGuildFoldersEntry> GuildFolders;
+    /*
+    int TimezoneOffset;
+    std::string Theme;
+    bool AreStreamNotificationsEnabled;
+    std::string Status;
+    bool ShouldShowCurrentGame;
+    // std::vector<Unknown> RestrictedGuilds;
+    bool ShouldRenderReactions;
+    bool ShouldRenderEmbeds;
+    bool IsNativePhoneIntegrationEnabled;
+    bool ShouldMessageDisplayCompact;
+    std::string Locale;
+    bool ShouldInlineEmbedMedia;
+    bool ShouldInlineAttachmentMedia;
+    std::vector<Snowflake> GuildPositions; // deprecated?
+    bool ShouldGIFAutoplay;
+    // Unknown FriendSourceFlags;
+    int ExplicitContentFilter;
+    bool IsTTSCommandEnabled;
+    bool ShouldDisableGamesTab;
+    bool DeveloperMode;
+    bool ShouldDetectPlatformAccounts;
+    bool AreDefaultGuildsRestricted;
     // Unknown CustomStatus; // null
-    bool ShouldConvertEmoticons;          //
-    bool IsContactSyncEnabled;            //
-    bool ShouldAnimateEmojis;             //
-    bool IsAccessibilityDetectionAllowed; //
-    int AFKTimeout;
+    bool ShouldConvertEmoticons;
+    bool IsContactSyncEnabled;
+    bool ShouldAnimateEmojis;
+    bool IsAccessibilityDetectionAllowed;
+    int AFKTimeout;*/
 
     friend void from_json(const nlohmann::json &j, UserSettings &m);
 };

src/http.cpp

@@ -2,6 +2,8 @@
 
 #include <utility>
 
+// #define USE_LOCAL_PROXY
+
 namespace http {
 request::request(EMethod method, std::string url)
     : m_url(std::move(url)) {
@@ -34,7 +36,6 @@ request::request(request &&other) noexcept
     , m_url(std::exchange(other.m_url, ""))
     , m_method(std::exchange(other.m_method, nullptr))
     , m_header_list(std::exchange(other.m_header_list, nullptr))
-    , m_error_buf(other.m_error_buf)
     , m_form(std::exchange(other.m_form, nullptr))
     , m_read_streams(std::move(other.m_read_streams))
     , m_progress_callback(std::move(other.m_progress_callback)) {
@@ -147,14 +148,16 @@ response request::execute() {
     detail::check_init();
 
     std::string str;
+#ifdef USE_LOCAL_PROXY
+    set_proxy("http://127.0.0.1:8888");
+    set_verify_ssl(false);
+#endif
     curl_easy_setopt(m_curl, CURLOPT_NOSIGNAL, 1L);
     curl_easy_setopt(m_curl, CURLOPT_CUSTOMREQUEST, m_method);
     curl_easy_setopt(m_curl, CURLOPT_URL, m_url.c_str());
     curl_easy_setopt(m_curl, CURLOPT_FOLLOWLOCATION, 1);
     curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, detail::curl_write_data_callback);
     curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, &str);
-    curl_easy_setopt(m_curl, CURLOPT_ERRORBUFFER, m_error_buf);
-    m_error_buf[0] = '\0';
     if (m_header_list != nullptr)
         curl_easy_setopt(m_curl, CURLOPT_HTTPHEADER, m_header_list);
     if (m_form != nullptr)
@@ -164,7 +167,6 @@ response request::execute() {
     if (result != CURLE_OK) {
         auto response = detail::make_response(m_url, EStatusCode::ClientErrorCURLPerform);
         response.error_string = curl_easy_strerror(result);
-        response.error_string += " " + std::string(m_error_buf.data());
         return response;
     }
 

src/http.hpp

@@ -131,7 +131,6 @@ private:
     std::string m_url;
     const char *m_method;
     curl_slist *m_header_list = nullptr;
-    std::array<char, CURL_ERROR_SIZE> m_error_buf = { 0 };
     curl_mime *m_form = nullptr;
     std::function<void(curl_off_t, curl_off_t)> m_progress_callback;
 

src/settings.cpp

@@ -48,6 +48,7 @@ void SettingsManager::ReadSettings() {
     SMBOOL("gui", "save_state", SaveState);
     SMBOOL("gui", "stock_emojis", ShowStockEmojis);
     SMBOOL("gui", "unreads", Unreads);
+    SMBOOL("gui", "hide_to_tray", HideToTray);
     SMINT("http", "concurrent", CacheHTTPConcurrency);
     SMSTR("http", "user_agent", UserAgent);
     SMSTR("style", "expandercolor", ChannelsExpanderColor);
@@ -101,6 +102,7 @@ void SettingsManager::Close() {
         SMBOOL("gui", "save_state", SaveState);
         SMBOOL("gui", "stock_emojis", ShowStockEmojis);
         SMBOOL("gui", "unreads", Unreads);
+        SMBOOL("gui", "hide_to_tray", HideToTray);
         SMINT("http", "concurrent", CacheHTTPConcurrency);
         SMSTR("http", "user_agent", UserAgent);
         SMSTR("style", "expandercolor", ChannelsExpanderColor);

src/settings.hpp

@@ -28,6 +28,8 @@ public:
 #endif
         bool Unreads { true };
 
+        bool HideToTray { false };
+
         // [http]
         int CacheHTTPConcurrency { 20 };
         std::string UserAgent { "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36" };

src/startup.cpp

@@ -0,0 +1,126 @@
+#include "startup.hpp"
+#include "abaddon.hpp"
+#include <future>
+#include <memory>
+
+DiscordStartupDialog::DiscordStartupDialog(Gtk::Window &window)
+    : Gtk::MessageDialog(window, "", false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE, true) {
+    m_dispatcher.connect(sigc::mem_fun(*this, &DiscordStartupDialog::DispatchCallback));
+
+    property_text() = "Getting connection info...";
+
+    RunAsync();
+}
+
+std::optional<std::string> DiscordStartupDialog::GetCookie() const {
+    return m_cookie;
+}
+
+std::optional<uint32_t> DiscordStartupDialog::GetBuildNumber() const {
+    return m_build_number;
+}
+
+// good enough
+std::optional<std::pair<std::string, std::string>> ParseCookie(const Glib::ustring &str) {
+    auto regex = Glib::Regex::create("\\t");
+    const std::vector<Glib::ustring> split = regex->split(str);
+    if (split.size() < 7) return {};
+
+    return { { split[5], split[6] } };
+}
+
+std::optional<Glib::ustring> GetJavascriptFileFromAppPage(const Glib::ustring &contents) {
+    auto regex = Glib::Regex::create(R"(app-mount.*(/assets/[\w\d]*.js).*/assets/[\w\d]*.js)");
+    Glib::MatchInfo match;
+    if (regex->match(contents, match)) {
+        return match.fetch(1);
+    }
+
+    return {};
+}
+
+std::optional<uint32_t> GetBuildNumberFromJSURL(const Glib::ustring &url, const std::string &cookie) {
+    http::request req(http::REQUEST_GET, "https://discord.com" + url);
+    req.set_header("Accept-Language", "en-US,en;q=0.9");
+    req.set_header("Sec-Fetch-Dest", "document");
+    req.set_header("Sec-Fetch-Mode", "navigate");
+    req.set_header("Sec-Fetch-Site", "none");
+    req.set_header("Sec-Fetch-User", "?1");
+    req.set_user_agent(Abaddon::Get().GetSettings().UserAgent);
+
+    curl_easy_setopt(req.get_curl(), CURLOPT_COOKIE, cookie.c_str());
+
+    auto res = req.execute();
+    if (res.error) return {};
+
+    auto regex = Glib::Regex::create(R"("buildNumber",null!==\(t="(\d+)\"\))");
+    Glib::MatchInfo match;
+    if (regex->match(res.text, match)) {
+        const auto str_value = match.fetch(1);
+        try {
+            return std::stoul(str_value);
+        } catch (...) { return {}; }
+    }
+
+    return {};
+}
+
+std::pair<std::optional<std::string>, std::string> GetCookieTask() {
+    http::request req(http::REQUEST_GET, "https://discord.com/app");
+    req.set_header("Accept-Language", "en-US,en;q=0.9");
+    req.set_header("Sec-Fetch-Dest", "document");
+    req.set_header("Sec-Fetch-Mode", "navigate");
+    req.set_header("Sec-Fetch-Site", "none");
+    req.set_header("Sec-Fetch-User", "?1");
+    req.set_user_agent(Abaddon::Get().GetSettings().UserAgent);
+
+    curl_easy_setopt(req.get_curl(), CURLOPT_COOKIEFILE, "");
+
+    auto res = req.execute();
+    if (res.error) return {};
+
+    curl_slist *slist;
+    if (curl_easy_getinfo(req.get_curl(), CURLINFO_COOKIELIST, &slist) != CURLE_OK) {
+        return {};
+    }
+
+    std::string dcfduid;
+    std::string sdcfduid;
+
+    for (auto *cur = slist; cur != nullptr; cur = cur->next) {
+        const auto cookie = ParseCookie(cur->data);
+        if (cookie.has_value()) {
+            if (cookie->first == "__dcfduid") {
+                dcfduid = cookie->second;
+            } else if (cookie->first == "__sdcfduid") {
+                sdcfduid = cookie->second;
+            }
+        }
+    }
+    curl_slist_free_all(slist);
+
+    if (!dcfduid.empty() && !sdcfduid.empty()) {
+        return { "__dcfduid=" + dcfduid + "; __sdcfduid=" + sdcfduid, res.text };
+    }
+
+    return {};
+}
+
+void DiscordStartupDialog::RunAsync() {
+    auto futptr = std::make_shared<std::future<void>>();
+    *futptr = std::async(std::launch::async, [this, futptr] {
+        auto [opt_cookie, app_page] = GetCookieTask();
+        m_cookie = opt_cookie;
+        if (opt_cookie.has_value()) {
+            auto js_url = GetJavascriptFileFromAppPage(app_page);
+            if (js_url.has_value()) {
+                m_build_number = GetBuildNumberFromJSURL(*js_url, *opt_cookie);
+            }
+        }
+        m_dispatcher.emit();
+    });
+}
+
+void DiscordStartupDialog::DispatchCallback() {
+    response(Gtk::RESPONSE_OK);
+}

src/startup.hpp

@@ -0,0 +1,25 @@
+#pragma once
+#include <glibmm/dispatcher.h>
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/window.h>
+#include <optional>
+
+// fetch cookies, build number async
+
+class DiscordStartupDialog : public Gtk::MessageDialog {
+public:
+    DiscordStartupDialog(Gtk::Window &window);
+
+    [[nodiscard]] std::optional<std::string> GetCookie() const;
+    [[nodiscard]] std::optional<uint32_t> GetBuildNumber() const;
+
+private:
+    void RunAsync();
+
+    void DispatchCallback();
+
+    Glib::Dispatcher m_dispatcher;
+
+    std::optional<std::string> m_cookie;
+    std::optional<uint32_t> m_build_number;
+};

src/windows/guildsettings/infopane.cpp

@@ -56,10 +56,9 @@ GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id)
             guild_icon_url = guild.GetIconURL("gif", "512");
         else
             guild_icon_url = guild.GetIconURL("png", "512");
-        m_guild_icon_ev.signal_button_press_event().connect([guild_icon_url](GdkEventButton *event) -> bool {
-            if (event->type == GDK_BUTTON_PRESS)
-                if (event->button == GDK_BUTTON_PRIMARY)
-                    LaunchBrowser(guild_icon_url);
+        m_guild_icon_ev.signal_button_release_event().connect([guild_icon_url](GdkEventButton *event) -> bool {
+            if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY)
+                LaunchBrowser(guild_icon_url);
 
             return false;
         });

src/windows/mainwindow.cpp

@@ -195,7 +195,6 @@ void MainWindow::OnDiscordSubmenuPopup() {
     std::string token = Abaddon::Get().GetDiscordToken();
     m_menu_discord_connect.set_sensitive(!token.empty() && !discord_active);
     m_menu_discord_disconnect.set_sensitive(discord_active);
-    m_menu_discord_join_guild.set_sensitive(discord_active);
     m_menu_discord_set_token.set_sensitive(!discord_active);
     m_menu_discord_set_status.set_sensitive(discord_active);
 }
@@ -238,15 +237,12 @@ void MainWindow::SetupMenu() {
     m_menu_discord_disconnect.set_label("Disconnect");
     m_menu_discord_disconnect.set_sensitive(false);
     m_menu_discord_set_token.set_label("Set Token");
-    m_menu_discord_join_guild.set_label("Accept Invite");
-    m_menu_discord_join_guild.set_sensitive(false);
     m_menu_discord_set_status.set_label("Set Status");
     m_menu_discord_set_status.set_sensitive(false);
     m_menu_discord_add_recipient.set_label("Add user to DM");
     m_menu_discord_sub.append(m_menu_discord_connect);
     m_menu_discord_sub.append(m_menu_discord_disconnect);
     m_menu_discord_sub.append(m_menu_discord_set_token);
-    m_menu_discord_sub.append(m_menu_discord_join_guild);
     m_menu_discord_sub.append(m_menu_discord_set_status);
     m_menu_discord_sub.append(m_menu_discord_add_recipient);
     m_menu_discord.set_submenu(m_menu_discord_sub);
@@ -297,10 +293,6 @@ void MainWindow::SetupMenu() {
         m_signal_action_set_token.emit();
     });
 
-    m_menu_discord_join_guild.signal_activate().connect([this] {
-        m_signal_action_join_guild.emit();
-    });
-
     m_menu_file_reload_css.signal_activate().connect([this] {
         m_signal_action_reload_css.emit();
     });
@@ -383,10 +375,6 @@ MainWindow::type_signal_action_reload_css MainWindow::signal_action_reload_css()
     return m_signal_action_reload_css;
 }
 
-MainWindow::type_signal_action_join_guild MainWindow::signal_action_join_guild() {
-    return m_signal_action_join_guild;
-}
-
 MainWindow::type_signal_action_set_status MainWindow::signal_action_set_status() {
     return m_signal_action_set_status;
 }
@@ -401,4 +389,4 @@ MainWindow::type_signal_action_view_pins MainWindow::signal_action_view_pins() {
 
 MainWindow::type_signal_action_view_threads MainWindow::signal_action_view_threads() {
     return m_signal_action_view_threads;
-}
+}

src/windows/mainwindow.hpp

@@ -63,7 +63,6 @@ private:
     Gtk::MenuItem m_menu_discord_connect;
     Gtk::MenuItem m_menu_discord_disconnect;
     Gtk::MenuItem m_menu_discord_set_token;
-    Gtk::MenuItem m_menu_discord_join_guild;
     Gtk::MenuItem m_menu_discord_set_status;
     Gtk::MenuItem m_menu_discord_add_recipient; // move me somewhere else some day
     void OnDiscordSubmenuPopup();
@@ -83,6 +82,7 @@ private:
     Gtk::MenuItem m_menu_view_go_back;
     Gtk::MenuItem m_menu_view_go_forward;
 #endif
+
     void OnViewSubmenuPopup();
 
 public:
@@ -90,7 +90,6 @@ public:
     typedef sigc::signal<void> type_signal_action_disconnect;
     typedef sigc::signal<void> type_signal_action_set_token;
     typedef sigc::signal<void> type_signal_action_reload_css;
-    typedef sigc::signal<void> type_signal_action_join_guild;
     typedef sigc::signal<void> type_signal_action_set_status;
     // this should probably be removed
     typedef sigc::signal<void, Snowflake> type_signal_action_add_recipient; // channel id
@@ -101,7 +100,6 @@ public:
     type_signal_action_disconnect signal_action_disconnect();
     type_signal_action_set_token signal_action_set_token();
     type_signal_action_reload_css signal_action_reload_css();
-    type_signal_action_join_guild signal_action_join_guild();
     type_signal_action_set_status signal_action_set_status();
     type_signal_action_add_recipient signal_action_add_recipient();
     type_signal_action_view_pins signal_action_view_pins();
@@ -112,7 +110,6 @@ private:
     type_signal_action_disconnect m_signal_action_disconnect;
     type_signal_action_set_token m_signal_action_set_token;
     type_signal_action_reload_css m_signal_action_reload_css;
-    type_signal_action_join_guild m_signal_action_join_guild;
     type_signal_action_set_status m_signal_action_set_status;
     type_signal_action_add_recipient m_signal_action_add_recipient;
     type_signal_action_view_pins m_signal_action_view_pins;

src/windows/profile/userinfopane.cpp

@@ -41,13 +41,13 @@ ConnectionItem::ConnectionItem(const ConnectionData &conn)
     m_box.add(m_name);
     if (!url.empty()) {
         auto cb = [url](GdkEventButton *event) -> bool {
-            if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY) {
+            if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY) {
                 LaunchBrowser(url);
                 return true;
             }
             return false;
         };
-        signal_button_press_event().connect(sigc::track_obj(cb, *this));
+        signal_button_release_event().connect(sigc::track_obj(cb, *this));
         AddPointerCursor(*this);
     }
     m_overlay.add(m_box);

src/windows/profilewindow.cpp

@@ -34,8 +34,8 @@ ProfileWindow::ProfileWindow(Snowflake user_id)
 
     if (user.HasAvatar())
         AddPointerCursor(m_avatar_ev);
-    m_avatar_ev.signal_button_press_event().connect([user](GdkEventButton *event) -> bool {
-        if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY) {
+    m_avatar_ev.signal_button_release_event().connect([user](GdkEventButton *event) -> bool {
+        if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY) {
             if (user.HasAnimatedAvatar())
                 LaunchBrowser(user.GetAvatarURL("gif", "512"));
             else