treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Use `Account.activitypub` generated scope (#28157)

main-rebase-security-fix
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
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)
end

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

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