3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044)

signup-info-prompt
Eugen Rochko 2021-11-26 01:12:39 +01:00 committed by GitHub
parent b1fd6d4490
commit 12b3ff6c6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/preview_card.rb
View File

@ -84,6 +84,10 @@ class PreviewCard < ApplicationRecord
attributes['trendable'].nil? && (provider.nil? || provider.requires_review_notification?) attributes['trendable'].nil? && (provider.nil? || provider.requires_review_notification?)
end 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 attr_writer :provider
def local? def local?

4
app/models/tag.rb
View File

@ -80,6 +80,10 @@ class Tag < ApplicationRecord
requires_review? && !requested_review? requires_review? && !requested_review?
end 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 def history
@history ||= Trends::History.new('tags', id) @history ||= Trends::History.new('tags', id)
end end

2
app/views/admin/trends/links/_preview_card.html.haml
View File

@ -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) %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)) = 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? - elsif preview_card.provider&.requires_review?

2
app/views/admin/trends/tags/_tag.html.haml
View File

@ -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) %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)) = t('admin.trends.tags.peaked_on_and_decaying', date: l(tag.max_score_at.to_date, format: :short))
- elsif tag.requires_review? - elsif tag.requires_review?