forked from didirus/AstralRinth
* chore: typo fix and formatting tidyups * refactor(theseus): extend auth subsystem to fetch complete user profiles * chore: fix new `prettier` lints * chore: document differences between similar `Credentials` methods * chore: remove dead `profile_run_credentials` plugin command * feat(app): skin selector backend * enh(app/skin-selector): better DB intension through deferred FKs, further PNG validations * chore: fix comment typo spotted by Copilot * fix: less racy auth token refresh logic This may help with issues reported by users where the access token is invalid and can't be used to join servers over long periods of time. * tweak(app-lib): improve consistency of skin field serialization case * fix(app-lib/minecraft_skins): fix custom skin removal from DB not working * Begin skins frontend * Cape preview * feat: start on SkinPreviewRenderer * feat: setting for nametag * feat: hide nametag setting (sql) * fix: positioning of meshes * fix: lighting * fix: allow dragging off-bounds * fix: better color mapping * feat: hide nametag setting (impl) * feat: Start on edit modal + cape button cleanup + renderer fixes * feat: Finish new skin modal * feat: finish cape modal * feat: skin rendering on load * fix: logic for Skins.vue * fix: types * fix: types (for modal + renderer) * feat: Editing? * fix: renderer not updating variant * fix: mojang username not modrinth username * feat: batched skin rendering - remove vzge references (apart from capes, wip) * feat: fix sizing on SkinButton and SkinLikeButton, also implement bust positioning * feat: capes in preview renderer & baked renders * fix: lint fixes * refactor: Start on cleanup and polish * fix: hide error notification when logged out * revert: .gltf formatting * chore(app-frontend): fix typos * fix(app-lib): delay account skin data deletion to next reboot This gives users an opportunity to not unexpectedly lose skin data in case they log off on accident. * fix: login button & provide/inject AccountsCard * polish: skin buttons * fix: imports * polish: use figma values * polish: tweak underneath shadow * polish: cursor grab * polish: remove green bg from CapeLikeTextButton when selected. * polish: modal tweaks * polish: grid tweaks + start on upload skin modal * polish: drag and drop file flow * polish: button positioning in SkinButton * fix: lint issues * polish: deduplicate model+cape stuff and fix layout * fix: lint issues * fix: camel case requirement for make-default * polish: use indexed db to persist skin previews * fix: lint issues * polish: add skin icon sizing * polish: theme fixes * feat: animation system for skin preview renderer * feat(app/minecraft_skins): save current custom external skin when equipping skins * fix: cape button & dynamic nametag sizing * feat(theseus): add `normalize_skin_texture` Tauri command This command lets the app frontend opt in to normalizing the texture of any skin, which may be in either the legacy 64x32 or newer 64x64 format, to the newer 64x64 format for display purposes. * chore: Rust build fixes * feat: start impl of skin normalization on frontend * feat(theseus): change parameter type of `normalize_skin_texture` Tauri command * fix: normalization * fix(theseus): make new `normalize_skin_texture` command usable * feat: finish normalization impl * fix: vueuse issue * fix: use optimistic approach when changing skins/capes. * fix: nametag cleanup + scroll fix * fix: edit modal computedAsync not fast enough for skin preview renderer * feat: classic player model animations * chore: fix new Clippy lint * fix(app-lib): actually delete custom skins with no cape overrides * fix(app-lib): handle repeated addition of the same skin properly * refactor(app-lib): simplify DB connection logic a little * fix: various improvements * feat: slim animations * fix: z-fighting on models * fix: shading + lighting improvements * fix: shadows * fix: polish * fix: polish * fix: accounts card not having the right head * fix: lint issues * fix: build issue * feat: drag and drop func * fix: temp disable drag and drop in the modal * Revert "fix: temp disable drag and drop in the modal" This reverts commit 33500c564e3f85e6c0a2e83dd9700deda892004d. * fix: drag and drop working * fix: lint * fix: better media queries * feat(app/skins): revert current custom external skin storing on equip This reverts commit 0155262ddd081c8677654619a09e814088fdd8b0. * regen pnpm lock * pnpm fix * Make default capes a little more clear * Lint --------- Co-authored-by: Alejandro González <me@alegon.dev> Co-authored-by: Prospector <prospectordev@gmail.com>
181 lines
5.7 KiB
Rust
181 lines
5.7 KiB
Rust
use futures::{Stream, StreamExt, stream};
|
|
use uuid::{Uuid, fmt::Hyphenated};
|
|
|
|
use super::MinecraftSkinVariant;
|
|
|
|
pub mod mojang_api;
|
|
|
|
/// Represents the default cape for a Minecraft player.
|
|
#[derive(Debug, Clone)]
|
|
pub struct DefaultMinecraftCape {
|
|
/// The UUID of a cape for a Minecraft player, which comes from its profile.
|
|
///
|
|
/// This UUID may or may not be different for every player, even if they refer to the same cape.
|
|
pub id: Uuid,
|
|
}
|
|
|
|
impl DefaultMinecraftCape {
|
|
pub async fn set(
|
|
minecraft_user_id: Uuid,
|
|
cape_id: Uuid,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<()> {
|
|
let minecraft_user_id = minecraft_user_id.as_hyphenated();
|
|
let cape_id = cape_id.as_hyphenated();
|
|
|
|
sqlx::query!(
|
|
"INSERT OR REPLACE INTO default_minecraft_capes (minecraft_user_uuid, id) VALUES (?, ?)",
|
|
minecraft_user_id, cape_id
|
|
)
|
|
.execute(&mut *db.acquire().await?)
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn get(
|
|
minecraft_user_id: Uuid,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<Option<Self>> {
|
|
let minecraft_user_id = minecraft_user_id.as_hyphenated();
|
|
|
|
Ok(sqlx::query_as!(
|
|
Self,
|
|
"SELECT id AS 'id: Hyphenated' FROM default_minecraft_capes WHERE minecraft_user_uuid = ?",
|
|
minecraft_user_id
|
|
)
|
|
.fetch_optional(&mut *db.acquire().await?)
|
|
.await?)
|
|
}
|
|
|
|
pub async fn remove(
|
|
minecraft_user_id: Uuid,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<()> {
|
|
let minecraft_user_id = minecraft_user_id.as_hyphenated();
|
|
|
|
sqlx::query!(
|
|
"DELETE FROM default_minecraft_capes WHERE minecraft_user_uuid = ?",
|
|
minecraft_user_id
|
|
)
|
|
.execute(&mut *db.acquire().await?)
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
/// Represents a custom skin for a Minecraft player.
|
|
#[derive(Debug, Clone)]
|
|
pub struct CustomMinecraftSkin {
|
|
/// The key for the texture skin, which is akin to a hash that identifies it.
|
|
pub texture_key: String,
|
|
/// The variant of the skin model.
|
|
pub variant: MinecraftSkinVariant,
|
|
/// The UUID of the cape that this skin uses, which should match one of the
|
|
/// cape UUIDs the player has in its profile.
|
|
///
|
|
/// If `None`, the skin does not have an explicit cape set, and the default
|
|
/// cape for this player, if any, should be used.
|
|
pub cape_id: Option<Uuid>,
|
|
}
|
|
|
|
impl CustomMinecraftSkin {
|
|
pub async fn add(
|
|
minecraft_user_id: Uuid,
|
|
texture_key: &str,
|
|
texture: &[u8],
|
|
variant: MinecraftSkinVariant,
|
|
cape_id: Option<Uuid>,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<()> {
|
|
let minecraft_user_id = minecraft_user_id.as_hyphenated();
|
|
let cape_id = cape_id.map(|id| id.hyphenated());
|
|
|
|
let mut transaction = db.begin().await?;
|
|
|
|
sqlx::query!(
|
|
"INSERT OR REPLACE INTO custom_minecraft_skin_textures (texture_key, texture) VALUES (?, ?)",
|
|
texture_key, texture
|
|
)
|
|
.execute(&mut *transaction)
|
|
.await?;
|
|
|
|
sqlx::query!(
|
|
"INSERT OR REPLACE INTO custom_minecraft_skins (minecraft_user_uuid, texture_key, variant, cape_id) VALUES (?, ?, ?, ?)",
|
|
minecraft_user_id, texture_key, variant, cape_id
|
|
)
|
|
.execute(&mut *transaction)
|
|
.await?;
|
|
|
|
transaction.commit().await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn get_many(
|
|
minecraft_user_id: Uuid,
|
|
offset: u32,
|
|
count: u32,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<impl Stream<Item = Self>> {
|
|
let minecraft_user_id = minecraft_user_id.as_hyphenated();
|
|
|
|
Ok(stream::iter(sqlx::query!(
|
|
"SELECT texture_key, variant AS 'variant: MinecraftSkinVariant', cape_id AS 'cape_id: Hyphenated' \
|
|
FROM custom_minecraft_skins \
|
|
WHERE minecraft_user_uuid = ? \
|
|
ORDER BY rowid ASC \
|
|
LIMIT ? OFFSET ?",
|
|
minecraft_user_id, count, offset
|
|
)
|
|
.fetch_all(&mut *db.acquire().await?)
|
|
.await?)
|
|
.map(|row| Self {
|
|
texture_key: row.texture_key,
|
|
variant: row.variant,
|
|
cape_id: row.cape_id.map(Uuid::from),
|
|
}))
|
|
}
|
|
|
|
pub async fn get_all(
|
|
minecraft_user_id: Uuid,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<impl Stream<Item = Self>> {
|
|
// Limit ourselves to 2048 skins, so that memory usage even when storing base64
|
|
// PNG data of a 64x64 texture with random pixels stays around ~150 MiB
|
|
Self::get_many(minecraft_user_id, 0, 2048, db).await
|
|
}
|
|
|
|
pub async fn texture_blob(
|
|
&self,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<Vec<u8>> {
|
|
Ok(sqlx::query_scalar!(
|
|
"SELECT texture FROM custom_minecraft_skin_textures WHERE texture_key = ?",
|
|
self.texture_key
|
|
)
|
|
.fetch_one(&mut *db.acquire().await?)
|
|
.await?)
|
|
}
|
|
|
|
pub async fn remove(
|
|
&self,
|
|
minecraft_user_id: Uuid,
|
|
db: impl sqlx::Acquire<'_, Database = sqlx::Sqlite>,
|
|
) -> crate::Result<()> {
|
|
let minecraft_user_id = minecraft_user_id.as_hyphenated();
|
|
let cape_id = self.cape_id.map(|id| id.hyphenated());
|
|
|
|
sqlx::query!(
|
|
"DELETE FROM custom_minecraft_skins \
|
|
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?)
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
}
|