From ce226dddcb05b19144977d06b8863b1d88701107 Mon Sep 17 00:00:00 2001 From: FireMario211 <17692105+FireMario211@users.noreply.github.com> Date: Tue, 7 Nov 2023 15:26:39 -0500 Subject: [PATCH] some bug fixes --- changelog.md | 4 ++++ mod.json | 2 +- src/main.cpp | 53 ++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/changelog.md b/changelog.md index 3c259c1..0832d4e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# v1.1.1 + - Allowed use of partially searching usernames. (Like "fi" instead of "Fire") + - Fixed Pointercrate issue on levels with spaces (Mac Only) + - Fixed issue with friend list searching not working. # v1.1.0 - More Leaderboards added (Diamonds, User Coins, Demons) - Added Moderator List diff --git a/mod.json b/mod.json index 0f131ac..0a10d04 100644 --- a/mod.json +++ b/mod.json @@ -1,6 +1,6 @@ { "geode": "1.3.4", - "version": "v1.1.0", + "version": "v1.1.1", "id": "gdutilsdevs.gdutils", "name": "GDUtils", "developer": "Jouca & Firee", diff --git a/src/main.cpp b/src/main.cpp index d448019..9668682 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,6 +28,7 @@ #include #include #include +#include using namespace geode::prelude; @@ -478,7 +479,6 @@ class SearchUserLayer : public BrownAlertDelegate { auto winSize = cocos2d::CCDirector::sharedDirector()->getWinSize(); input_username->setPositionY(10); this->m_buttonMenu->addChild(input_username); - auto validate_spr = ButtonSprite::create("Search", 60, true, "bigFont.fnt", "GJ_button_01.png", 30, .5F); auto validate_btn = CCMenuItemSpriteExtra::create( validate_spr, @@ -582,12 +582,20 @@ class $modify(FriendPage, FriendsProfilePage) { SearchUserLayer::create()->show(); } static void searchUser(const char* username) { - auto sceneChildCount = CCDirector::sharedDirector()->getRunningScene()->getChildrenCount(); - auto self = reinterpret_cast( - CCDirector::sharedDirector()->getRunningScene()->getChildren()->objectAtIndex(sceneChildCount - 2) - ); // other geode mods adding themselves onto the scene is great. - auto test1 = reinterpret_cast(self->getChildren()->objectAtIndex(0)); - if (test1->getChildrenCount() < 18) { + auto scene = CCDirector::sharedDirector()->getRunningScene(); + auto sceneChildren = scene->getChildren(); + CCLayer* test1 = nullptr; + for (unsigned int i = 0; i < scene->getChildrenCount(); i++) { + auto layer = dynamic_cast(sceneChildren->objectAtIndex(i)); + if (layer != nullptr) { + std::string layerName = typeid(*layer).name() + 6; + if (layerName == "FriendsProfilePage") { + test1 = dynamic_cast(layer->getChildren()->objectAtIndex(0)); + break; // assume its FriendsProfilePage + } + } + } + if (test1 == nullptr) { // safeguard from crashing FLAlertLayer::create(nullptr, "Error", @@ -598,9 +606,8 @@ class $modify(FriendPage, FriendsProfilePage) { )->show(); return; } - auto test2 = reinterpret_cast(test1->getChildren()->objectAtIndex(1)); - auto test3 = reinterpret_cast(test2->getChildren()->objectAtIndex(0)); - // ^^ this might look bad, sorry. + auto test2 = static_cast(test1->getChildren()->objectAtIndex(1)); + auto test3 = static_cast(test2->getChildren()->objectAtIndex(0)); if (test3->getChildrenCount() <= 0) { // another safeguard FLAlertLayer::create(nullptr, @@ -612,8 +619,8 @@ class $modify(FriendPage, FriendsProfilePage) { )->show(); return; } - auto customList = reinterpret_cast(test3->getChildren()->objectAtIndex(0)); - CCContentLayer* contentLayer = reinterpret_cast( + auto customList = static_cast(test3->getChildren()->objectAtIndex(0)); + CCContentLayer* contentLayer = static_cast( customList->getChildren()->objectAtIndex(0) ); int counter_page = 0; @@ -655,7 +662,7 @@ class $modify(FriendPage, FriendsProfilePage) { ); } const char* str1 = label->getString(); - if (strcmp(toLowerCase(str1), toLowerCase(username)) == 0) { + if (strstr(toLowerCase(str1), toLowerCase(username)) != nullptr) { customList->scrollLayer(-9999999); customList->scrollLayer(counter_page); @@ -663,10 +670,8 @@ class $modify(FriendPage, FriendsProfilePage) { break; } - counter_page += 45; } - if (!found) { std::string str = username; FLAlertLayer::create(nullptr, @@ -800,6 +805,22 @@ class $modify(SecretVault, SecretLayer2) { std::unordered_map demonListCache; // Will clear after game exit, or if user deletes level +// love url encoded characters :D +// also for some reason this is required on mac because Geode's web requests doesnt automatically append this for some reason. +// SURELY THIS WONT AFFECT LEVELS WITH SOME OTHER BREAKING SYMBOLS. +std::string url_encode(const std::string& value) { + std::string encoded; + encoded.reserve(value.size()); + for (char c : value) { + if (c == ' ') { + encoded += "%20"; + } else { + encoded += c; + } + } + return encoded; +} + class $modify(CustomLevelInfo, LevelInfoLayer) { // chat jippity void set(int key, int value) { @@ -928,7 +949,7 @@ class $modify(CustomLevelInfo, LevelInfoLayer) { log::info("Sending a request to pointercrate..."); web::AsyncWebRequest() .join("pointercrate-level") - .fetch(fmt::format("https://pointercrate.com/api/v2/demons/listed/?name={}", level->m_levelName.c_str())) + .fetch(fmt::format("https://pointercrate.com/api/v2/demons/listed/?name={}", url_encode(level->m_levelName).c_str())) .json() .then([this, level, levelID, loading_circle, positionLabel, demonSpr, winSize](json::Value const& json) { loading_circle->fadeAndRemove();