Changeset 82079ad in Klonkt

Timestamp:

06/24/2026 12:31:43 PM (3 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

3d7312a

Parents:

52ea6df

Message:

feat: one identity — user avatar falls back to the site photo everywhere

When a user has no own account avatar, display their site's profile photo across
the account page, top nav (render.js) and comments. No DB copy → stays in sync.

Co-Authored-By: Claude <noreply@…>

Location:

src

Files:

• middleware/render.js (modified) (1 diff)
• routes/account.js (modified) (3 diffs)
• routes/posts.js (modified) (1 diff)
• views/pages/account.ejs (modified) (2 diffs)

src/middleware/render.js

@@ -73 +73 @@
     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 userOwnsSite = !!(_u && _u.role !== 'god' &&

src/routes/account.js

@@ -68 +68 @@
   if (account) { delete account.password_hash; delete account.google_sub; } // don't leak to the view
 
+  const editableSite = ownedSite(req.session.user);
   renderPage(req, res, 'pages/account', {
     pageTitle: 'Account',
@@ -75 +76 @@
     googleLinked,
     googleAvailable: googleConfigured(),
-    editableSite: ownedSite(req.session.user),
+    editableSite,
+    // Display fallback: when you have no own account avatar, show your site's photo.
+    siteAvatar: editableSite ? editableSite.profile_photo : null,
     success: req.query.success || null,
     error: req.query.error || null,
@@ -98 +101 @@
 function ownedSite(user) {
   if (!user) return null;
-  let site = db.prepare('SELECT id, title, tagline, slug, owner_id FROM sites WHERE owner_id = ? ORDER BY created_at LIMIT 1').get(user.id);
+  let site = db.prepare('SELECT id, title, tagline, slug, owner_id, profile_photo FROM sites WHERE owner_id = ? ORDER BY created_at LIMIT 1').get(user.id);
   if (!site && user.role === 'god') {
     site = getPrimarySite(); // primary/main site as fallback

src/routes/posts.js

@@ -661 +661 @@
   const commentRows = db.prepare(`
     SELECT c.id, c.parent_comment_id, c.content, c.status, c.created_at,
-           c.author_id, u.username AS author_username, u.avatar_url AS author_avatar
+           c.author_id, u.username AS author_username,
+           COALESCE(u.avatar_url, (SELECT profile_photo FROM sites WHERE owner_id = u.id AND profile_photo IS NOT NULL ORDER BY is_primary DESC, created_at ASC LIMIT 1)) AS author_avatar
     FROM comments c JOIN users u ON u.id = c.author_id
     WHERE c.post_id = ? AND c.status = 'approved'

src/views/pages/account.ejs

@@ -31 +31 @@
           <label class="ax-avatar-wrap" title="<%= t('acct.avatar_change') %>">
             <span class="ax-profile-avatar">
-              <% if (account.avatar_url) { %>
-                <img src="<%= account.avatar_url %>" alt="">
+              <% var _av = account.avatar_url || (typeof siteAvatar !== 'undefined' ? siteAvatar : null); %>
+              <% if (_av) { %>
+                <img src="<%= _av %>" alt="">
               <% } else { %>
                 <span><%= account.username.charAt(0).toUpperCase() %></span>
@@ -45 +46 @@
       <% } else { %>
         <span class="ax-profile-avatar ax-profile-avatar-static">
-          <% if (account.avatar_url) { %>
-            <img src="<%= account.avatar_url %>" alt="">
+          <% var _av2 = account.avatar_url || (typeof siteAvatar !== 'undefined' ? siteAvatar : null); %>
+          <% if (_av2) { %>
+            <img src="<%= _av2 %>" alt="">
           <% } else { %>
             <span><%= account.username.charAt(0).toUpperCase() %></span>