Move some javascript functions out of global scope

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

diff --git a/app/models/message.rb b/app/models/message.rb
index feceec5c01ff266c7d6b3cfa7107471c3c59285b..10b6bda8ac55636a4b551b5cb37c71e3c5c517dc 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,4 +1,4 @@
-require 'validators'
+require "validators"

 
 class Message < ActiveRecord::Base
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
 
 class Message < ActiveRecord::Base
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id


@@ -6,12 +6,31 @@ class Message < ActiveRecord::Base
 
   validates_presence_of :title, :body, :sent_on, :sender, :recipient
   validates_length_of :title, :within => 1..255
 
   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_inclusion_of :message_read, :in => [true, false]

   validates_as_utf8 :title
 
   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? && 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))
 
   def body
     RichText.new(read_attribute(:body_format), read_attribute(:body))


@@ -26,10 +45,4 @@ class Message < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
     md5 << body
     md5.hexdigest
   end

-
-private
-
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end

 end
 end