X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..8f57efe850bf9805d9bfb073d16d4cf1d06882f5:/app/models/message.rb diff --git a/app/models/message.rb b/app/models/message.rb index 44b1d8745..7c12769d3 100644 --- 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