Merge remote-tracking branch 'upstream/pull/4297'

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 44b1d8745e6fdf8600b6ff307c789599f08c7262..7c12769d3a3e39f081caeb16dd0417a858a0ddc2 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -29,7 +29,7 @@ class Message < ApplicationRecord
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255
-  validates :body, :sent_on, :sender, :recipient, :presence => true
+  validates :body, :sent_on, :presence => true
   validates :title, :body, :characters => true
 
   def self.from_mail(mail, from, to)
@@ -59,13 +59,10 @@ class Message < ApplicationRecord
     RichText.new(self[:body_format], self[: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
+  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