specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix URLs in inline-rendered XML

Browse source
This commit is contained in:
Eugen Rochko 2016-11-29 00:26:01 +01:00
parent 41ef277da3
commit 4e351baf88
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/workers/pubsubhubbub/distribution_worker.rb
View file

@ -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)

5
config/initializers/ostatus.rb
View file

@ -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
)