From de7edc4658db4936afd37ed49df82d1746521b0f Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Sun, 30 Jun 2024 16:35:24 -0400
Subject: [PATCH] please build number fuck off

---
 src/startup.cpp | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/startup.cpp b/src/startup.cpp
index f2ed5ce..50b8744 100644
--- a/src/startup.cpp
+++ b/src/startup.cpp
@@ -32,22 +32,11 @@ std::optional<std::pair<std::string, std::string>> ParseCookie(const Glib::ustri
 }
 
 std::optional<Glib::ustring> GetJavascriptFileFromAppPage(const Glib::ustring &contents) {
-    auto regex = Glib::Regex::create(R"(/assets/\w+\.?\w{20}\.js)");
-    std::vector<Glib::ustring> matches;
+    auto regex = Glib::Regex::create(R"(/assets/sentry.*?\.js)");
 
-    // regex->match_all doesnt work for some reason
-    int start_position = 0;
     Glib::MatchInfo match;
-    while (regex->match(contents, start_position, match)) {
-        const auto str = match.fetch(0);
-        matches.push_back(str);
-        int foo;
-        match.fetch_pos(0, start_position, foo);
-        start_position += str.size();
-    }
-
-    if (matches.size() >= 8) {
-        return matches[matches.size() - 8];
+    if (regex->match(contents, match)) {
+        return match.fetch(0);
     }
 
     return {};
@@ -67,7 +56,7 @@ std::optional<uint32_t> GetBuildNumberFromJSURL(const Glib::ustring &url, const
     auto res = req.execute();
     if (res.error) return {};
 
-    auto regex = Glib::Regex::create(R"(Build Number: "\).concat\("(\d+))");
+    auto regex = Glib::Regex::create(R"(buildNumber",\(.="(\d+))");
     Glib::MatchInfo match;
     Glib::ustring string = res.text;
     if (regex->match(string, match)) {
@@ -130,6 +119,9 @@ void DiscordStartupDialog::RunAsync() {
             auto js_url = GetJavascriptFileFromAppPage(app_page);
             if (js_url.has_value()) {
                 m_build_number = GetBuildNumberFromJSURL(*js_url, *opt_cookie);
+                if (m_build_number.has_value()) {
+                    spdlog::get("discord")->debug("Found build number: {}", *m_build_number);
+                }
             }
         }
         m_dispatcher.emit();