Merge pull request #4218 from AntonKhorev/no-user-id-renames

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 472129b1b6e174c0a525ff70a648b9d78b8904f9..55d2c3c84af76790de21916109eb0bacc31199a8 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -22,13 +22,13 @@
 #  diary_comments_user_id_fkey         (user_id => users.id)
 #
 
-class DiaryComment < ActiveRecord::Base
+class DiaryComment < ApplicationRecord
   belongs_to :user
   belongs_to :diary_entry
 
   scope :visible, -> { where(:visible => true) }
 
-  validates :body, :presence => true, :invalid_chars => true
+  validates :body, :presence => true, :characters => true
   validates :diary_entry, :user, :associated => true
 
   after_save :spam_check
@@ -37,13 +37,12 @@ class DiaryComment < ActiveRecord::Base
     RichText.new(self[:body_format], self[:body])
   end
 
-  def digest
-    md5 = Digest::MD5.new
-    md5 << diary_entry_id.to_s
-    md5 << user_id.to_s
-    md5 << created_at.xmlschema
-    md5 << body
-    md5.hexdigest
+  def notification_token(subscriber)
+    sha256 = Digest::SHA256.new
+    sha256 << Rails.application.key_generator.generate_key("openstreetmap/diary_comment")
+    sha256 << id.to_s
+    sha256 << subscriber.to_s
+    Base64.urlsafe_encode64(sha256.digest)[0, 8]
   end
 
   private