Merge remote-tracking branch 'upstream/pull/4449'

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 4e89cb2e1648dd709f3e99cd715ee8df22b99c44..665e2d721376b897738691c73cf4a62c0bc3bd4b 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -2,16 +2,17 @@
 #
 # Table name: messages
 #
 #
 # Table name: messages
 #

-#  id                :integer          not null, primary key
-#  from_user_id      :integer          not null
+#  id                :bigint(8)        not null, primary key
+#  from_user_id      :bigint(8)        not null

 #  title             :string           not null
 #  body              :text             not null
 #  sent_on           :datetime         not null
 #  message_read      :boolean          default(FALSE), not null
 #  title             :string           not null
 #  body              :text             not null
 #  sent_on           :datetime         not null
 #  message_read      :boolean          default(FALSE), not null

-#  to_user_id        :integer          not null
+#  to_user_id        :bigint(8)        not null

 #  to_user_visible   :boolean          default(TRUE), not null
 #  from_user_visible :boolean          default(TRUE), not null
 #  body_format       :enum             default("markdown"), not null
 #  to_user_visible   :boolean          default(TRUE), not null
 #  from_user_visible :boolean          default(TRUE), not null
 #  body_format       :enum             default("markdown"), not null

+#  muted             :boolean          default(FALSE), not null

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -24,16 +25,18 @@
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 

-require "validators"
-
-class Message < ActiveRecord::Base
+class Message < ApplicationRecord

   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255

-  validates :body, :sent_on, :sender, :recipient, :presence => true
+  validates :body, :sent_on, :presence => true

   validates :title, :body, :characters => true
 
   validates :title, :body, :characters => true
 

+  scope :muted, -> { where(:muted => true) }
+
+  before_create :set_muted
+

   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part
   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part


@@ -61,13 +64,24 @@ class Message < 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 << from_user_id.to_s
-    md5 << to_user_id.to_s
-    md5 << sent_on.xmlschema
-    md5 << title
-    md5 << body
-    md5.hexdigest
+  def notification_token
+    sha256 = Digest::SHA256.new
+    sha256 << Rails.application.key_generator.generate_key("openstreetmap/message")
+    sha256 << id.to_s
+    Base64.urlsafe_encode64(sha256.digest)[0, 8]
+  end
+
+  def notify_recipient?
+    !muted?
+  end
+
+  def unmute
+    update(:muted => false)
+  end
+
+  private
+
+  def set_muted
+    self.muted ||= UserMute.active?(:owner => recipient, :subject => sender)

   end
 end
   end
 end