Merge remote-tracking branch 'parent/main' into upstream-20231107

This commit is contained in:
KMY 2023-11-07 11:35:05 +09:00
commit 64578feeb4
69 changed files with 437 additions and 218 deletions

View file

@ -55,7 +55,8 @@ class ActivityPub::Parser::StatusParser
end
def created_at
@object['published']&.to_datetime
datetime = @object['published']&.to_datetime
datetime if datetime.present? && (0..9999).cover?(datetime.year)
rescue ArgumentError
nil
end

View file

@ -62,7 +62,7 @@ class DeliveryFailureTracker
key.delete_prefix(exhausted_deliveries_key_by(''))
end
domains - UnavailableDomain.all.pluck(:domain)
domains - UnavailableDomain.pluck(:domain)
end
def warning_domains_map(domains = nil)

View file

@ -261,7 +261,7 @@ class FeedManager
# @param [Account] target_account
# @return [void]
def clear_from_lists(account, target_account)
List.where(account: account).each do |list|
List.where(account: account).find_each do |list|
clear_from_list(list, target_account)
end
end