Merge pull request #2148 from basecamp/revert-avatar-change

kevinmcconnell · web-flow · commit 706fb8fade1e · 2025-12-15T13:28:21.000Z
Revert avatar change
diff --git a/app/assets/stylesheets/avatars.css b/app/assets/stylesheets/avatars.css
@@ -22,11 +22,6 @@
       max-inline-size: 100%;
       object-fit: cover;
     }
-
-    span[data-creator-id] {
-      display: grid;
-      place-items: center;
-    }
   }
 
   .avatar__form {
diff --git a/app/controllers/my/avatars_controller.rb b/app/controllers/my/avatars_controller.rb
diff --git a/app/controllers/users/avatars_controller.rb b/app/controllers/users/avatars_controller.rb
@@ -5,20 +5,17 @@ class Users::AvatarsController < ApplicationController
   before_action :ensure_permission_to_administer_user, only: :destroy
 
   def show
-    expires_in 30.minutes, public: true, stale_while_revalidate: 1.week
-
     if @user.system?
       redirect_to view_context.image_path("system_user.png")
     elsif @user.avatar.attached?
       redirect_to rails_blob_url(@user.avatar_thumbnail, disposition: "inline")
-    else
+    elsif stale? @user, cache_control: cache_control
       render_initials
     end
   end
 
   def destroy
     @user.avatar.destroy
-    @user.touch
     redirect_to @user
   end
 
@@ -31,6 +28,14 @@ def ensure_permission_to_administer_user
       head :forbidden unless Current.user.can_change?(@user)
     end
 
+    def cache_control
+      if @user == Current.user
+        {}
+      else
+        { max_age: 30.minutes, stale_while_revalidate: 1.week }
+      end
+    end
+
     def render_initials
       render formats: :svg
     end
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
@@ -42,11 +42,6 @@ def avatar_preview_tag(user, hidden_for_screen_reader: false, **options)
   end
 
   def avatar_image_tag(user, **options)
-    tag.span data: { creator_id: user.id } do
-      safe_join [
-        image_tag(my_avatar_url(script_name: user.account.slug), aria: { hidden: "true" }, size: 48, title: user.name, data: { only_visible_to_you: true }, **options),
-        image_tag(user_avatar_url(user, script_name: user.account.slug), aria: { hidden: "true" }, size: 48, title: user.name, data: { only_visible_to_others: true }, **options)
-      ]
-    end
+    image_tag user_avatar_url(user, script_name: user.account.slug), aria: { hidden: "true" }, size: 48, title: user.name, **options
   end
 end
diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
@@ -1,4 +1,5 @@
 <% cache comment do %>
+  <%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %>
   <%= turbo_frame_tag comment, :container do %>
     <%# Cache bump 2025-12-14: action text attachment rendering changed for lightbox -%>
     <div id="<%= dom_id(comment) %>" data-creator-id="<%= comment.creator_id %>"  class="comment flex align-start full-width <%= "comment--system" if comment.creator.system? %>">
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
@@ -1,4 +1,5 @@
 <% cache event do %>
+  <%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %>
   <% if lookup_context.exists?("events/event/eventable/_#{event.action}") %>
     <%= render "events/event/eventable/#{event.action}", event: event %>
   <% else %>
diff --git a/app/views/my/avatars/show.svg.erb b/app/views/my/avatars/show.svg.erb
diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb
@@ -1,4 +1,5 @@
 <% cache notification do %>
+  <%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %>
   <%= notification_tag notification do %>
     <%= render "notifications/notification/header", notification: notification do %>
       <%= notification_toggle_read_button(notification, url: card_reading_path(notification.card)) %>
diff --git a/app/views/users/_initials.svg.erb b/app/views/users/_initials.svg.erb
diff --git a/app/views/users/avatars/show.svg.erb b/app/views/users/avatars/show.svg.erb
@@ -1 +1,22 @@
-<%= render "users/initials", user: @user %>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+  viewBox="0 0 512 512" class="avatar" aria-hidden="true">
+  <defs>
+    <clipPath id="porthole">
+      <circle cx="50%" cy="50%" r="50%" />
+    </clipPath>
+  </defs>
+
+  <g>
+    <rect width="100%" height="100%" rx="50" fill="<%= avatar_background_color(@user) %>" />
+
+    <text x="50%" y="50%" fill="#FFFFFF"
+      text-anchor="middle" dy="0.35em"
+      <%=raw 'textLength="85%" lengthAdjust="spacingAndGlyphs"' if @user.initials.size >= 3 %>
+      font-family="-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica, Arial, sans-serif"
+      font-size="230"
+      font-weight="800"
+      letter-spacing="-5">
+      <%= @user.initials %>
+    </text>
+  </g>
+</svg>
diff --git a/config/routes.rb b/config/routes.rb
@@ -164,7 +164,6 @@
   resource :landing
 
   namespace :my do
-    resource :avatar, only: :show
     resource :identity, only: :show
     resources :access_tokens
     resources :pins
diff --git a/test/controllers/my/avatars_controller_test.rb b/test/controllers/my/avatars_controller_test.rb
diff --git a/test/controllers/users/avatars_controller_test.rb b/test/controllers/users/avatars_controller_test.rb
@@ -12,10 +12,17 @@ class Users::AvatarsControllerTest < ActionDispatch::IntegrationTest
     assert_redirected_to ActionController::Base.helpers.image_path("system_user.png")
   end
 
-  test "show initials with public caching" do
+  test "show own initials without caching" do
     get user_avatar_path(users(:david))
     assert_match "image/svg+xml", @response.content_type
-    assert @response.cache_control[:public]
+    assert @response.cache_control[:private]
+    assert_equal "0", @response.cache_control[:max_age]
+  end
+
+  test "show other initials with caching" do
+    get user_avatar_path(users(:kevin))
+    assert_match "image/svg+xml", @response.content_type
+    assert @response.cache_control[:private]
     assert_equal 30.minutes.to_s, @response.cache_control[:max_age]
   end
 

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,6 @@`
`22`	`22`	`max-inline-size: 100%;`
`23`	`23`	`object-fit: cover;`
`24`	`24`	`}`
`25`		`-`
`26`		`- span[data-creator-id] {`
`27`		`- display: grid;`
`28`		`- place-items: center;`
`29`		`- }`
`30`	`25`	`}`
`31`	`26`
`32`	`27`	`.avatar__form {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<% cache comment do %>`
	`2`	`+ <%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %>`
`2`	`3`	`<%= turbo_frame_tag comment, :container do %>`
`3`	`4`	`<%# Cache bump 2025-12-14: action text attachment rendering changed for lightbox -%>`
`4`	`5`	`<div id="<%= dom_id(comment) %>" data-creator-id="<%= comment.creator_id %>" class="comment flex align-start full-width <%= "comment--system" if comment.creator.system? %>">`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<% cache event do %>`
	`2`	`+ <%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %>`
`2`	`3`	`<% if lookup_context.exists?("events/event/eventable/_#{event.action}") %>`
`3`	`4`	`<%= render "events/event/eventable/#{event.action}", event: event %>`
`4`	`5`	`<% else %>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<% cache notification do %>`
	`2`	`+ <%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %>`
`2`	`3`	`<%= notification_tag notification do %>`
`3`	`4`	`<%= render "notifications/notification/header", notification: notification do %>`
`4`	`5`	`<%= notification_toggle_read_button(notification, url: card_reading_path(notification.card)) %>`