From 864c20c3dcb9dc18e3fe5a088b23cbdd7d7a7e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= <me@alegon.dev>
Date: Sat, 14 Jun 2025 20:36:55 +0200
Subject: [PATCH] fix(app-lib): actually delete custom skins with no cape
 overrides

---
 ...5ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json | 2 +-
 ...1b147b0135054847674be5035f385e0d85e759d4bbf9bca54f20.json} | 4 ++--
 packages/app-lib/src/api/minecraft_skins.rs                   | 2 +-
 packages/app-lib/src/state/minecraft_skins/mod.rs             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/app-lib/.sqlx/{query-1937e191a7815a55274bb39a035e02a39bb04b45dbd727e5db5b5308deda4e04.json => query-faa8437519571b147b0135054847674be5035f385e0d85e759d4bbf9bca54f20.json} (57%)

diff --git a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
index 22e39e75b..9742cb7b4 100644
--- a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
+++ b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
@@ -41,7 +41,7 @@
       {
         "name": "display_claims!: serde_json::Value",
         "ordinal": 7,
-        "type_info": "Text"
+        "type_info": "Null"
       }
     ],
     "parameters": {
diff --git a/packages/app-lib/.sqlx/query-1937e191a7815a55274bb39a035e02a39bb04b45dbd727e5db5b5308deda4e04.json b/packages/app-lib/.sqlx/query-faa8437519571b147b0135054847674be5035f385e0d85e759d4bbf9bca54f20.json
similarity index 57%
rename from packages/app-lib/.sqlx/query-1937e191a7815a55274bb39a035e02a39bb04b45dbd727e5db5b5308deda4e04.json
rename to packages/app-lib/.sqlx/query-faa8437519571b147b0135054847674be5035f385e0d85e759d4bbf9bca54f20.json
index 7572f50ba..ad8564624 100644
--- a/packages/app-lib/.sqlx/query-1937e191a7815a55274bb39a035e02a39bb04b45dbd727e5db5b5308deda4e04.json
+++ b/packages/app-lib/.sqlx/query-faa8437519571b147b0135054847674be5035f385e0d85e759d4bbf9bca54f20.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "DELETE FROM custom_minecraft_skins WHERE minecraft_user_uuid = ? AND texture_key = ? AND variant = ? AND cape_id = ?",
+  "query": "DELETE FROM custom_minecraft_skins WHERE minecraft_user_uuid = ? AND texture_key = ? AND variant = ? AND cape_id IS ?",
   "describe": {
     "columns": [],
     "parameters": {
@@ -8,5 +8,5 @@
     },
     "nullable": []
   },
-  "hash": "1937e191a7815a55274bb39a035e02a39bb04b45dbd727e5db5b5308deda4e04"
+  "hash": "faa8437519571b147b0135054847674be5035f385e0d85e759d4bbf9bca54f20"
 }
diff --git a/packages/app-lib/src/api/minecraft_skins.rs b/packages/app-lib/src/api/minecraft_skins.rs
index 8c9a8697a..67a40d876 100644
--- a/packages/app-lib/src/api/minecraft_skins.rs
+++ b/packages/app-lib/src/api/minecraft_skins.rs
@@ -244,7 +244,7 @@ pub async fn get_available_skins() -> crate::Result<Vec<Skin>> {
 /// Minecraft profile. If the currently equipped skin is custom but not managed by
 /// the app (i.e., it was set externally by another launcher, the Minecraft website,
 /// etc.), that skin will be added as a custom skin to the app database as well.
-#[tracing::instrument]
+#[tracing::instrument(skip(texture_blob))]
 pub async fn add_and_equip_custom_skin(
     texture_blob: Bytes,
     variant: MinecraftSkinVariant,
diff --git a/packages/app-lib/src/state/minecraft_skins/mod.rs b/packages/app-lib/src/state/minecraft_skins/mod.rs
index 5e85d35bc..ea96aa160 100644
--- a/packages/app-lib/src/state/minecraft_skins/mod.rs
+++ b/packages/app-lib/src/state/minecraft_skins/mod.rs
@@ -169,7 +169,7 @@ impl CustomMinecraftSkin {
 
         sqlx::query!(
             "DELETE FROM custom_minecraft_skins \
-            WHERE minecraft_user_uuid = ? AND texture_key = ? AND variant = ? AND cape_id = ?",
+            WHERE minecraft_user_uuid = ? AND texture_key = ? AND variant = ? AND cape_id IS ?",
             minecraft_user_id, self.texture_key, self.variant, cape_id
         )
         .execute(&mut *db.acquire().await?)