diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2eae0c1..f36dfe1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,6 @@ class UsersController < ApplicationController def index - @users = User.all + @users = User.all_except(current_user) end def show diff --git a/app/models/user.rb b/app/models/user.rb index 0b1028c..94aa358 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,6 +2,8 @@ class User < ActiveRecord::Base has_many :friendships has_many :friends, through: :friendships + scope :all_except, ->(user) { where.not(id: user) } + def self.from_omniauth(auth) where(provider: auth[:provider], uid: auth[:uid]).first_or_create do |user| user.provider = auth[:provider]