Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Avoid latest featured tag use on post removal unless necessary (#32787)

Browse source
This commit is contained in:
Claire 2024-11-06 11:51:54 +01:00 • committed by GitHub
parent 871e3b25e8
commit 2bea74e69d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 58 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/featured_tag.rb
View file

@ -44,8 +44,16 @@ class FeaturedTag < ApplicationRecord
update(statuses_count: statuses_count + 1, last_status_at: timestamp)
end
def decrement(deleted_status_id)
update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).pick(:created_at))
def decrement(deleted_status)
if statuses_count <= 1
update(statuses_count: 0, last_status_at: nil)
elsif last_status_at > deleted_status.created_at
update(statuses_count: statuses_count - 1)
else
# Fetching the latest status creation time can be expensive, so only perform it
# if we know we are deleting the latest status using this tag
update(statuses_count: statuses_count - 1, last_status_at: visible_tagged_account_statuses.where(id: ...deleted_status.id).pick(:created_at))
end
end
private

2
app/services/process_hashtags_service.rb
View file

@ -33,7 +33,7 @@ class ProcessHashtagsService < BaseService
unless removed_tags.empty?
@account.featured_tags.where(tag_id: removed_tags.map(&:id)).find_each do |featured_tag|
featured_tag.decrement(@status.id)
featured_tag.decrement(@status)
end
end
end

2
app/services/remove_status_service.rb
View file

@ -115,7 +115,7 @@ class RemoveStatusService < BaseService
def remove_from_hashtags
@account.featured_tags.where(tag_id: @status.tags.map(&:id)).find_each do |featured_tag|
featured_tag.decrement(@status.id)
featured_tag.decrement(@status)
end
return unless @status.public_visibility?