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

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 7c12769d3a3e39f081caeb16dd0417a858a0ddc2..28320af78f3c8de52746ecab86ef09b3f49cf409 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -2,16 +2,17 @@
 #
 # Table name: messages
 #
 #
 # Table name: messages
 #

-#  id                :bigint(8)        not null, primary key
-#  from_user_id      :bigint(8)        not null
+#  id                :bigint           not null, primary key
+#  from_user_id      :bigint           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        :bigint(8)        not null
+#  to_user_id        :bigint           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
 #


@@ -32,6 +33,10 @@ class Message < ApplicationRecord
   validates :body, :sent_on, :presence => true
   validates :title, :body, :characters => true
 
   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
   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part


@@ -65,4 +70,18 @@ class Message < ApplicationRecord
     sha256 << id.to_s
     Base64.urlsafe_encode64(sha256.digest)[0, 8]
   end
     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