Refactor 2025-10-22

Author: hiimjasmine00

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - "master"
+      - "**"
 
 jobs:
   build:

README.md

@@ -4,17 +4,15 @@ Badges for every* Geode mod developer.\
 
 ## Features
 - Clickable badges displayed on a user's profile and comments
-- Comment coloring based on a user's badges
+- Toggleable comment coloring based on a user's badges:
+  - Mod Developer
+  - Verified Developer
+  - Index Staff
+  - Lead Developer
 
 ## Credits
 - [Brift](https://gdbrowser.com/u/14114548) - Designer of the mod's textures
 - [hiimjasmine00](https://gdbrowser.com/u/7466002) - Creator of the mod
 
-## Badges
-- Mod Developer
-- Verified Developer
-- Index Staff
-- Lead Developer
-
-# License
-This mod is licensed under the [MIT License](./LICENSE).
+## License
+This mod is licensed under the [MIT License](https://github.com/hiimjasmine00/DeveloperBadges/blob/master/LICENSE).

about.md

@@ -4,14 +4,15 @@ Badges for every* Geode mod developer.\
 
 ## Features
 - Clickable badges displayed on a user's profile and comments
-- Comment coloring based on a user's badges
+- Toggleable comment coloring based on a user's badges:
+  - Mod Developer
+  - Verified Developer
+  - Index Staff
+  - Lead Developer
 
 ## Credits
 - [Brift](user:14114548) - Designer of the mod's textures
 - [hiimjasmine00](user:7466002) - Creator of the mod
 
-## Badges
-- Mod Developer
-- Verified Developer
-- Index Staff
-- Lead Developer
+## License
+This mod is licensed under the [MIT License](https://github.com/hiimjasmine00/DeveloperBadges/blob/master/LICENSE).

changelog.md

@@ -40,4 +40,4 @@
 - Fixed a bug where reloading the page would add duplicate badges to a user's profile
 
 ## v1.0.0 (2024-10-01)
-- Initial release
+- Initial release

src/DeveloperBadges.cpp

@@ -8,6 +8,8 @@
 using namespace geode::prelude;
 using namespace optional_settings;
 
+std::map<int, DeveloperBadge> DeveloperBadges::developerBadges;
+
 constexpr std::array settings = {
     std::make_pair("mod-developer-color", "mod-developer-color-toggle"),
     std::make_pair("verified-developer-color", "verified-developer-color-toggle"),
@@ -20,12 +22,8 @@ constexpr std::array settings = {
     auto& data = mod->getSavedSettingsData();
     if (!mod->setSavedValue("migrated-colors", true)) {
         for (auto [key, toggle] : settings) {
-            Result<ccColor3B> oldColorValue = data.get(key).andThen([](const matjson::Value& v) {
-                return v.as<ccColor3B>();
-            });
-            Result<bool> oldColorEnabled = data.get(toggle).andThen([](const matjson::Value& v) {
-                return v.asBool();
-            });
+            auto oldColorValue = data.get<ccColor3B>(key);
+            auto oldColorEnabled = data.get<bool>(toggle);
             if (oldColorValue.isOk() && oldColorEnabled.isOk()) {
                 auto setting = std::static_pointer_cast<OptionalColor3BSetting>(mod->getSetting(key));
                 setting->setStoredValue(oldColorValue.unwrap());
@@ -44,32 +42,25 @@ constexpr std::array settings = {
             if (!json.isOk()) return;
 
             for (auto& value : json.unwrap()) {
-                Result<int> id = value.get("id").andThen([](const matjson::Value& v) {
-                    return v.as<int>();
-                });
+                auto id = value.get<int>("id");
                 if (!id.isOkAnd([](int id) { return id > 0; })) continue;
 
-                Result<int> type = value.get("badge").andThen([](const matjson::Value& v) {
-                    return v.as<int>();
-                });
+                auto type = value.get<int>("badge");
                 if (!type.isOkAnd([](int type) { return type > 0 && type < 5; })) continue;
 
-                Result<std::string> name = value.get("name").andThen([](const matjson::Value& v) {
-                    return v.asString();
-                });
+                auto name = value.get<std::string>("name");
                 if (!name.isOk()) continue;
 
-                DeveloperBadges::developerBadges.emplace_back(id.unwrap(), type.unwrap(), name.unwrap());
+                DeveloperBadge badge(id.unwrap(), type.unwrap(), std::move(name).unwrap());
+                DeveloperBadges::developerBadges.emplace(badge.id, std::move(badge));
             }
         });
     }, GameEventFilter(GameEventType::Loaded));
 }
 
 DeveloperBadge* DeveloperBadges::badgeForUser(int id) {
-    auto badge = std::ranges::find_if(developerBadges, [id](const DeveloperBadge& badge) {
-        return badge.id == id;
-    });
-    return badge != developerBadges.end() ? std::to_address(badge) : nullptr;
+    auto badge = developerBadges.find(id);
+    return badge != developerBadges.end() ? &badge->second : nullptr;
 }
 
 constexpr std::array names = {

src/DeveloperBadges.hpp

@@ -1,4 +1,5 @@
 #include <ccTypes.h>
+
 struct DeveloperBadge {
     int id;
     int type;
@@ -7,7 +8,7 @@ struct DeveloperBadge {
 
 class DeveloperBadges {
 public:
-    static inline std::vector<DeveloperBadge> developerBadges;
+    static std::map<int, DeveloperBadge> developerBadges;
 
     static DeveloperBadge* badgeForUser(int);
     static void showBadgeInfo(const std::string&, int);