Add Bootstrap styling to changeset node/way/relation page links

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 65c2d29eddc9cafc9792ebb4dd385c0e44e2022b..7c12769d3a3e39f081caeb16dd0417a858a0ddc2 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,13 +1,36 @@
-require 'validators'
+# == Schema Information
+#
+# Table name: messages
+#
+#  id                :bigint(8)        not null, primary key
+#  from_user_id      :bigint(8)        not null
+#  title             :string           not null
+#  body              :text             not null
+#  sent_on           :datetime         not null
+#  message_read      :boolean          default(FALSE), not null
+#  to_user_id        :bigint(8)        not null
+#  to_user_visible   :boolean          default(TRUE), not null
+#  from_user_visible :boolean          default(TRUE), not null
+#  body_format       :enum             default("markdown"), not null
+#
+# Indexes
+#
+#  messages_from_user_id_idx  (from_user_id)
+#  messages_to_user_id_idx    (to_user_id)
+#
+# Foreign Keys
+#
+#  messages_from_user_id_fkey  (from_user_id => users.id)
+#  messages_to_user_id_fkey    (to_user_id => users.id)
+#

 
 

-class Message < ActiveRecord::Base
+class Message < ApplicationRecord

   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   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
+  validates :title, :presence => true, :utf8 => true, :length => 1..255
+  validates :body, :sent_on, :presence => true
+  validates :title, :body, :characters => true

 
   def self.from_mail(mail, from, to)
     if mail.multipart?
 
   def self.from_mail(mail, from, to)
     if mail.multipart?


@@ -33,16 +56,13 @@ class Message < ActiveRecord::Base
   end
 
   def body
   end
 
   def body

-    RichText.new(read_attribute(:body_format), read_attribute(:body))
+    RichText.new(self[:body_format], self[:body])

   end
 
   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
+  def notification_token
+    sha256 = Digest::SHA256.new
+    sha256 << Rails.application.key_generator.generate_key("openstreetmap/message")
+    sha256 << id.to_s
+    Base64.urlsafe_encode64(sha256.digest)[0, 8]

   end
 end
   end
 end