Added Clan captor badge and clan ranking

include/API/PlayerController.hpp

@@ -21,6 +21,8 @@ class PlayerController
     static bool IsIncognito(Player anotherPlayer);
     static void SetIsIncognito(Player anotherPlayer, bool value);
 
+    static bool InClan(string tag);
+
     static optional<Player> currentPlayer;
     static string lastErrorDescription;
 };

include/Models/Clan.hpp

@@ -12,6 +12,19 @@ struct Clan
     string icon;
     string color;
 
+    int rank;
+    float pp;
+
     Clan(rapidjson::Value const& document);
     Clan() = default;
 };
+
+struct ClanRankingStatus
+{
+    std::optional<Clan> clan;
+    bool clanRankingContested;
+    bool applicable;
+
+    ClanRankingStatus(rapidjson::Value const& document);
+    ClanRankingStatus() = default;
+};

include/Models/ClanScore.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "beatsaber-hook/shared/config/rapidjson-utils.hpp"
+#include "include/Models/Clan.hpp"
+
+#include <string>
+using namespace std;
+
+struct ClanScore
+{
+    int id;
+    // int baseScore;
+    int modifiedScore;
+    float accuracy;
+    int clanId;
+    float pp;
+    // float Weight;
+    int rank;
+    string timeset;
+
+    Clan clan;
+    ClanScore();
+    ClanScore(rapidjson::Value const& document);
+};

include/Models/Difficulty.hpp

@@ -2,6 +2,7 @@
 
 #include "beatsaber-hook/shared/config/rapidjson-utils.hpp"
 #include "include/Models/TriangleRating.hpp"
+#include "include/Models/Clan.hpp"
 
 #include <vector>
 #include <string>
@@ -17,6 +18,7 @@ struct Difficulty
     unordered_map<string, float> modifierValues;
     unordered_map<string, TriangleRating> modifiersRating;
     TriangleRating rating;
+    ClanRankingStatus clanStatus;
 
     Difficulty(rapidjson::Value const& document);
     Difficulty(int statusGiven, int typeGiven, vector<float> votesGive, unordered_map<string, float> modifierValuesGiven, unordered_map<string, TriangleRating> modifiersRatingGiven, TriangleRating ratingGiven);

include/UI/CaptorClanUI.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "include/Models/Clan.hpp"
+
+#include "questui/shared/BeatSaberUI.hpp"
+#include "questui/shared/QuestUI.hpp"
+
+#include "TMPro/TextMeshProUGUI.hpp"
+
+namespace CaptorClanUI {
+    extern bool showClanRanking;
+    extern function<void()> showClanRankingCallback; 
+
+    void initCaptorClan(UnityEngine::GameObject* header, TMPro::TextMeshProUGUI* headerPanelText);
+    void setClan(ClanRankingStatus clanStatus);
+    void setActive(bool active);
+}

include/UI/UIUtils.hpp

@@ -60,6 +60,7 @@ namespace UIUtils {
     extern SafePtrUnity<HMUI::ImageView> roundRectSprite;
 
     HMUI::ImageView* getRoundRectSprite();
+    void AddRoundRect(HMUI::ImageView* background);
     HMUI::ImageView* GetCopyOf(HMUI::ImageView* comp, HMUI::ImageView* other);
     void OpenSettings();
     HMUI::ImageView* CreateRoundRectImage(UnityEngine::Transform* parent, UnityEngine::Vector2 anchoredPosition, UnityEngine::Vector2 sizeDelta);

include/Utils/FormatUtils.hpp

@@ -13,6 +13,7 @@
 #include "include/Models/Player.hpp"
 #include "include/Models/Clan.hpp"
 #include "include/Models/Score.hpp"
+#include "include/Models/ClanScore.hpp"
 #include "include/API/PlayerController.hpp"
 #include <regex>
 using namespace std;
@@ -104,23 +105,24 @@ namespace FormatUtils {
             return "<alpha=#00>.<alpha=#FF><b><noparse>" + tag + "</noparse></b><alpha=#00>.<alpha=#FF>";
         }
 
-        inline string FormatNameWithClans(Player const& player, int limit) {
-            string clansLabel = "<size=90%>";
+        inline string FormatNameWithClans(Player const& player, int limit, bool withClans) {
+            string clansLabel = withClans ? "<size=90%>" : "";
             int clanCount = player.clans.size();
-
-            if (clanCount == 2) {
-                clansLabel = "<size=80%>";
-            } 
-            else if (clanCount == 3) {
-                clansLabel = "<size=70%>";
+            if (withClans) {                
+                if (clanCount == 2) {
+                    clansLabel = "<size=80%>";
+                } 
+                else if (clanCount == 3) {
+                    clansLabel = "<size=70%>";
+                }
+
+                for (size_t i = 0; i < clanCount; i++) {
+                    Clan clan = player.clans[i];
+                    clansLabel += "  <color=" + clan.color + ">" + clan.tag + "</color>";
+                }
+                clansLabel += "</size>";
             }
 
-            for (size_t i = 0; i < clanCount; i++) {
-                Clan clan = player.clans[i];
-                clansLabel += "  <color=" + clan.color + ">" + clan.tag + "</color>";
-            }
-            clansLabel += "</size>";
-
             string name = "";
             if (!player.name.empty() && player.name != "<blank>") {
                 name = player.name;
@@ -136,7 +138,7 @@ namespace FormatUtils {
             string name = "";
 
             if (!PlayerController::IsIncognito(score.player)) {
-                name = getModConfig().ClansActive.GetValue() ? FormatNameWithClans(score.player, 24) : "<noparse>" + truncate(score.player.name, 24) + "</noparse>";
+                name = getModConfig().ClansActive.GetValue() ? FormatNameWithClans(score.player, 24, true) : "<noparse>" + truncate(score.player.name, 24) + "</noparse>";
             } 
             else {
                 name = "[REDACTED]";
@@ -147,6 +149,15 @@ namespace FormatUtils {
             return name + "<pos=40%>" + FormatPP(score.pp) + "   " + formatAcc(score.accuracy) + " " + fcLabel + time;
         }
 
+        inline string FormatClanScore(ClanScore const& score) {
+            string name = "";
+
+            name = "<noparse>" + truncate(score.clan.name, 24) + "</noparse>  <color=" + score.clan.color + ">" + score.clan.tag + "</color>";
+
+            string time = getModConfig().TimesetActive.GetValue() ? " <size=60%>" + GetRelativeTimeString(score.timeset) + "</size>" : "";
+
+            return name + "<pos=40%>" + FormatPP(score.pp) + "   " + formatAcc(score.accuracy) + " " + time;
+        }
 
         inline string GetFullPlatformName(string serverPlatform) {
 

include/Utils/ModConfig.hpp

@@ -14,7 +14,8 @@ DECLARE_CONFIG(ModConfig,
     CONFIG_VALUE(ShowReplaySettings, bool, "Show replay settings", true);
     CONFIG_VALUE(ShowBeatleader, bool, "Show BeatLeader", true, "Priority for BeatLeader or SS");
     CONFIG_VALUE(StarValueToShow, int, "Display Stars", 0);
-    CONFIG_VALUE(Context, int, "Selected Context", static_cast<int>(LeaderboardUI::Context::Standard))
+    CONFIG_VALUE(Context, int, "Selected Context", static_cast<int>(LeaderboardUI::Context::Standard));
+    CONFIG_VALUE(CaptureActive, bool, "Show Leaderboard clan capture status", true);
 )
 
 inline bool UploadEnabled() {

src/API/PlayerController.cpp

@@ -1,6 +1,7 @@
 #include "include/API/PlayerController.hpp"
 #include "include/Utils/WebUtils.hpp"
 #include "include/Utils/ModConfig.hpp"
+#include "include/Utils/StringUtils.hpp"
 #include "include/main.hpp"
 #include "include/UI/LeaderboardUI.hpp"
 
@@ -122,6 +123,15 @@ bool PlayerController::IsFriend(Player anotherPlayer) {
     return std::find(currentPlayer->friends.begin(), currentPlayer->friends.end(), anotherPlayer.id) != currentPlayer->friends.end();
 }
 
+bool PlayerController::InClan(string tag) {
+    if (currentPlayer == nullopt) return false;
+
+    auto it = std::find_if(currentPlayer->clans.begin(), currentPlayer->clans.end(), 
+                           [&tag](const auto& clan) { return toLower(clan.tag) == toLower(tag); });
+
+    return it != currentPlayer->clans.end();
+}
+
 bool PlayerController::IsIncognito(Player anotherPlayer) {
     Document incognitoList;
     incognitoList.Parse(getModConfig().IncognitoList.GetValue().c_str());

src/Models/Clan.cpp

@@ -3,4 +3,33 @@
 Clan::Clan(rapidjson::Value const& document) {
     tag = document["tag"].GetString();
     color = document["color"].GetString();
+
+    if (document.HasMember("name") && !document["name"].IsNull()) {
+        name = document["name"].GetString();
+    } else {
+        name = "No name";
+    }
+
+    if (document.HasMember("avatar")) {
+        icon = document["avatar"].GetString();
+    } else {
+        icon = "";
+    }
+    if (document.HasMember("rank")) {
+        rank = document["rank"].GetInt();
+    }
+    if (document.HasMember("pp")) {
+        pp = document["pp"].GetFloat();
+    }
+}
+
+ClanRankingStatus::ClanRankingStatus(rapidjson::Value const& document) {
+    if (document["clan"].IsNull()) {
+        clan = nullopt;
+    } else {
+        clan = Clan(document["clan"].GetObject());
+    }
+
+    applicable = document["applicable"].GetBool();
+    clanRankingContested = document["clanRankingContested"].GetBool();
 }

src/Models/ClanScore.cpp

@@ -0,0 +1,14 @@
+#include "include/Models/ClanScore.hpp"
+
+ClanScore::ClanScore() {}
+
+ClanScore::ClanScore(rapidjson::Value const& document) {
+    auto const& clanObject = document["clan"];
+    clan = Clan(clanObject);
+
+    pp = document["pp"].GetFloat();
+    rank = document["rank"].GetInt();
+    modifiedScore = document["modifiedScore"].GetInt();
+    timeset = document["timepost"].GetString();
+    accuracy = document["accuracy"].GetFloat();
+}

src/Models/Difficulty.cpp

@@ -57,6 +57,12 @@ Difficulty::Difficulty(rapidjson::Value const& document) {
     rating.passRating = document["passRating"].GetFloat();
     rating.accRating = document["accRating"].GetFloat();
     rating.techRating = document["techRating"].GetFloat();
+
+    if (document.HasMember("clanStatus") && !document["clanStatus"].IsNull()) {
+        clanStatus = ClanRankingStatus(document["clanStatus"].GetObject());
+    } else {
+        clanStatus = ClanRankingStatus();
+    }
 }
 
 Difficulty::Difficulty(int statusGiven, int typeGiven, vector<float> votesGiven, unordered_map<string, float> modifierValuesGiven,unordered_map<string, TriangleRating> modifiersRatingGiven, TriangleRating ratingGiven) {

src/Models/Player.cpp

@@ -13,12 +13,18 @@ Player::Player(rapidjson::Value const& userModInterface) {
 
     // For standard context and players from v3/scores (where contextExtension is null cause we request for one context) we use the main player
     int currentContext = getModConfig().Context.GetValue();
-    std::optional<rapidjson::GenericArray<true, rapidjson::Value>> contextExtensions = userModInterface.HasMember("contextExtensions") && !userModInterface["contextExtensions"].IsNull() ? userModInterface["contextExtensions"].GetArray() : std::optional<rapidjson::GenericArray<true, rapidjson::Value>>();
+    std::optional<rapidjson::GenericArray<true, rapidjson::Value>> contextExtensions = 
+        userModInterface.HasMember("contextExtensions") && !userModInterface["contextExtensions"].IsNull() 
+        ? userModInterface["contextExtensions"].GetArray() 
+        : std::optional<rapidjson::GenericArray<true, rapidjson::Value>>();
     // If we are Standard Context or we have no contexts or our selected context is not in contextextensions we use the normal rank. Else we use the correct context extension rank
-    rapidjson::Value const& contextRank = currentContext == 0 || !contextExtensions || currentContext - 1 >= contextExtensions.value().Size() ? userModInterface : contextExtensions.value()[currentContext - 1];
+    rapidjson::Value const& contextRank = 
+        currentContext == 0 || 
+        !contextExtensions || 
+        currentContext - 1 >= contextExtensions.value().Size() ? userModInterface : contextExtensions.value()[currentContext - 1];
 
     rank = contextRank["rank"].GetInt();
-    countryRank = contextRank["countryRank"].GetInt();
+        countryRank = contextRank["countryRank"].GetInt();
     pp = contextRank["pp"].GetFloat();
 
     auto clansList = userModInterface["clans"].GetArray();