X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f4571eeb7cb4f920bb5d642c9e1c37c9495fc6ba..c07279e4585ad8cdc859eea61a9193aa849e7e32:/app/models/user.rb?ds=inline diff --git a/app/models/user.rb b/app/models/user.rb index 241c1396f..54b3fa371 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,16 +1,22 @@ class User < ActiveRecord::Base require 'xml/libxml' - has_many :traces + has_many :traces, :conditions => { :visible => true } has_many :diary_entries, :order => 'created_at DESC' - has_many :messages, :foreign_key => :to_user_id, :order => 'sent_on DESC' - has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => {:message_read => false}, :order => 'sent_on DESC' - has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :order => 'sent_on DESC' + has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC' + has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => { :to_user_visible => true, :message_read => false }, :order => 'sent_on DESC' + has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC' has_many :friends, :include => :befriendee, :conditions => ["users.visible = ?", true] has_many :tokens, :class_name => "UserToken" has_many :preferences, :class_name => "UserPreference" has_many :changesets + has_many :client_applications + has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application] + + has_many :active_blocks, :class_name => "UserBlock", :conditions => ['user_blocks.ends_at > \'#{Time.now.getutc.xmlschema(5)}\' or user_blocks.needs_view'] + has_many :roles, :class_name => "UserRole" + validates_presence_of :email, :display_name validates_confirmation_of :email#, :message => ' addresses must match' validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password' @@ -30,7 +36,7 @@ class User < ActiveRecord::Base file_column :image, :magick => { :geometry => "100x100>" } def after_initialize - self.creation_time = Time.now.getutc if self.creation_time.nil? + self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time) end def encrypt_password @@ -122,8 +128,29 @@ class User < ActiveRecord::Base return false end - def trace_public_default - return self.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"}) + ## + # returns true if the user has the moderator role, false otherwise + def moderator? + has_role? 'moderator' + end + + ## + # returns true if the user has the administrator role, false otherwise + def administrator? + has_role? 'administrator' + end + + ## + # returns true if the user has the requested role + def has_role?(role) + roles.any? { |r| r.role == role } + end + + ## + # returns the first active block which would require users to view + # a message, or nil if there are none. + def blocked_on_view + active_blocks.detect { |b| b.needs_view? } end def delete