Merge remote-tracking branch 'parent/main' into upstream-20241113
This commit is contained in:
commit
910eafda63
177 changed files with 1625 additions and 659 deletions
|
@ -6,8 +6,6 @@ class PostStatusService < BaseService
|
|||
include DtlHelper
|
||||
include NgRuleHelper
|
||||
|
||||
MIN_SCHEDULE_OFFSET = 5.minutes.freeze
|
||||
|
||||
class UnexpectedMentionsError < StandardError
|
||||
attr_reader :accounts
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ class SoftwareUpdateCheckService < BaseService
|
|||
end
|
||||
|
||||
def api_url
|
||||
ENV.fetch('UPDATE_CHECK_URL', 'https://kmy.blue/update-check')
|
||||
Rails.configuration.x.mastodon.software_update_url
|
||||
end
|
||||
|
||||
def version
|
||||
|
|
|
@ -12,7 +12,7 @@ class UnallowDomainService < BaseService
|
|||
private
|
||||
|
||||
def suspend_accounts!(domain)
|
||||
Account.where(domain: domain).in_batches.update_all(suspended_at: Time.now.utc)
|
||||
Account.where(domain: domain).in_batches.touch_all(:suspended_at)
|
||||
AfterUnallowDomainWorker.perform_async(domain)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue