From 23d08c6749eb142b24f22045f643d0591af579ff Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 29 Feb 2016 20:06:39 +0100 Subject: Changing the use of config constants to the Rails configuration object --- app/services/follow_service.rb | 2 +- app/services/post_status_service.rb | 2 +- app/services/process_feed_service.rb | 2 +- app/services/reblog_service.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/services') diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index b0bfdf4f2..785ae583f 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -9,7 +9,7 @@ class FollowService < BaseService follow = source_account.follow!(target_account) send_interaction_service.(follow.stream_entry, target_account) - source_account.ping!(account_url(account, format: 'atom'), [HUB_URL]) + source_account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url]) end private diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index aa25de4dc..388639175 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -7,7 +7,7 @@ class PostStatusService < BaseService def call(account, text, in_reply_to = nil) status = account.statuses.create!(text: text, thread: in_reply_to) process_mentions_service.(status) - account.ping!(account_url(account, format: 'atom'), [HUB_URL]) + account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url]) status end diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index f6584bbda..7d8563a58 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -38,7 +38,7 @@ class ProcessFeedService < BaseService href = Addressable::URI.parse(mention_link.attribute('href').value) - if href.host == LOCAL_DOMAIN + if href.host == Rails.configuration.x.local_domain mentioned_account = Account.find_by(username: href.path.gsub('/users/', ''), domain: nil) unless mentioned_account.nil? diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb index e3e091fa7..086f297f4 100644 --- a/app/services/reblog_service.rb +++ b/app/services/reblog_service.rb @@ -5,7 +5,7 @@ class ReblogService < BaseService # @return [Status] def call(account, reblogged_status) reblog = account.statuses.create!(reblog: reblogged_status, text: '') - account.ping!(account_url(account, format: 'atom'), [HUB_URL]) + account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url]) return reblog if reblogged_status.local? send_interaction_service.(reblog.stream_entry, reblogged_status.account) reblog -- cgit