Bump osm-community-index from 5.6.1 to 5.6.2

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 5ace3d1580b4d2413613d79af3bcd993d0414573..55d2c3c84af76790de21916109eb0bacc31199a8 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -1,26 +1,51 @@
-class DiaryComment < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: diary_comments
+#
+#  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
+#  visible        :boolean          default(TRUE), not null
+#  body_format    :enum             default("markdown"), not null
+#
+# Indexes
+#
+#  diary_comment_user_id_created_at_index  (user_id,created_at)
+#  diary_comments_entry_id_idx             (diary_entry_id,id) UNIQUE
+#
+# Foreign Keys
+#
+#  diary_comments_diary_entry_id_fkey  (diary_entry_id => diary_entries.id)
+#  diary_comments_user_id_fkey         (user_id => users.id)
+#
+
+class DiaryComment < ApplicationRecord
   belongs_to :user
   belongs_to :diary_entry
 
-  validates_presence_of :body
-  validates_associated :diary_entry
+  scope :visible, -> { where(:visible => true) }
+
+  validates :body, :presence => true, :characters => true
+  validates :diary_entry, :user, :associated => true
 
   after_save :spam_check
 
   def body
-    RichText.new(read_attribute(:body_format), read_attribute(:body))
+    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
+  private
 
   def spam_check
     user.spam_check