Changeset cca2e89 in Klonkt for src/middleware

Timestamp:

06/28/2026 01:15:39 PM (2 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

9910ba1

Parents:

931b4cb

Message:

feat(identity): one image — the site photo is the only avatar input

Removed the separate account-avatar upload. A user's avatar everywhere (nav, account, profile
header, fediverse) is now their SITE photo, set in one place (site settings). The account page
shows it read-only with a link.

• middleware/render.js — nav avatar = site photo always; drop the account-avatar cross-fallback
• views/pages/account.ejs — remove the avatar upload; read-only site photo + hint to site settings
• services/i18n.js — acct.photo_site_hint (nl/en/de)

File:

• src/middleware/render.js (modified) (1 diff)

src/middleware/render.js

@@ -71 +71 @@
   // avatar change or role switch) heals itself without a new login.
   if (_u && _u.id) {
-    const _fresh = db.prepare('SELECT avatar_url, role, lang FROM users WHERE id = ?').get(_u.id);
-    if (_fresh) _u = { ..._u, avatar_url: _fresh.avatar_url, role: _fresh.role, lang: _fresh.lang };
-    // One identity: no own account avatar → fall back to the user's site photo,
-    // so the same picture shows everywhere (nav, account, comments).
-    if (_u && !_u.avatar_url) {
-      const _sp = db.prepare("SELECT profile_photo FROM sites WHERE owner_id = ? AND profile_photo IS NOT NULL ORDER BY is_primary DESC, created_at ASC LIMIT 1").get(_u.id);
-      if (_sp && _sp.profile_photo) _u = { ..._u, avatar_url: _sp.profile_photo };
-    }
+    const _fresh = db.prepare('SELECT role, lang FROM users WHERE id = ?').get(_u.id);
+    if (_fresh) _u = { ..._u, role: _fresh.role, lang: _fresh.lang };
+    // ONE image: a user's avatar everywhere (nav, account, comments) is simply their SITE
+    // photo — there is no separate account avatar. Falls back to the initial-letter
+    // placeholder when the site has no photo yet.
+    const _sp = db.prepare("SELECT profile_photo FROM sites WHERE owner_id = ? AND profile_photo IS NOT NULL ORDER BY is_primary DESC, created_at ASC LIMIT 1").get(_u.id);
+    _u = { ..._u, avatar_url: (_sp && _sp.profile_photo) || null };
   }
   const userOwnsSite = !!(_u && _u.role !== 'god' &&
     db.prepare('SELECT 1 FROM sites WHERE owner_id = ? LIMIT 1').get(_u.id));
 
-  // The avatar of the SITE OWNER (not the viewer!) — for the Klonkt site header,
-  // so the artist can use their own account photo as the site photo.
   const _site = data.site || res.locals.site || null;
-  const siteOwnerAvatar = (_site && _site.owner_id)
-    ? (db.prepare('SELECT avatar_url FROM users WHERE id = ?').get(_site.owner_id)?.avatar_url || null)
-    : null;
+  // The site header uses the SITE photo (site.profile_photo) — the one and only image,
+  // set in site settings. (No separate account-avatar fallback anymore.)
+  const siteOwnerAvatar = null;
 
   // Viewer mode: may view everything, change nothing. Views use canMutate