From 2867fbabe61d25d165e04c86ef7c5ecd6fb6d191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=BCbach=2C=20Lukas?= Date: Tue, 25 Nov 2025 09:34:40 +0100 Subject: [PATCH] Small fixes. --- .../archidekt_api_response_deck_listing_container.cpp | 7 +++++++ .../deck_listings/archidekt_api_response_deck_owner.cpp | 2 +- .../deck_listings/archidekt_api_response_deck_owner.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp index 7ed4dfaf7..16ea60487 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp @@ -27,6 +27,13 @@ void ArchidektApiResponseDeckListingContainer::fromJson(const QJsonObject &json) // tags = {""}; parentFolderId = json.value("parentFolderId").toInt(); owner.fromJson(json.value("owner").toObject()); + + auto colorsJson = json.value("colors").toObject(); + + for (auto color : colorsJson.keys()) { + colors[color] = colorsJson[color].toInt(); + } + cardPackage = json.value("cardPackage").toString(); contest = json.value("contest").toString(); } diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp index 8e6d202b6..2ba926f8b 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp @@ -3,7 +3,7 @@ void ArchidektApiResponseDeckOwner::fromJson(const QJsonObject &json) { id = json.value("id").toInt(); - userName = json.value("userName").toString(); + userName = json.value("username").toString(); avatar = QUrl(json.value("avatar").toString()); moderator = json.value("moderator").toBool(); pledgeLevel = json.value("pledgeLevel").toInt(); diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h index 970773322..df3f48fd2 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h @@ -19,7 +19,7 @@ public: // Debug method for logging void debugPrint() const; - QString getName() const + [[nodiscard]] QString getName() const { return userName; }