]> cat aescling's git repositories - mastodon.git/commitdiff
Fix #4067 - Do not make HTTP round-trip when resolving local URL (#4160)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 11 Jul 2017 22:39:15 +0000 (00:39 +0200)
committerGitHub <noreply@github.com>
Tue, 11 Jul 2017 22:39:15 +0000 (00:39 +0200)
app/services/fetch_remote_resource_service.rb

index 5dfa3a0ff084f3f3810c9f215b6ef4b6ca660b53..2c1c1f05f55f724a3e32b1ff4c295ec00ab88256 100644 (file)
@@ -5,6 +5,9 @@ class FetchRemoteResourceService < BaseService
 
   def call(url)
     @url = url
+
+    return process_local_url if local_url?
+
     process_url unless fetched_atom_feed.nil?
   end
 
@@ -38,4 +41,29 @@ class FetchRemoteResourceService < BaseService
   def xml_data
     @_xml_data ||= Nokogiri::XML(body, nil, 'utf-8')
   end
+
+  def local_url?
+    TagManager.instance.local_url?(@url)
+  end
+
+  def process_local_url
+    recognized_params = Rails.application.routes.recognize_path(@url)
+
+    return unless recognized_params[:action] == 'show'
+
+    if recognized_params[:controller] == 'stream_entries'
+      status = StreamEntry.find_by(id: recognized_params[:id])&.status
+      check_local_status(status)
+    elsif recognized_params[:controller] == 'statuses'
+      status = Status.find_by(id: recognized_params[:id])
+      check_local_status(status)
+    elsif recognized_params[:controller] == 'accounts'
+      Account.find_local(recognized_params[:username])
+    end
+  end
+
+  def check_local_status(status)
+    return if status.nil?
+    status if status.public_visibility? || status.unlisted_visibility?
+  end
 end