X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..5befc0658a8ea301f4fbdf0c348c725e140da5fb:/app/models/diary_comment.rb?ds=inline diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb index 8a99c7b2c..55d2c3c84 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,11 +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 - validates :body, :presence => true + scope :visible, -> { where(:visible => true) } + + validates :body, :presence => true, :characters => true validates :diary_entry, :user, :associated => true after_save :spam_check @@ -35,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