Changeset ab544fd in Klonkt

Timestamp:

06/14/2026 04:49:24 PM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

6150acb

Parents:

a64f642

Message:

fix: PrutFolio header + roster show the SITE OWNER's photo, not the viewer's

Bug: profile-header.ejs used user.avatar_url (the LOGGED-IN viewer) as the
profile photo -> every PrutFolio showed the picture of whoever was looking
("studionoord" appeared to change along with the viewer). Now: site.profile_photo
-> avatar of the site owner -> music/initial fallback; never the viewer.
siteOwnerAvatar comes from render.js. Roster (hub overview) likewise: per-site
owner avatar instead of nothing.

Result: an artist's account avatar (/account) is immediately their PrutFolio
photo; one "own picture" that is correct, per user.

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

Location:

src

Files:

• middleware/render.js (modified) (1 diff)
• routes/hub.js (modified) (1 diff)
• views/pages/hub-home.ejs (modified) (1 diff)
• views/partials/profile-header.ejs (modified) (1 diff)

src/middleware/render.js

@@ -43 +43 @@
     db.prepare('SELECT 1 FROM sites WHERE owner_id = ? LIMIT 1').get(_u.id));
 
+  // De avatar van de SITE-EIGENAAR (niet de kijker!) — voor de PrutFolio-kop,
+  // zodat de artiest z'n eigen account-foto als sitefoto kan gebruiken.
+  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;
+
   // Common locals
   const locals = {
     user: _u,
     userOwnsSite,
-    site: data.site || res.locals.site || null,
+    siteOwnerAvatar,
+    site: _site,
     audioTracks: data.audioTracks || res.locals.audioTracks || [],
     siteUrlBase: res.locals.siteUrlBase || '',

src/routes/hub.js

@@ -38 +38 @@
   const artists = db.prepare(`
     SELECT s.slug, s.title, s.tagline, s.profile_photo, s.accent,
+           u.avatar_url AS owner_avatar,
            (SELECT COUNT(*) FROM posts WHERE site_id = s.id AND status = 'published') AS post_count
     FROM sites s
+    LEFT JOIN users u ON u.id = s.owner_id
     ORDER BY s.created_at ASC
   `).all();

src/views/pages/hub-home.ejs

@@ -38 +38 @@
         <% artists.forEach(function(a){ %>
           <a class="roster-card" href="/user/<%= a.slug %>">
-            <span class="roster-avatar"<% if (a.profile_photo) { %> style="background-image:url('<%= a.profile_photo %>')"<% } else { %> style="background:<%= a.accent || 'var(--accent)' %>;color:#fff"<% } %>>
-              <% if (!a.profile_photo) { %><%= (a.title || a.slug).charAt(0).toUpperCase() %><% } %>
+            <% var _ava = a.profile_photo || a.owner_avatar; %>
+            <span class="roster-avatar"<% if (_ava) { %> style="background-image:url('<%= _ava %>')"<% } else { %> style="background:<%= a.accent || 'var(--accent)' %>;color:#fff"<% } %>>
+              <% if (!_ava) { %><%= (a.title || a.slug).charAt(0).toUpperCase() %><% } %>
             </span>
             <span class="roster-name"><%= a.title %></span>

src/views/partials/profile-header.ejs

@@ -37 +37 @@
        hx-push-url="<%= (typeof siteUrlBase !== 'undefined' && siteUrlBase) ? siteUrlBase : '' %>/"
        hx-indicator="#pcms-loading" aria-label="Home">
-      <% if (typeof user !== 'undefined' && user && user.avatar_url) { %>
-        <img src="<%= user.avatar_url %>" alt="">
-      <% } else if (site.profile_photo) { %>
+      <% if (site.profile_photo) { %>
         <img src="<%= site.profile_photo %>" alt="">
+      <% } else if (typeof siteOwnerAvatar !== 'undefined' && siteOwnerAvatar) { %>
+        <img src="<%= siteOwnerAvatar %>" alt="">
       <% } else if (site.enable_audio_player) { %>
         <span class="profile-photo-fallback profile-photo-fallback--music" aria-hidden="true">