Check if db is writable on oauth authorization pages

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 63eae3f213ee621f7016459271e46af036661a77..a88c69f12ee3b3d8db208fa6405569e7dee5af15 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -2,9 +2,9 @@
 #
 # Table name: diary_comments
 #
 #
 # 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
 #  body           :text             not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null


@@ -22,13 +22,13 @@
 #  diary_comments_user_id_fkey         (user_id => users.id)
 #
 
 #  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) }
 
   belongs_to :diary_entry
 
   scope :visible, -> { where(:visible => true) }
 

-  validates :body, :presence => true
+  validates :body, :presence => true, :characters => true

   validates :diary_entry, :user, :associated => true
 
   after_save :spam_check
   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
 
     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
   end
 
   private