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

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 0068bc3de504ee2d7e380cc2641b4ae1889082ba..665e2d721376b897738691c73cf4a62c0bc3bd4b 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -12,6 +12,7 @@
 #  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
 #
@@ -32,6 +33,10 @@ class Message < ApplicationRecord
   validates :body, :sent_on, :presence => 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
@@ -63,6 +68,20 @@ class Message < ApplicationRecord
     sha256 = Digest::SHA256.new
     sha256 << Rails.application.key_generator.generate_key("openstreetmap/message")
     sha256 << id.to_s
-    sha256.base64digest[0, 8]
+    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