AO3-5053 Remove byline from cache instead of touching all bookmarks

otwcode · Mar 30, 2024 · ad766d5 · ad766d5
1 parent 4048cb6
commit ad766d5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
@@ -102,7 +102,7 @@ def check_new_external_work
 
   scope :latest, -> { is_public.limit(ArchiveConfig.ITEMS_PER_PAGE).join_work }
 
-  scope :for_blurb, -> { includes(:bookmarkable, :pseud, :tags, :collections) }
+  scope :for_blurb, -> { includes(:bookmarkable, :pseud, :tags, :collections, :user) }
 
   # a complicated dynamic scope here:
   # if the user is an Admin, we use the "visible_to_admin" scope

diff --git a/app/models/pseud.rb b/app/models/pseud.rb
@@ -397,11 +397,10 @@ def check_default_pseud
   end
 
   def expire_caches
-    return unless saved_change_to_name?
-
-    bookmarks.touch_all
-    works.touch_all
-    series.each(&:expire_byline_cache)
+    if saved_change_to_name?
+      works.touch_all
+      series.each(&:expire_byline_cache)
+    end
   end
 
   def touch_comments

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -160,9 +160,7 @@ class User < ApplicationRecord
 
   def expire_caches
     return unless saved_change_to_login?
-
     series.each(&:expire_byline_cache)
-    self.bookmarks.touch_all
     self.works.each do |work|
       work.touch
       work.expire_caches

diff --git a/app/views/bookmarks/_bookmark_user_module.html.erb b/app/views/bookmarks/_bookmark_user_module.html.erb
@@ -1,11 +1,12 @@
 <% # expects "bookmark" %>
 <div class="<% if is_author_of?(bookmark) %>own <% end %>user module group">
-  <% blurb_cache_key = (is_author_of?(bookmark) ? "bookmark-owner-blurb-#{bookmark.cache_key}-v2" : "bookmark-blurb-#{bookmark.cache_key}-v2") %>
+  <!--bookmarker-->
+  <h5 class="byline heading">
+    <%= ts('Bookmarked by') %> <%= link_to(bookmark.pseud.byline, user_pseud_bookmarks_path(bookmark.pseud.user, bookmark.pseud)) %>
+  </h5>
+  <% blurb_cache_key = (is_author_of?(bookmark) ? "bookmark-owner-blurb-#{bookmark.cache_key}-v3" : "bookmark-blurb-#{bookmark.cache_key}-v3") %>
   <% cache(blurb_cache_key, skip_digest: true) do %>
-    <!--bookmarker, time-->
-    <h5 class="byline heading">
-      <%= ts('Bookmarked by') %> <%= link_to(bookmark.pseud.byline, user_pseud_bookmarks_path(bookmark.pseud.user, bookmark.pseud)) %>
-    </h5>
+    <!--time-->
     <p class="datetime"><%= set_format_for_date(bookmark.created_at) %></p>
 
     <% # information added by the bookmark owner %>