From 8a412f0f59e0585ba0bf31e6473708eb92685ed3 Mon Sep 17 00:00:00 2001 From: KMY Date: Sat, 15 Apr 2023 09:56:30 +0900 Subject: [PATCH] Fix status trends --- app/lib/activitypub/activity/like.rb | 2 ++ app/models/trends/statuses.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb index 9fd08280d9..c0592c4c61 100644 --- a/app/lib/activitypub/activity/like.rb +++ b/app/lib/activitypub/activity/like.rb @@ -36,6 +36,8 @@ class ActivityPub::Activity::Like < ActivityPub::Activity emoji.uri = uri emoji.image_remote_url = image_url end + + Trends.statuses.register(@original_status) end return if EmojiReaction.where(account: @account, status: @original_status).count >= EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb index 79c7887372..f45e860722 100644 --- a/app/models/trends/statuses.rb +++ b/app/models/trends/statuses.rb @@ -91,7 +91,7 @@ class Trends::Statuses < Trends::Base private def eligible?(status) - status.public_visibility? && status.account.discoverable? && !status.account.silenced? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language) + (status.searchability.nil? || status.public_searchability?) && (status.public_visibility? || status.public_unlisted_visibility?) && status.account.discoverable? && !status.account.silenced? && status.spoiler_text.blank? && (!status.sensitive? || !status.media_attachments.any?) && !status.reply? && valid_locale?(status.language) end def calculate_scores(statuses, at_time)