Merge tag 'v1.6.0' into sync/upstream

2017-09-10 13:04:27 -05:00
parent c9df53044a ab71cf4593
commit 932571fa22
26 changed files with 175 additions and 49 deletions
--- a/app/controllers/api/v1/follows_controller.rb
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -10,6 +10,12 @@ class Api::V1::FollowsController < Api::BaseController
    raise ActiveRecord::RecordNotFound if follow_params[:uri].blank?

    @account = FollowService.new.call(current_user.account, target_uri).try(:target_account)
+
+    if @account.nil?
+      username, domain = target_uri.split('@')
+      @account         = Account.find_remote!(username, domain)
+    end
+
    render json: @account, serializer: REST::AccountSerializer
  end