Update to iD v2.19.3

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 518cb94ccf29a81223671520c23dd09d5c467d1d..7e1f1c6d63f9fdc14c9e4d13e1f6cb2670ea669d 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -44,6 +44,7 @@
 #
 
 class User < ApplicationRecord
 #
 
 class User < ApplicationRecord

+  require "digest"

   require "xml/libxml"
 
   has_many :traces, -> { where(:visible => true) }
   require "xml/libxml"
 
   has_many :traces, -> { where(:visible => true) }


@@ -56,7 +57,7 @@ class User < ApplicationRecord
   has_many :sent_messages, -> { where(:from_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :from_user_id
   has_many :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) }
   has_many :friends, :through => :friendships, :source => :befriendee
   has_many :sent_messages, -> { where(:from_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :from_user_id
   has_many :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) }
   has_many :friends, :through => :friendships, :source => :befriendee

-  has_many :tokens, :class_name => "UserToken"
+  has_many :tokens, :class_name => "UserToken", :dependent => :destroy

   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, -> { order(:created_at => :desc) }
   has_many :changeset_comments, :foreign_key => :author_id
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, -> { order(:created_at => :desc) }
   has_many :changeset_comments, :foreign_key => :author_id


@@ -202,7 +203,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 +219,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
 
   ##


@@ -306,6 +307,13 @@ class User < ApplicationRecord
     ClientApplication.find_by(:key => application_key).access_token_for_user(self)
   end
 
     ClientApplication.find_by(:key => application_key).access_token_for_user(self)
   end
 

+  def fingerprint
+    digest = Digest::SHA256.new
+    digest.update(email)
+    digest.update(pass_crypt)
+    digest.hexdigest
+  end
+

   private
 
   def set_defaults
   private
 
   def set_defaults