bug fix update!

FireMario211 · FireMario211 · commit cc768bb7e85b · 2025-01-30T15:48:04.000-05:00
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+# v1.4.5
+- Fixed bug with comments showing another players icon sometimes
+- Fixed bug with the game crashing if you press enter while in the menu or on a profile
+- Fixed cases not showing properly
+- Fixed bug with going to user profiles bugging out if you aren't authenticated
+- Fixed other miscellaneous bugs
 # v1.4.4 
 - Fixed issue with opening and closing ProfilePage randomly causing crashes
 - Don't allow opening Object Workshop in ProfilePage while in a level (not sure why you would do that...)
diff --git a/mod.json b/mod.json
@@ -1,5 +1,5 @@
 {
-	"geode": "4.0.1",
+	"geode": "4.2.0",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",
@@ -8,7 +8,7 @@
 	},
 	"id": "firee.object-workshop",
 	"name": "Object Workshop",
-	"version": "v1.4.4",
+	"version": "v1.4.5",
 	"developer": "Firee",
 	"description": "Download, upload, or find custom objects made by other creators!",
     "resources": {
@@ -24,7 +24,7 @@
     "settings": {
         "token": {
             "name": "Auth Token",
-            "description": "Authentication Token (DO NOT CHANGE)",
+            "description": "Authentication Token (DO NOT SHARE)",
             "type": "string",
             "default": ""
         },
diff --git a/server/src/controllers/staff.ts b/server/src/controllers/staff.ts
@@ -13,10 +13,10 @@ function banToRole(type: number): number {
         default: return 0;
         case 1:
         case 4:
-            return -2;
+            return -1;
         case 2:
         case 5:
-            return -1;
+            return -2;
         case 3:
         case 6:
             return -3;
@@ -68,7 +68,7 @@ sRouter.post("/case/create",
                     if (requiresExp) values.push(expiration);
                     await pool.query(query, values);
                     if (caseType > 0) {
-                        await pool.query('UPDATE users SET role = $1 WHERE account_id = $2', [banToRole(caseType), userID]);
+                        await pool.query('UPDATE users SET role = $1, ban_reason = $2 WHERE account_id = $3', [banToRole(caseType), reason, userID]);
                     }
                     res.status(200).json({ message: "Case submitted." })
                 }
diff --git a/server/src/controllers/user.ts b/server/src/controllers/user.ts
@@ -54,7 +54,7 @@ export function banCheck(res: Response, user: UserData, type: number): boolean {
             return true;
         }
         if (user.role == -3) {
-            res.status(403).json({error: "You are banned from uploading! Reason: " + user.ban_reason});
+            res.status(403).json({error: "You are banned! Reason: " + user.ban_reason});
             return true;
         }
         return false;
diff --git a/src/main.cpp b/src/main.cpp
@@ -184,7 +184,9 @@ bool CustomObjects::init(LevelEditorLayer* editorLayer) {
                         return;
                     }
                     auto jsonRes = value->json().unwrapOrDefault();
-                    if (Utils::notifError(jsonRes)) return;
+                    if (!jsonRes.isObject()) return log::error("Response isn't object.");
+                    auto isError = jsonRes.get("error");
+                    if (isError.isOk()) return;
                     auto uploadRes = jsonRes.get("uploads");
 
                     if (uploadRes.isOk()) {
@@ -289,11 +291,13 @@ class $modify(ProfilePage) {
                     return;
                 }
                 if (value->code() != 200) {
-                    log::error("Couldn't get user: {}", value->json().unwrapOrDefault().dump());
+                    //log::error("Couldn't get user: {}", value->json().unwrapOrDefault().dump());
                     return;
                 }
                 auto jsonRes = value->json().unwrapOrDefault();
-                if (Utils::notifError(jsonRes)) return;
+                if (!jsonRes.isObject()) return log::error("Response isn't object.");
+                auto isError = jsonRes.get("error");
+                if (isError.isOk()) return;
                 if (m_fields->customObjsBtn == nullptr) {
                     if (auto menu = typeinfo_cast<CCMenu*>(m_mainLayer->getChildByID("socials-menu"))) {
                         m_fields->customObjsBtn = CCMenuItemExt::createSpriteExtraWithFilename("profileObjBtn.png"_spr, 0.75F,
@@ -400,3 +404,13 @@ class $modify(ProfilePage) {
         }
     }
 };
+
+#include <Geode/modify/EditorUI.hpp>
+class $modify(EditorUI) {
+    void keyDown(enumKeyCodes key) {
+        if (auto scene = CCScene::get()) {
+            if (typeinfo_cast<ObjectWorkshop*>(scene->getChildByID("objectworkshop"_spr))) return;
+        }
+        EditorUI::keyDown(key);
+    }
+};
diff --git a/src/nodes/CategoryButton.hpp b/src/nodes/CategoryButton.hpp
@@ -11,6 +11,20 @@ class CategoryButton : public CCScale9Sprite {
         CCScale9Sprite* activeSideIndicator;
         CCScale9Sprite* inactiveSideIndicator;
     public:
+        void setDisabled(bool disabled) {
+            ccColor3B bgSprCol = {86, 48, 29};
+            ccColor3B bgSprBehindCol = {62, 35, 20};
+            if (disabled) {
+                bgSprCol.r -= 20;
+                bgSprCol.g -= 20;
+                bgSprCol.b -= 20;
+                bgSprBehindCol.r -= 20;
+                bgSprBehindCol.g -= 20;
+                bgSprBehindCol.b -= 20;
+            }
+            bgSpr->setColor(bgSprCol);
+            bgSprBehind->setColor(bgSprBehindCol);
+        }
         void setIndicatorState(bool enabled);
         static CategoryButton* create(const char* string);
 };
diff --git a/src/nodes/CommentCell.cpp b/src/nodes/CommentCell.cpp
@@ -61,8 +61,8 @@ bool OWCommentCell::init(CommentData data, ObjectData obj, UserData user, std::f
     // icon,playerColor,playerColor2,playerColorGlow,glow
     if (auto gm = GameManager::sharedState()) {
         SimplePlayer* pIcon;
-        if (m_data.icon.size() != 5) {
-            pIcon = SimplePlayer::create(1);
+        if (m_data.icon.size() != 5 || m_data.icon.empty()) {
+            pIcon = SimplePlayer::create(2);
         } else {
             pIcon = SimplePlayer::create(m_data.icon[0]);
             pIcon->setColor(gm->colorForIdx(m_data.icon[1]));
diff --git a/src/nodes/ScrollLayerExt.cpp b/src/nodes/ScrollLayerExt.cpp
@@ -170,6 +170,7 @@ ScrollLayerExt* ScrollLayerExt::create(CCSize const& size, bool scroll, bool ver
 
 void ScrollLayerExt::fixTouchPrio() {
     auto oldThis = this;
+    //this->retain();
     if (auto delegate = typeinfo_cast<CCTouchDelegate*>(this)) {
         if (auto handler = CCTouchDispatcher::get()->findHandler(delegate)) {
             Loader::get()->queueInMainThread([this, handler, delegate, oldThis]() {
diff --git a/src/ui/ObjectWorkshop.cpp b/src/ui/ObjectWorkshop.cpp
@@ -94,8 +94,8 @@ bool ObjectWorkshop::setup(bool authenticated) {
     leftTopBar->addChildAtPosition(profileLabel, Anchor::Center, {-25, 10});
 
     leftBar->addChildAtPosition(leftTopBar, Anchor::Top, {3, -7});
-    createCategoryBtn("My Objects", 0);
-    createCategoryBtn("Favorites", 1);
+    createCategoryBtn("My Objects", 0, !authenticated);
+    createCategoryBtn("Favorites", 1, !authenticated);
     auto vLine = CCSprite::createWithSpriteFrameName("edit_vLine_001.png");
     vLine->setRotation(90);
     leftBar->addChildAtPosition(vLine, Anchor::Center, {0, 40});
@@ -491,6 +491,7 @@ void ObjectWorkshop::RegenCategory() {
         cocos::handleTouchPriority(m_buttonMenu);
         load();
     });
+    setKeyboardEnabled(true);
 }
 
 void ObjectWorkshop::onRetryBtn(CCObject*) {
@@ -583,7 +584,7 @@ void ObjectWorkshop::load() {
             m_buttonMenu->addChildAtPosition(bottomPageLabel, Anchor::Bottom, {55, 17});
             m_scrollLayer->setTouchEnabled(true);
             m_amountItems = array.size();
-            if (!m_user.authenticated || (currentMenuIndexGD != 0 && currentMenuIndexGD != -1)) {
+            if ((currentMenuIndexGD != 0 && currentMenuIndexGD != -1)) {
                 if (m_amountItems > 6) {
                     categoryItems->setContentSize({
                         categoryItems->getContentWidth(),
@@ -953,7 +954,7 @@ void ObjectWorkshop::load() {
         return;
     }
     if (currentMenuIndexGD < 2 || currentMenuIndexGD > 6) {
-        if (m_user.authenticated) {
+        if (m_user.authenticated || currentMenuIndexGD == -1) {
             if (currentMenuIndexGD != -1) {
                 auto myjson = matjson::Value();
                 myjson.set("token", m_token);
@@ -1033,6 +1034,31 @@ void ObjectWorkshop::createCategoryBtn(const char* string, int menuIndex) {
     }
 }
 
+void ObjectWorkshop::createCategoryBtn(const char* string, int menuIndex, bool disabled) {
+    if (!disabled) return createCategoryBtn(string, menuIndex);
+    auto label = CCLabelBMFont::create(string, "bigFont.fnt");
+    label->limitLabelWidth(160.0F, 0.75F, 0.2F);
+    
+    auto bgNode = CategoryButton::create(string);
+    bgNode->setDisabled(true);
+    auto btn = CCMenuItemSpriteExtra::create(
+        bgNode,
+        this,
+        nullptr
+    );
+    btn->setID(fmt::format("category-{}"_spr, menuIndex));
+    if (menuIndex < 2) {
+        m_buttonMenu->addChildAtPosition(
+            btn,
+            Anchor::TopLeft,
+            {55, (-60.F) + (-25 * menuIndex)}
+        );
+    } else {
+        m_categoryButtons->addChild(btn);
+        m_categoryButtons->updateLayout();
+    }
+}
+
 void ObjectWorkshop::onProfileSelf(CCObject*) {
     if (!m_user.authenticated) return FLAlertLayer::create("Error", "You cannot view your profile as you are <cy>not authenticated!</c>", "OK")->show();
     onClickUser(m_user.account_id);
@@ -1817,13 +1843,13 @@ void ObjectWorkshop::onClose(CCObject* sender) {
     this->setKeypadEnabled(false);
     this->setTouchEnabled(false);
     if (!m_inEditor) {
-        log::debug("delete LEL!");
         if (auto gameManager = GameManager::sharedState()) {
             if (gameManager->m_levelEditorLayer != nullptr) {
                 gameManager->m_levelEditorLayer->release();
                 gameManager->m_levelEditorLayer = nullptr; // i LOVE dangling pointres, anyways i cant do `delete` because apparently game crashes if i close
             }
             gameManager->m_editorEnabled = false;
+            log::debug("delete LEL!");
         }
     }
     this->removeFromParentAndCleanup(true);
@@ -1850,7 +1876,8 @@ void ObjectWorkshop::keyDown(cocos2d::enumKeyCodes key) {
         return;
     }
     if (key == cocos2d::enumKeyCodes::KEY_Space) return;
-    return FLAlertLayer::keyDown(key);
+    //log::info("they really tried");
+    //return FLAlertLayer::keyDown(key);
 }
 
 void ObjectWorkshop::keyBackClicked() {
diff --git a/src/ui/ObjectWorkshop.hpp b/src/ui/ObjectWorkshop.hpp
@@ -145,6 +145,7 @@ class ObjectWorkshop : public geode::Popup<bool>, public TextInputDelegate {
     void onReloadBtn(CCObject*);
     void onPendingBtn(CCObject*);
     void createCategoryBtn(const char* string, int menuIndex);
+    void createCategoryBtn(const char* string, int menuIndex, bool disabled);
     void onSideButton(CCObject*);
     void showProfile(int userID, bool self);
     void load();
diff --git a/src/ui/admin/CasePopup.cpp b/src/ui/admin/CasePopup.cpp
@@ -86,6 +86,8 @@ void CasePopup::onLoadCases(CCObject*) {
                     content->addChild(CaseCell::create(m_managingUser, caseData.unwrap(), [this]() {
                         onLoadCases(nullptr);
                     }));
+                } else {
+                    log::error("Couldn't parse Case: {}", caseData.err());
                 }
             }
             content->setLayout(
diff --git a/src/ui/popups/WarningPopup.hpp b/src/ui/popups/WarningPopup.hpp
@@ -40,11 +40,11 @@ struct matjson::Serialize<CaseData> {
         GEODE_UNWRAP_INTO(auto case_type, value["case_type"].asInt());
         GEODE_UNWRAP_INTO(data.account_id, value["account_id"].asInt());
         GEODE_UNWRAP_INTO(data.staff_account_id, value["staff_account_id"].asInt());
-        GEODE_UNWRAP_INTO(data.reason, value["case_type"].asString());
-        GEODE_UNWRAP_INTO(data.timestamp, value["case_type"].asString());
-        GEODE_UNWRAP_INTO(data.expiration, value["case_type"].asString());
-        GEODE_UNWRAP_INTO(data.ack, value["case_type"].asBool());
-        GEODE_UNWRAP_INTO(data.ack_timestamp, value["case_type"].asString());
+        GEODE_UNWRAP_INTO(data.reason, value["reason"].asString());
+        GEODE_UNWRAP_INTO(data.timestamp, value["timestamp"].asString());
+        GEODE_UNWRAP_INTO(data.expiration, value["expiration"].asString());
+        GEODE_UNWRAP_INTO(data.ack, value["ack"].asBool());
+        GEODE_UNWRAP_INTO(data.ack_timestamp, value["ack_timestamp"].asString());
         GEODE_UNWRAP_INTO(data.staff_account_name, value["staff_account_name"].asString());
         data.type = static_cast<CaseType>(case_type);
         return Ok(data);

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export function banCheck(res: Response, user: UserData, type: number): boolean {`
`54`	`54`	`return true;`
`55`	`55`	`}`
`56`	`56`	`if (user.role == -3) {`
`57`		`- res.status(403).json({error: "You are banned from uploading! Reason: " + user.ban_reason});`
	`57`	`+ res.status(403).json({error: "You are banned! Reason: " + user.ban_reason});`
`58`	`58`	`return true;`
`59`	`59`	`}`
`60`	`60`	`return false;`