treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Extract shared tagged statuses method in `FeaturedTag` (#28805)

th-new
Matt Jankowski 2024-01-18 11:14:15 -05:00 committed by GitHub
parent f0b93ab02f
commit f866413e72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/featured_tag.rb
View File

@ -45,7 +45,7 @@ class FeaturedTag < ApplicationRecord
end end
def decrement(deleted_status_id) def decrement(deleted_status_id)
update(statuses_count: [0, statuses_count - 1].max, last_status_at: account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).where.not(id: deleted_status_id).select(:created_at).first&.created_at) update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).select(:created_at).first&.created_at)
end end
private private
@ -55,8 +55,8 @@ class FeaturedTag < ApplicationRecord
end end
def reset_data def reset_data
self.statuses_count = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).count self.statuses_count = visible_tagged_account_statuses.count
self.last_status_at = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).select(:created_at).first&.created_at self.last_status_at = visible_tagged_account_statuses.select(:created_at).first&.created_at
end end
def validate_featured_tags_limit def validate_featured_tags_limit
@ -72,4 +72,8 @@ class FeaturedTag < ApplicationRecord
def tag_already_featured_for_account? def tag_already_featured_for_account?
FeaturedTag.by_name(name).exists?(account_id: account_id) FeaturedTag.by_name(name).exists?(account_id: account_id)
end end
def visible_tagged_account_statuses
account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag)
end
end end