X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1340fca8f17e4e3cce211e6eafed18cde7f57386..ac7bb003ec9726d23d0a537f347c2dd4c8f7204a:/app/models/message.rb diff --git a/app/models/message.rb b/app/models/message.rb index 0b3416003..b51c59f43 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -9,7 +9,34 @@ class Message < ActiveRecord::Base validates_inclusion_of :message_read, :in => [ true, false ] validates_as_utf8 :title - attr_accessible :title, :body + after_initialize :set_defaults + + 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? and mail.sub_type == "html" + body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded)) + else + body = mail.decoded + end + + message = 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)) + end def digest md5 = Digest::MD5.new @@ -20,4 +47,10 @@ 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