L.hash expects parseHash to return false if there isn't a location

[rails.git] / app / models / message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index 464c5502837b56c5ffdf409ff32288f6b5779cac..b51c59f4359d950bd614be043ad2bf79e2174ddb 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -7,6 +7,50 @@ 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_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_as_utf8 :title
   validates_as_utf8 :title

+
+  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
+    md5 << from_user_id.to_s
+    md5 << to_user_id.to_s
+    md5 << sent_on.xmlschema
+    md5 << title
+    md5 << body
+    md5.hexdigest
+  end
+
+private
+
+  def set_defaults
+    self.body_format = "markdown" unless self.attribute_present?(:body_format)
+  end

 end
 end