Merge remote-tracking branch 'upstream/pull/2834'

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 518cb94ccf29a81223671520c23dd09d5c467d1d..0bff6868a31ef45e9de31867049c12630a83fc12 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -202,7 +202,7 @@ class User < ApplicationRecord
       sql_for_area = QuadTile.sql_for_area(gc.bounds(radius), "home_")
       sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
       nearby = User.active.identifiable
       sql_for_area = QuadTile.sql_for_area(gc.bounds(radius), "home_")
       sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
       nearby = User.active.identifiable

-                   .where("id != ?", id)
+                   .where.not(:id => id)

                    .where(sql_for_area)
                    .where("#{sql_for_distance} <= ?", radius)
                    .order(Arel.sql(sql_for_distance))
                    .where(sql_for_area)
                    .where("#{sql_for_distance} <= ?", radius)
                    .order(Arel.sql(sql_for_distance))


@@ -218,7 +218,7 @@ class User < ApplicationRecord
   end
 
   def is_friends_with?(new_friend)
   end
 
   def is_friends_with?(new_friend)

-    friendships.where(:befriendee => new_friend).exists?
+    friendships.exists?(:befriendee => new_friend)

   end
 
   ##
   end
 
   ##