X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/18b9b9f14cd4dace0aded89ca0c42562faced74f..8e02c98c3fb052803c4a70a35b14c1d1ca9c4119:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 0bff6868a..9cc8b7d83 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -44,6 +44,7 @@ # class User < ApplicationRecord + require "digest" 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 :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 @@ -152,26 +153,6 @@ class User < ApplicationRecord user end - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node - el1 = XML::Node.new "user" - el1["display_name"] = display_name.to_s - el1["account_created"] = creation_time.xmlschema - if home_lat && home_lon - home = XML::Node.new "home" - home["lat"] = home_lat.to_s - home["lon"] = home_lon.to_s - home["zoom"] = home_zoom.to_s - el1 << home - end - el1 - end - def description RichText.new(self[:description_format], self[:description]) end @@ -306,6 +287,13 @@ class User < ApplicationRecord 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