hanna/fabrica

feat(store): user profile fields and avatar metadata

8bb3d4e · hanna committed on 2026-07-25

Add a 0002 migration (both dialects) extending users with pronouns, bio,
website, location, named social handles, and an avatar content type; NULL
avatar_mime falls back to a generated identicon and the bytes live on disk,
keeping the schema portable. Surface the fields on the model and add
update_profile / set_avatar_mime store queries.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Signed by hannaSSH key fingerprint: SHA256:4g9cWhkAAw8gwqhJUcVbSnGEvdGwklW+1Aa/fMUu59k

crates/model/src/entity.rs +15 −0

crates/store/src/lib.rs +1 −1

crates/store/src/users.rs +90 −1

migrations/postgres/0002_user_profile.sql +12 −0

migrations/sqlite/0002_user_profile.sql +12 −0

     pub email: String,
     /// Optional human-friendly display name.
     pub display_name: Option<String>,
+    /// Optional pronouns, shown on the profile (e.g. `they/them`).
+    pub pronouns: Option<String>,
+    /// Optional free-text bio shown on the profile.
+    pub bio: Option<String>,
+    /// Optional personal website URL.
+    pub website: Option<String>,
+    /// Optional location string.
+    pub location: Option<String>,
+    /// Optional `GitHub` handle (username only, no `@`).
+    pub social_github: Option<String>,
+    /// Optional Mastodon handle (e.g. `@user@instance`).
+    pub social_mastodon: Option<String>,
+    /// Content type of the uploaded avatar, or `None` to use a generated
+    /// identicon. The bytes live on disk, not in this row.
+    pub avatar_mime: Option<String>,
     /// Argon2id PHC hash, or `None` until an invite is completed.
     pub password_hash: Option<String>,
     /// Whether the user must set a new password on next login.

 pub use crate::repos::NewRepo;
 pub use crate::sessions::NewSession;
 pub use crate::tokens::NewToken;
-pub use crate::users::NewUser;
+pub use crate::users::{NewUser, ProfileUpdate};
 /// Migrations for the SQLite dialect, embedded at build time.
 static SQLITE_MIGRATOR: Migrator = sqlx::migrate!("../../migrations/sqlite");

 /// The columns of `users` in a fixed order, shared by every `SELECT` so the
 /// row-mapping in [`Store::map_user`] can rely on names.
-pub(crate) const USER_COLUMNS: &str = "id, username, email, display_name, password_hash, \
+pub(crate) const USER_COLUMNS: &str = "id, username, email, display_name, pronouns, bio, \
+     website, location, social_github, social_mastodon, avatar_mime, password_hash, \
      must_change_password, is_admin, disabled_at, created_at, updated_at";
+/// The editable profile fields, set together by the settings page. Each `None`
+/// clears the column.
+#[derive(Debug, Clone, Default)]
+pub struct ProfileUpdate {
+    /// Display name.
+    pub display_name: Option<String>,
+    /// Pronouns.
+    pub pronouns: Option<String>,
+    /// Free-text bio.
+    pub bio: Option<String>,
+    /// Website URL.
+    pub website: Option<String>,
+    /// Location.
+    pub location: Option<String>,
+    /// `GitHub` handle.
+    pub social_github: Option<String>,
+    /// Mastodon handle.
+    pub social_mastodon: Option<String>,
+}
 /// Fields needed to create a user. The server fills in the id, timestamps, and
 /// the normalized `*_lower` uniqueness keys.
 #[derive(Debug, Clone)]
             username: new.username,
             email: new.email,
             display_name: new.display_name,
+            pronouns: None,
+            bio: None,
+            website: None,
+            location: None,
+            social_github: None,
+            social_mastodon: None,
+            avatar_mime: None,
             password_hash: new.password_hash,
             must_change_password: new.must_change_password,
             is_admin: new.is_admin,
         Ok(deleted > 0)
+    }
+    /// Overwrite a user's profile fields (each `None` clears the column).
+    ///
+    /// Returns `true` if a user with `user_id` existed and was updated.
+    ///
+    /// # Errors
+    ///
+    /// Returns [`StoreError::Query`] on a database failure.
+    pub async fn update_profile(
+        &self,
+        user_id: &str,
+        profile: ProfileUpdate,
+    ) -> Result<bool, StoreError> {
+        let sql = "UPDATE users SET display_name = $1, pronouns = $2, bio = $3, website = $4, \
+             location = $5, social_github = $6, social_mastodon = $7, updated_at = $8 WHERE id = $9";
+        let updated = sqlx::query(sql)
+            .bind(profile.display_name)
+            .bind(profile.pronouns)
+            .bind(profile.bio)
+            .bind(profile.website)
+            .bind(profile.location)
+            .bind(profile.social_github)
+            .bind(profile.social_mastodon)
+            .bind(now_ms())
+            .bind(user_id)
+            .execute(&self.pool)
+            .await?
+            .rows_affected();
+        Ok(updated > 0)
+    }
+    /// Set (or clear) the content type of a user's uploaded avatar. `None`
+    /// returns the user to the generated-identicon fallback.
+    ///
+    /// Returns `true` if a user with `user_id` existed and was updated.
+    ///
+    /// # Errors
+    ///
+    /// Returns [`StoreError::Query`] on a database failure.
+    pub async fn set_avatar_mime(
+        &self,
+        user_id: &str,
+        mime: Option<&str>,
+    ) -> Result<bool, StoreError> {
+        let updated =
+            sqlx::query("UPDATE users SET avatar_mime = $1, updated_at = $2 WHERE id = $3")
+                .bind(mime)
+                .bind(now_ms())
+                .bind(user_id)
+                .execute(&self.pool)
+                .await?
+                .rows_affected();
+        Ok(updated > 0)
+    }
     /// Map a `users` row (selected via [`USER_COLUMNS`]) to a [`User`].
     pub(crate) fn map_user(&self, row: &AnyRow) -> Result<User, sqlx::Error> {
         Ok(User {
             username: row.try_get("username")?,
             email: row.try_get("email")?,
             display_name: row.try_get("display_name")?,
+            pronouns: row.try_get("pronouns")?,
+            bio: row.try_get("bio")?,
+            website: row.try_get("website")?,
+            location: row.try_get("location")?,
+            social_github: row.try_get("social_github")?,
+            social_mastodon: row.try_get("social_mastodon")?,
+            avatar_mime: row.try_get("avatar_mime")?,
             password_hash: row.try_get("password_hash")?,
             must_change_password: self.get_bool(row, "must_change_password")?,
             is_admin: self.get_bool(row, "is_admin")?,

+-- Profile fields shown on the user page: pronouns, a bio, a website and
+-- location, and named social handles. `avatar_mime` records an uploaded
+-- avatar's content type; NULL means fall back to a generated identicon. The
+-- avatar bytes live on disk under `{storage.data_dir}/avatars/{id}`, keeping
+-- the schema portable (no BLOB/BYTEA divergence).
+ALTER TABLE users ADD COLUMN pronouns        TEXT;
+ALTER TABLE users ADD COLUMN bio             TEXT;
+ALTER TABLE users ADD COLUMN website         TEXT;
+ALTER TABLE users ADD COLUMN location        TEXT;
+ALTER TABLE users ADD COLUMN social_github   TEXT;
+ALTER TABLE users ADD COLUMN social_mastodon TEXT;
+ALTER TABLE users ADD COLUMN avatar_mime     TEXT;

+-- Profile fields shown on the user page: pronouns, a bio, a website and
+-- location, and named social handles. `avatar_mime` records an uploaded
+-- avatar's content type; NULL means fall back to a generated identicon. The
+-- avatar bytes live on disk under `{storage.data_dir}/avatars/{id}`, keeping
+-- the schema portable (no BLOB/BYTEA divergence).
+ALTER TABLE users ADD COLUMN pronouns        TEXT;
+ALTER TABLE users ADD COLUMN bio             TEXT;
+ALTER TABLE users ADD COLUMN website         TEXT;
+ALTER TABLE users ADD COLUMN location        TEXT;
+ALTER TABLE users ADD COLUMN social_github   TEXT;
+ALTER TABLE users ADD COLUMN social_mastodon TEXT;
+ALTER TABLE users ADD COLUMN avatar_mime     TEXT;