Merge branch 'main' into glitch-soc/merge-upstream

app/models/preview_card.rb

@@ -84,6 +84,10 @@ class PreviewCard < ApplicationRecord
     attributes['trendable'].nil? && (provider.nil? || provider.requires_review_notification?)
   end
 
+  def decaying?
+    max_score_at && max_score_at >= Trends.links.options[:max_score_cooldown].ago && max_score_at < 1.day.ago
+  end
+
   attr_writer :provider
 
   def local?

app/models/tag.rb

@@ -80,6 +80,10 @@ class Tag < ApplicationRecord
     requires_review? && !requested_review?
   end
 
+  def decaying?
+    max_score_at && max_score_at >= Trends.tags.options[:max_score_cooldown].ago && max_score_at < 1.day.ago
+  end
+
   def history
     @history ||= Trends::History.new('tags', id)
   end

app/views/admin/trends/links/_preview_card.html.haml

@@ -22,7 +22,7 @@
         •
         %abbr{ title: t('admin.trends.tags.current_score', score: Trends.links.score(preview_card.id)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
 
-        - if preview_card.max_score_at && preview_card.max_score_at >= Trends::Links::MAX_SCORE_COOLDOWN.ago && preview_card.max_score_at < 1.day.ago
+        - if preview_card.decaying?
           •
           = t('admin.trends.tags.peaked_on_and_decaying', date: l(preview_card.max_score_at.to_date, format: :short))
       - elsif preview_card.provider&.requires_review?

app/views/admin/trends/tags/_tag.html.haml

@@ -16,7 +16,7 @@
         •
         %abbr{ title: t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
 
-        - if tag.max_score_at && tag.max_score_at >= Trends::Tags::MAX_SCORE_COOLDOWN.ago && tag.max_score_at < 1.day.ago
+        - if tag.decaying?
           •
           = t('admin.trends.tags.peaked_on_and_decaying', date: l(tag.max_score_at.to_date, format: :short))
       - elsif tag.requires_review?