X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a863be8831efbb815bfd9ecdba01b8334552f0a3..0dc14b6e79aa3e1c91a6f30d72c5f8c673633987:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 177a29984..8c75b4ef4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -45,7 +45,6 @@
 
 class User < ApplicationRecord
   require "digest"
-  require "xml/libxml"
 
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }
@@ -114,7 +113,8 @@ class User < ApplicationRecord
   validates_email_format_of :email, :if => proc { |u| u.email_changed? }
   validates_email_format_of :new_email, :allow_blank => true, :if => proc { |u| u.new_email_changed? }
 
-  after_initialize :set_defaults
+  alias_attribute :created_at, :creation_time
+
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
@@ -308,7 +308,7 @@ class User < ApplicationRecord
   end
 
   def max_messages_per_hour
-    account_age_in_seconds = Time.now.utc - creation_time
+    account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
@@ -317,7 +317,7 @@ class User < ApplicationRecord
   end
 
   def max_friends_per_hour
-    account_age_in_seconds = Time.now.utc - creation_time
+    account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
@@ -327,10 +327,6 @@ class User < ApplicationRecord
 
   private
 
-  def set_defaults
-    self.creation_time = Time.now.getutc unless attribute_present?(:creation_time)
-  end
-
   def encrypt_password
     if pass_crypt_confirmation
       self.pass_crypt, self.pass_salt = PasswordHash.create(pass_crypt)