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.status IN ('active', 'confirmed')"
+ has_many :friend_users, :through => :friends, :source => :befriendee
has_many :tokens, :class_name => "UserToken"
has_many :preferences, :class_name => "UserPreference"
has_many :changesets, :order => 'created_at DESC'
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 => proc { [ "user_blocks.ends_at > :ends_at or user_blocks.needs_view", { :ends_at => Time.now.getutc } ] }
+ has_many :blocks, :class_name => "UserBlock"
+ has_many :blocks_created, :class_name => "UserBlock", :foreign_key => :creator_id
+ has_many :blocks_revoked, :class_name => "UserBlock", :foreign_key => :revoker_id
+
has_many :roles, :class_name => "UserRole"
scope :visible, where(:status => ["pending", "active", "confirmed"])
scope :active, where(:status => ["active", "confirmed"])
+ scope :public, where(:data_public => true)
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'
- validates_uniqueness_of :display_name, :allow_nil => true
- validates_uniqueness_of :email
+ validates_uniqueness_of :display_name, :allow_nil => true, :case_sensitive => false, :if => Proc.new { |u| u.display_name_changed? }
+ validates_uniqueness_of :email, :case_sensitive => false, :if => Proc.new { |u| u.email_changed? }
validates_uniqueness_of :openid_url, :allow_nil => true
validates_length_of :pass_crypt, :within => 8..255
validates_length_of :display_name, :within => 3..255, :allow_nil => true
validates_email_format_of :email, :if => Proc.new { |u| u.email_changed? }
validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? }
- validates_format_of :display_name, :with => /^[^\/;.,?]*$/, :if => Proc.new { |u| u.display_name_changed? }
+ validates_format_of :display_name, :with => /^[^\/;.,?%#]*$/, :if => Proc.new { |u| u.display_name_changed? }
validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? }
validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? }
validates_numericality_of :home_lat, :allow_nil => true
validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
- after_initialize :set_creation_time
+ attr_accessible :display_name, :email, :email_confirmation, :openid_url,
+ :pass_crypt, :pass_crypt_confirmation, :consider_pd,
+ :image_use_gravatar
+
+ after_initialize :set_defaults
before_save :encrypt_password
- file_column :image, :magick => { :geometry => "100x100>" }
+ has_attached_file :image,
+ :default_url => "/assets/:class/:attachment/:style.png",
+ :styles => { :large => "100x100>", :small => "50x50>" }
def self.authenticate(options)
if options[:username] and options[:password]
user = where("email = ? OR display_name = ?", options[:username], options[:username]).first
+
+ if user.nil?
+ users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username], options[:username])
+
+ if users.count == 1
+ user = users.first
+ end
+ end
+
user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt)
elsif options[:token]
- token = UserToken.where(:token => options[:token]).preload(:user).first
+ token = UserToken.find_by_token(options[:token])
user = token.user if token
end
user = nil
end
- token.update_attribute(:expiry, 1.week.from_now) if token and user
+ token.update_column(:expiry, 1.week.from_now) if token and user
return user
- end
+ end
def to_xml
doc = OSM::API.new.get_xml_doc
return el1
end
+ def description
+ RichText.new(read_attribute(:description_format), read_attribute(:description))
+ end
+
def languages
attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
end
end
def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
- if self.home_lon and self.home_lat
+ if self.home_lon and self.home_lat
gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
bounds = gc.bounds(radius)
sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
end
##
- # returns the first active block which would require users to view
+ # 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? }
+ blocks.active.detect { |b| b.needs_view? }
end
##
self.image = nil
self.email_valid = false
self.new_email = nil
+ self.openid_url = nil
self.status = "deleted"
self.save
end
def spam_score
changeset_score = self.changesets.limit(10).length * 50
trace_score = self.traces.limit(10).length * 50
- diary_entry_score = self.diary_entries.inject(0) { |s,e| s += OSM.spam_score(e.body) }
- diary_comment_score = self.diary_comments.inject(0) { |s,e| s += OSM.spam_score(e.body) }
+ diary_entry_score = self.diary_entries.inject(0) { |s,e| s += e.body.spam_score }
+ diary_comment_score = self.diary_comments.inject(0) { |s,c| s += c.body.spam_score }
- score = OSM.spam_score(self.description) * 2
+ score = self.description.spam_score / 4.0
score += diary_entry_score / self.diary_entries.length if self.diary_entries.length > 0
score += diary_comment_score / self.diary_comments.length if self.diary_comments.length > 0
score -= changeset_score
private
- def set_creation_time
+ def set_defaults
self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
+ self.description_format = "markdown" unless self.attribute_present?(:description_format)
end
def encrypt_password
if pass_crypt_confirmation
self.pass_salt = OSM::make_token(8)
self.pass_crypt = OSM::encrypt_password(pass_crypt, pass_salt)
+ self.pass_crypt_confirmation = nil
end
end
end
projects / rails.git / blobdiff