X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..e89a78fff858d5db07f6959a39dd9655dc46008e:/app/models/diary_comment.rb diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb index ade7a64ea..a88c69f12 100644 --- a/app/models/diary_comment.rb +++ b/app/models/diary_comment.rb @@ -2,9 +2,9 @@ # # Table name: diary_comments # -# id :integer not null, primary key -# diary_entry_id :integer not null -# user_id :integer not null +# id :bigint(8) not null, primary key +# diary_entry_id :bigint(8) not null +# user_id :bigint(8) not null # body :text not null # created_at :datetime not null # updated_at :datetime not null @@ -22,8 +22,8 @@ # 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) } @@ -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