Merge branch 'feature-suggestions' into development

1 files changed, 5 insertions, 1 deletions

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 930f60cc3..7757fd7f8 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -1,6 +1,6 @@
 class Api::V1::AccountsController < ApiController
   before_action :doorkeeper_authorize!
-  before_action :set_account, except: :verify_credentials
+  before_action :set_account, except: [:verify_credentials, :suggestions]
   respond_to    :json
 
   def show
@@ -19,6 +19,10 @@ class Api::V1::AccountsController < ApiController
     @followers = @account.followers
   end
 
+  def suggestions
+    @accounts = FollowSuggestion.get(current_user.account_id)
+  end
+
   def statuses
     @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
   end