fix nest issue

* fix: fix mod downloads not checking version (#1149)

* bump version to 3.9.1

* fix(index): don't remove gd and geode params (#1152)

* chore: version bump

---------

Co-authored-by: Cvolton <clubpenguinmisa@gmail.com>

CHANGELOG.md

@@ -35,6 +35,12 @@
  * Add hashtag symbol to CommonFilter::Any (#1131)
  * Disable forward compat on android (c9e97af)
 
+## v3.9.2
+ * Fix searching for mods returning unavailable mods (#1149)
+
+## v3.9.1
+ * Fix mod downloads not checking version (f575187)
+
 ## v3.9.0
  * Many changes to the settings ui (#1108)
    * Fuzzy search is now more reasonable

CMakeLists.txt

@@ -237,7 +237,7 @@ endif()
 
 set(MAT_JSON_AS_INTERFACE ON)
 CPMAddPackage("gh:geode-sdk/result@1.2.1")
-CPMAddPackage("gh:geode-sdk/json@3.0.3")
+CPMAddPackage("gh:geode-sdk/json@3.1.0")
 CPMAddPackage("gh:fmtlib/fmt#11.0.2")
 
 target_compile_definitions(${PROJECT_NAME} INTERFACE MAT_JSON_DYNAMIC=1)

loader/src/hooks/WindowsFontCacheFix.cpp

@@ -37,15 +37,15 @@ static void patchCall(uintptr_t addr, uintptr_t newCall) {
 $execute {
     if (LoaderImpl::get()->isForwardCompatMode()) return;
     
+#if GEODE_COMP_GD_VERSION == 22040
     // BitmapDC::~BitmapDC
-#if 0 // TODO: mat GEODE_COMP_GD_VERSION == 22040
     patchCall(0xC9A56, (uintptr_t)&RemoveFontResourceWHook);
 
     // BitmapDC::setFont
     patchCall(0xCB5BC, (uintptr_t)&RemoveFontResourceWHook);
     patchCall(0xCB642, (uintptr_t)&AddFontResourceWHook);
 #else
-    // #pragma message("Unsupported GD version!")
+    #pragma message("Unsupported GD version!")
 #endif
 };
 

loader/src/loader/LoaderImpl.cpp

@@ -505,20 +505,20 @@ void Loader::Impl::loadModGraph(Mod* node, bool early) {
             thread::setName("Mod Unzip");
             log::loadNest(nest);
             auto res = unzipFunction();
-            auto prevNest = log::saveNest();
-            log::loadNest(nest);
-            if (!res) {
-                this->addProblem({
-                    LoadProblem::Type::UnzipFailed,
-                    node,
-                    res.unwrapErr()
-                });
-                log::error("Failed to unzip: {}", res.unwrapErr());
-                m_refreshingModCount -= 1;
-                log::loadNest(prevNest);
-                return;
-            }
-            this->queueInMainThread([=, this]() {
+            this->queueInMainThread([=, this, res = std::move(res)]() {
+                auto prevNest = log::saveNest();
+                log::loadNest(nest);
+                if (!res) {
+                    this->addProblem({
+                        LoadProblem::Type::UnzipFailed,
+                        node,
+                        res.unwrapErr()
+                    });
+                    log::error("Failed to unzip: {}", res.unwrapErr());
+                    m_refreshingModCount -= 1;
+                    log::loadNest(prevNest);
+                    return;
+                }
                 loadFunction();
                 log::loadNest(prevNest);
             });

loader/src/server/Server.cpp

@@ -554,12 +554,11 @@ ServerRequest<ServerModsList> server::getMods(ModsQuery const& query, bool useCa
     // Add search params
     if (query.query) {
         req.param("query", *query.query);
-    } else {
-        // Target current GD version and Loader version when query is not set
-        req.param("gd", GEODE_GD_VERSION_STR);
-        req.param("geode", Loader::get()->getVersion().toNonVString());
     }
 
+    req.param("gd", GEODE_GD_VERSION_STR);
+    req.param("geode", Loader::get()->getVersion().toNonVString());
+
     if (query.platforms.size()) {
         std::string plats = "";
         bool first = true;

loader/src/ui/mods/popups/ModPopup.cpp

@@ -1,4 +1,7 @@
 #include "ModPopup.hpp"
+
+#include <optional>
+
 #include <Geode/binding/ButtonSprite.hpp>
 #include <Geode/ui/MDTextArea.hpp>
 #include <Geode/ui/TextInput.hpp>