Clear current_user if we reject OAuth 1

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 05f5044c5db779b232da81bd6e3bbdf0ba31d5b5..a88c69f12ee3b3d8db208fa6405569e7dee5af15 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -23,7 +23,7 @@
 #
 
 class DiaryComment < ApplicationRecord
 #
 
 class DiaryComment < ApplicationRecord

-  belongs_to :user
+  belongs_to :user, :counter_cache => true

   belongs_to :diary_entry
 
   scope :visible, -> { where(:visible => true) }
   belongs_to :diary_entry
 
   scope :visible, -> { where(:visible => true) }


@@ -37,13 +37,12 @@ class DiaryComment < ApplicationRecord
     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