X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7be823bb11ad2aa93ffd4d85cc7f11469a867fa2..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/models/message.rb?ds=inline diff --git a/app/models/message.rb b/app/models/message.rb index f897af3c2..49c11e900 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -1,17 +1,36 @@ -require 'validators' +# == Schema Information +# +# Table name: messages +# +# id :bigint(8) not null, primary key +# from_user_id :bigint(8) not null +# title :string not null +# body :text not null +# sent_on :datetime not null +# message_read :boolean default(FALSE), not null +# to_user_id :bigint(8) not null +# to_user_visible :boolean default(TRUE), not null +# from_user_visible :boolean default(TRUE), not null +# body_format :enum default("markdown"), not null +# +# Indexes +# +# messages_from_user_id_idx (from_user_id) +# messages_to_user_id_idx (to_user_id) +# +# Foreign Keys +# +# messages_from_user_id_fkey (from_user_id => users.id) +# messages_to_user_id_fkey (to_user_id => users.id) +# -class Message < ActiveRecord::Base +class Message < ApplicationRecord belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id - validates_presence_of :title, :body, :sent_on, :sender, :recipient - validates_length_of :title, :within => 1..255 - validates_inclusion_of :message_read, :in => [ true, false ] - validates_as_utf8 :title - - attr_accessible :title, :body - - after_initialize :set_defaults + validates :title, :presence => true, :utf8 => true, :length => 1..255 + validates :body, :sent_on, :presence => true + validates :title, :body, :characters => true def self.from_mail(mail, from, to) if mail.multipart? @@ -20,24 +39,24 @@ class Message < ActiveRecord::Base elsif mail.html_part body = HTMLEntities.new.decode(Sanitize.clean(mail.html_part.decoded)) end - elsif mail.text? and mail.sub_type == "html" + elsif mail.text? && mail.sub_type == "html" body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded)) else body = mail.decoded end - message = Message.new({ + Message.new( :sender => from, :recipient => to, :sent_on => mail.date.new_offset(0), :title => mail.subject.sub(/\[OpenStreetMap\] */, ""), :body => body, :body_format => "text" - }, :without_protection => true) + ) end def body - RichText.new(read_attribute(:body_format), read_attribute(:body)) + RichText.new(self[:body_format], self[:body]) end def digest @@ -49,10 +68,4 @@ class Message < ActiveRecord::Base md5 << body md5.hexdigest end - -private - - def set_defaults - self.body_format = "markdown" unless self.attribute_present?(:body_format) - end end