diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 01:25:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-26 01:25:29 +0100 |
commit | 025a2ceb0f31b4672479418ba0ae784cdfe3b0c6 (patch) | |
tree | 107a4d73b58a9b1c77962f87bf9f629340bce1c5 /app/views/admin | |
parent | b4f785c1f46693c4e42b035e6728f99aac1b85db (diff) | |
parent | 3304df0ab559d9cec4da60a512460f26f07a56d3 (diff) |
Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin')
-rw-r--r-- | app/views/admin/trends/links/_preview_card.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/trends/tags/_tag.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/trends/links/_preview_card.html.haml b/app/views/admin/trends/links/_preview_card.html.haml index dfed13b68..b88c1be2f 100644 --- a/app/views/admin/trends/links/_preview_card.html.haml +++ b/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? diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml index c4af77b00..7bb99b158 100644 --- a/app/views/admin/trends/tags/_tag.html.haml +++ b/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? |