about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-10 15:09:06 +0200
committerGitHub <noreply@github.com>2017-09-10 15:09:06 +0200
commitc450ddb6134602ecc2917c493240e55e8773520b (patch)
tree46b9bcaa2180463cfc77a22372840211b80fe708 /app
parent15b886a6f0b0b9cdb3a5d938a7ec5c902d65410d (diff)
Fix POST /api/v1/follows error when already following (#4878)
Diffstat (limited to 'app')
-rw-r--r--app/controllers/api/v1/follows_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb
index e01ae5c01..5a2b2f32f 100644
--- 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