From f618ca2373f57adfb78807eaabdf8942f55efb0f Mon Sep 17 00:00:00 2001 From: Junv Zhao Date: Mon, 26 Oct 2015 23:47:15 +0800 Subject: [PATCH] Fix the issue of to say if current user followed someone. --- app/controllers/api/v1/users_controller.rb | 2 ++ app/serializers/user_serializer.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 75dffa1..d8ff5b6 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -1,6 +1,8 @@ class Api::V1::UsersController < Api::V1::ApplicationController skip_before_action :authenticate_user_from_token, only: [:show] + + before_action :fetch_current_user, only: [:show] before_action :load_user, except: [:me, :search] def show diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index e7d888e..4ac0acd 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -5,7 +5,7 @@ class UserSerializer < ActiveModel::Serializer def followed return true if object == scope.current_user - object.followers_ids.include? scope.current_user + object.followers_ids.include? scope.current_user.try(:id) end def posts_count