monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inactive users' timelines being backfilled on follow and unsuspend (#33094)

This commit is contained in:
Claire 2024-11-28 18:40:53 +01:00 committed by GitHub
parent 7f4858b339
commit 7a4370f2d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/feed_manager.rb
View File

@ -110,6 +110,8 @@ class FeedManager
# @param [Account] into_account # @param [Account] into_account
# @return [void] # @return [void]
def merge_into_home(from_account, into_account) def merge_into_home(from_account, into_account)
return unless into_account.user&.signed_in_recently?
timeline_key = key(:home, into_account.id) timeline_key = key(:home, into_account.id)
aggregate = into_account.user&.aggregates_reblogs? aggregate = into_account.user&.aggregates_reblogs?
query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4) query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
@ -136,6 +138,8 @@ class FeedManager
# @param [List] list # @param [List] list
# @return [void] # @return [void]
def merge_into_list(from_account, list) def merge_into_list(from_account, list)
return unless list.account.user&.signed_in_recently?
timeline_key = key(:list, list.id) timeline_key = key(:list, list.id)
aggregate = list.account.user&.aggregates_reblogs? aggregate = list.account.user&.aggregates_reblogs?
query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4) query = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)