mirror of https://github.com/mastodon/mastodon.git
Fix URLs in inline-rendered XML
parent
41ef277da3
commit
4e351baf88
|
@ -6,7 +6,8 @@ class Pubsubhubbub::DistributionWorker
|
||||||
def perform(stream_entry_id)
|
def perform(stream_entry_id)
|
||||||
stream_entry = StreamEntry.find(stream_entry_id)
|
stream_entry = StreamEntry.find(stream_entry_id)
|
||||||
account = stream_entry.account
|
account = stream_entry.account
|
||||||
payload = AccountsController.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom])
|
renderer = AccountsController.renderer.new(method: 'get', http_host: Rails.configuration.x.local_domain, https: Rails.configuration.x.use_https)
|
||||||
|
payload = renderer.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom])
|
||||||
|
|
||||||
Subscription.where(account: account).active.select('id').find_each do |subscription|
|
Subscription.where(account: account).active.select('id').find_each do |subscription|
|
||||||
Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload)
|
Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload)
|
||||||
|
|
|
@ -14,8 +14,3 @@ Rails.application.configure do
|
||||||
config.action_cable.allowed_request_origins = ["http#{https ? 's' : ''}://#{host}"]
|
config.action_cable.allowed_request_origins = ["http#{https ? 's' : ''}://#{host}"]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
ApplicationController.renderer.defaults.merge!(
|
|
||||||
http_host: host,
|
|
||||||
https: https
|
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in New Issue