fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-20 00:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Account.activitypub generated scope (#28157)

Browse source
This commit is contained in:
Matt Jankowski 2024-03-14 09:19:20 -04:00 committed by GitHub
parent 049d9171eb
commit 14aa7f1e15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/account.rb
View file

@ -442,7 +442,7 @@ class Account < ApplicationRecord
end end
def inboxes def inboxes
urls = reorder(nil).where(protocol: :activitypub).group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url")) urls = reorder(nil).activitypub.group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
DeliveryFailureTracker.without_unavailable(urls) DeliveryFailureTracker.without_unavailable(urls)
end end

2
lib/mastodon/cli/accounts.rb
View file

@ -295,7 +295,7 @@ module Mastodon::CLI
skip_threshold = 7.days.ago skip_threshold = 7.days.ago
skip_domains = Concurrent::Set.new skip_domains = Concurrent::Set.new
query = Account.remote.where(protocol: :activitypub) query = Account.remote.activitypub
query = query.where(domain: domains) unless domains.empty? query = query.where(domain: domains) unless domains.empty?
processed, culled = parallelize_with_progress(query.partitioned) do |account| processed, culled = parallelize_with_progress(query.partitioned) do |account|