X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/23b8672bc9a8449f6a89d94b25ea036f4815e4bc..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/models/message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index 98346d7c7..8ca1dc5bc 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -6,10 +6,36 @@ class Message < ActiveRecord::Base
 
   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_associated :sender, :recipient
+  validates_inclusion_of :message_read, :in => [true, false]
   validates_as_utf8 :title
 
+  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 = 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
     md5 << from_user_id.to_s