diff options
| -rw-r--r-- | app/workers/pubsubhubbub/distribution_worker.rb | 3 | ||||
| -rw-r--r-- | config/initializers/ostatus.rb | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb index d8cec2ef2..7917434f7 100644 --- a/app/workers/pubsubhubbub/distribution_worker.rb +++ b/app/workers/pubsubhubbub/distribution_worker.rb @@ -6,7 +6,8 @@ class Pubsubhubbub::DistributionWorker def perform(stream_entry_id) stream_entry = StreamEntry.find(stream_entry_id) 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| Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload) diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index 8772edb5e..4ba432b6a 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -14,8 +14,3 @@ Rails.application.configure do config.action_cable.allowed_request_origins = ["http#{https ? 's' : ''}://#{host}"] end end - -ApplicationController.renderer.defaults.merge!( - http_host: host, - https: https -) |