X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c2f23fea6a7821a4ad4c97fd65744b138ec86267..271384e683bfbee1ee3377f36df07e48bff5e39f:/app/models/diary_comment.rb diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb index 472129b1b..a88c69f12 100644 --- 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 - belongs_to :user +class DiaryComment < ApplicationRecord + belongs_to :user, :counter_cache => true 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