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:
@@ -13,7 +13,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
|
||||
|
||||
def delete_person
|
||||
lock_or_return("delete_in_progress:#{@account.id}") do
|
||||
DeleteAccountService.new.call(@account, reserve_username: false)
|
||||
DeleteAccountService.new.call(@account, reserve_username: false, skip_activitypub: true)
|
||||
end
|
||||
end
|
||||
|
||||
|
28
app/lib/cache_buster.rb
Normal file
28
app/lib/cache_buster.rb
Normal file
@@ -0,0 +1,28 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class CacheBuster
|
||||
def initialize(options = {})
|
||||
@secret_header = options[:secret_header] || 'Secret-Header'
|
||||
@secret = options[:secret] || 'True'
|
||||
end
|
||||
|
||||
def bust(url)
|
||||
site = Addressable::URI.parse(url).normalized_site
|
||||
|
||||
request_pool.with(site) do |http_client|
|
||||
build_request(url, http_client).perform
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def request_pool
|
||||
RequestPool.current
|
||||
end
|
||||
|
||||
def build_request(url, http_client)
|
||||
Request.new(:get, url, http_client: http_client).tap do |request|
|
||||
request.add_headers(@secret_header => @secret)
|
||||
end
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user