disabled notifications on conversation part

chaskiq · Feb 22, 2024 · b4176db · b4176db
1 parent a161e18
commit b4176db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/models/app_user.rb b/app/models/app_user.rb
@@ -194,6 +194,10 @@ def self.ransackable_associations(auth_object = nil)
     end
   end
 
+  def disabled_notifications?
+    unsubscribed? || archived? || blocked?
+  end
+
   def update_email(email)
     app_user = app.get_app_user_by_email(email)
     if app_user

diff --git a/app/models/conversation_part.rb b/app/models/conversation_part.rb
@@ -183,7 +183,8 @@ def send_constraints?
 
   def email_send_disabled?
     app = conversation.app
-    app.flagged || (app.plan.name == "free" && Chaskiq::Config.get("DISABLE_OUTGOING_EMAILS_FREE_PLAN"))
+    app.flagged || (app.plan.name == "free" && Chaskiq::Config.get("DISABLE_OUTGOING_EMAILS_FREE_PLAN")) ||
+      conversation&.main_participant&.disabled_notifications?
   end
 
   def is_from_auto_message_campaign?