has_many :traces, :conditions => { :visible => true }
has_many :diary_entries, :order => 'created_at DESC'
has_many :diary_comments, :order => 'created_at DESC'
- has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC'
+ has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC', :include => [:sender, :recipient]
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 :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC', :include => [:sender, :recipient]
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 :note_comments, :foreign_key => :author_id
+ has_many :notes, :through => :note_comments
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"])
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_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
attr_accessible :display_name, :email, :email_confirmation, :openid_url,
- :pass_crypt, :pass_crypt_confirmation, :consider_pd
+ :pass_crypt, :pass_crypt_confirmation, :consider_pd,
+ :image_use_gravatar
- after_initialize :set_creation_time
+ after_initialize :set_defaults
before_save :encrypt_password
+ after_save :spam_check
- has_attached_file :image,
+ has_attached_file :image,
:default_url => "/assets/:class/:attachment/:style.png",
:styles => { :large => "100x100>", :small => "50x50>" }
end
end
- user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt)
+ if user and PasswordHash.check(user.pass_crypt, user.pass_salt, options[:password])
+ if PasswordHash.upgrade?(user.pass_crypt, user.pass_salt)
+ user.pass_crypt, user.pass_salt = PasswordHash.create(options[:password])
+ user.save
+ end
+ else
+ user = nil
+ end
elsif options[:token]
token = UserToken.find_by_token(options[:token])
user = token.user if token
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
def is_friends_with?(new_friend)
- res = false
- @new_friend = new_friend
- self.friends.each do |friend|
- if friend.friend_user_id == @new_friend.id
- return true
- end
- end
- return false
+ self.friends.where(:friend_user_id => new_friend.id).exists?
end
##
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
##
# return a spam score for a user
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) }
+ changeset_score = self.changesets.size * 50
+ trace_score = self.traces.size * 50
+ 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)
+ 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
return score.to_i
end
+ ##
+ # perform a spam check on a user
+ def spam_check
+ if status == "active" and spam_score > SPAM_THRESHOLD
+ update_column(:status, "suspended")
+ end
+ end
+
##
# return an oauth access token for a specified application
def access_token(application_key)
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, self.pass_salt = PasswordHash.create(pass_crypt)
+ self.pass_crypt_confirmation = nil
end
end
end
projects / rails.git / blobdiff