Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.
This commit is contained in:
@ -7,7 +7,8 @@ class AccountDeletionWorker
|
||||
|
||||
def perform(account_id, options = {})
|
||||
reserve_username = options.with_indifferent_access.fetch(:reserve_username, true)
|
||||
DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, reserve_email: false)
|
||||
skip_activitypub = options.with_indifferent_access.fetch(:skip_activitypub, false)
|
||||
DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, skip_activitypub: skip_activitypub, reserve_email: false)
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
true
|
||||
end
|
||||
|
18
app/workers/cache_buster_worker.rb
Normal file
18
app/workers/cache_buster_worker.rb
Normal file
@ -0,0 +1,18 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class CacheBusterWorker
|
||||
include Sidekiq::Worker
|
||||
include RoutingHelper
|
||||
|
||||
sidekiq_options queue: 'pull'
|
||||
|
||||
def perform(path)
|
||||
cache_buster.bust(full_asset_url(path))
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def cache_buster
|
||||
CacheBuster.new(Rails.configuration.x.cache_buster)
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user