X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/aa4205482a4af317ec26fc686793b57f02a6864a..dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7:/app/models/message.rb diff --git a/app/models/message.rb b/app/models/message.rb index feceec5c0..2a0cea4a1 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -1,20 +1,37 @@ -require 'validators' +require "validators" class Message < ActiveRecord::Base 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, :sender, :recipient, :presence => true + + def self.from_mail(mail, from, to) + if mail.multipart? + if mail.text_part + body = mail.text_part.decoded + elsif mail.html_part + body = HTMLEntities.new.decode(Sanitize.clean(mail.html_part.decoded)) + end + elsif mail.text? && mail.sub_type == "html" + body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded)) + else + body = mail.decoded + end + + Message.new( + :sender => from, + :recipient => to, + :sent_on => mail.date.new_offset(0), + :title => mail.subject.sub(/\[OpenStreetMap\] */, ""), + :body => body, + :body_format => "text" + ) + end def body - RichText.new(read_attribute(:body_format), read_attribute(:body)) + RichText.new(self[:body_format], self[:body]) end def digest @@ -26,10 +43,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