Push notification levels

app/controllers/notifications/settings_controller.rb

@@ -16,6 +16,6 @@ def set_settings
     end
 
     def settings_params
-      params.expect(user_settings: :bundle_email_frequency)
+      params.expect(user_settings: [ :bundle_email_frequency, :push_notification_level ])
     end
 end

app/helpers/notifications_helper.rb

@@ -76,6 +76,14 @@ def bundle_email_frequency_options_for(settings)
     ], settings.bundle_email_frequency)
   end
 
+  def push_notification_level_options_for(settings)
+    options_for_select([
+      [ "All activity", "all_activity" ],
+      [ "Comments and @mentions", "comments_and_mentions" ],
+      [ "Only @mentions", "only_mentions" ]
+    ], settings.push_notification_level)
+  end
+
   private
     def event_notification_action(event)
       if event.action.card_published? && event.eventable.assigned_to?(event.creator)

app/models/notification/pushable.rb

@@ -29,6 +29,7 @@ def push_later
 
   def push
     return unless pushable?
+    return unless user.settings.push_notification_enabled_for?(self)
 
     self.class.push_targets.each { |target| push_to(target) }
   end

app/models/user/settings.rb

@@ -4,6 +4,8 @@ class User::Settings < ApplicationRecord
 
   enum :bundle_email_frequency, %i[ never every_few_hours daily weekly ],
     default: :every_few_hours, prefix: :bundle_email
+  enum :push_notification_level, %i[ all_activity comments_and_mentions only_mentions ],
+    default: :all_activity, prefix: :push_notifications
 
   after_update :review_pending_bundles, if: :saved_change_to_bundle_email_frequency?
 
@@ -24,6 +26,14 @@ def bundling_emails?
     !bundle_email_never? && !user.system? && user.active? && user.verified?
   end
 
+  def push_notification_enabled_for?(notification)
+    return true if push_notifications_all_activity?
+    return true if notification.source_type == "Mention"
+    return false if push_notifications_only_mentions?
+
+    comment_notification?(notification)
+  end
+
   def timezone
     if timezone_name.present?
       ActiveSupport::TimeZone[timezone_name] || default_timezone
@@ -54,4 +64,8 @@ def flush_pending_bundles
     def default_timezone
       ActiveSupport::TimeZone["UTC"]
     end
+
+    def comment_notification?(notification)
+      notification.source_type == "Event" && notification.source.action.comment_created?
+    end
 end

app/views/notifications/settings/_push_notifications.html.erb → app/views/notifications/settings/_browser_push_notifications.html.erb

@@ -1,7 +1,7 @@
 <section class="notifications__status settings__section panel fill-shade center hide-on-native" data-controller="notifications" data-notifications-subscriptions-url-value="<%= user_push_subscriptions_path(Current.user) %>" data-notifications-enabled-class="notifications--on">
   <heading>
     <h2 class="txt-medium">
-      Push notifications are
+      Browser notifications are
       <span class="notifications__on-message">ON</span>
       <span class="notifications__off-message">OFF</span>
     </h2>

app/views/notifications/settings/_push_notification_level.html.erb

@@ -0,0 +1,14 @@
+<section class="settings__section">
+  <heading>
+    <h2 class="divider">Push Notifications</h2>
+    <div>Notifications are sent to your registered devices.</div>
+  </heading>
+
+  <%= form_with model: settings, url: notifications_settings_path,
+      method: :patch, local: true, data: { controller: "form" } do |form| %>
+    <div class="margin-block-end-half"><strong><%= form.label :push_notification_level, "Send push notifications for..." %></strong></div>
+    <%= form.select :push_notification_level, push_notification_level_options_for(settings), {}, class: "input input--select txt-align-center", data: { action: "change->form#submit" } %>
+  <% end %>
+
+  <%= render "notifications/settings/native_devices" if Fizzy.saas? %>
+</section>

app/views/notifications/settings/show.html.erb

@@ -15,8 +15,8 @@
   </div>
 
   <div class="settings__panel panel shadow">
-    <%= render "notifications/settings/push_notifications" %>
-    <%= render "notifications/settings/native_devices" if Fizzy.saas? %>
+    <%= render "notifications/settings/push_notification_level", settings: @settings %>
+    <%= render "notifications/settings/browser_push_notifications" %>
     <%= render "notifications/settings/email", settings: @settings %>
   </div>
 </section>

db/migrate/20260303100000_add_push_notification_level_to_user_settings.rb

@@ -0,0 +1,5 @@
+class AddPushNotificationLevelToUserSettings < ActiveRecord::Migration[8.2]
+  def change
+    add_column :user_settings, :push_notification_level, :integer, default: 0, null: false
+  end
+end

db/schema_sqlite.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.2].define(version: 2026_02_18_120000) do
+ActiveRecord::Schema[8.2].define(version: 2026_03_03_100000) do
   create_table "accesses", id: :uuid, force: :cascade do |t|
     t.datetime "accessed_at"
     t.uuid "account_id", null: false
@@ -539,6 +539,7 @@
     t.uuid "account_id", null: false
     t.integer "bundle_email_frequency", default: 0, null: false
     t.datetime "created_at", null: false
+    t.integer "push_notification_level", default: 0, null: false
     t.string "timezone_name", limit: 255
     t.datetime "updated_at", null: false
     t.uuid "user_id", null: false

test/controllers/notifications/settings_controller_test.rb

@@ -21,4 +21,13 @@ class Notifications::SettingsControllerTest < ActionDispatch::IntegrationTest
     assert_redirected_to notifications_settings_path
     assert_equal "Settings updated", flash[:notice]
   end
+
+  test "update push notification level" do
+    assert_changes -> { @user.reload.settings.push_notification_level }, from: "all_activity", to: "only_mentions" do
+      put notifications_settings_path, params: { user_settings: { push_notification_level: "only_mentions" } }
+    end
+
+    assert_redirected_to notifications_settings_path
+    assert_equal "Settings updated", flash[:notice]
+  end
 end

test/models/notification/pushable_test.rb

@@ -94,4 +94,34 @@ class Notification::PushableTest < ActiveSupport::TestCase
   ensure
     Notification.push_targets = original_targets
   end
+
+  test "push skips targets when push notification level excludes notification type" do
+    notification = notifications(:layout_commented_kevin)
+    notification.user.settings.update!(push_notification_level: :only_mentions)
+
+    target_class = mock("push_target_class")
+    target_class.expects(:process).never
+
+    original_targets = Notification.push_targets
+    Notification.push_targets = [ target_class ]
+
+    notification.push
+  ensure
+    Notification.push_targets = original_targets
+  end
+
+  test "push processes targets when push notification level allows notification type" do
+    notification = notifications(:layout_commented_kevin)
+    notification.user.settings.update!(push_notification_level: :comments_and_mentions)
+
+    target_class = mock("push_target_class")
+    target_class.expects(:process).with(notification)
+
+    original_targets = Notification.push_targets
+    Notification.push_targets = [ target_class ]
+
+    notification.push
+  ensure
+    Notification.push_targets = original_targets
+  end
 end

test/models/user/settings_test.rb

@@ -54,4 +54,28 @@ class User::SettingsTest < ActiveSupport::TestCase
     @user.update_column(:verified_at, nil)
     assert_not @user.settings.bundling_emails?, "Unverified users should not receive bundled emails"
   end
+
+  test "push_notification_enabled_for? with only_mentions" do
+    @settings.update!(push_notification_level: :only_mentions)
+
+    assert @settings.push_notification_enabled_for?(notifications(:logo_mentioned_david))
+    assert_not @settings.push_notification_enabled_for?(notifications(:logo_assignment_kevin))
+    assert_not @settings.push_notification_enabled_for?(notifications(:layout_commented_kevin))
+  end
+
+  test "push_notification_enabled_for? with comments_and_mentions" do
+    @settings.update!(push_notification_level: :comments_and_mentions)
+
+    assert @settings.push_notification_enabled_for?(notifications(:logo_mentioned_david))
+    assert @settings.push_notification_enabled_for?(notifications(:layout_commented_kevin))
+    assert_not @settings.push_notification_enabled_for?(notifications(:logo_assignment_kevin))
+  end
+
+  test "push_notification_enabled_for? with all_activity" do
+    @settings.update!(push_notification_level: :all_activity)
+
+    assert @settings.push_notification_enabled_for?(notifications(:logo_mentioned_david))
+    assert @settings.push_notification_enabled_for?(notifications(:layout_commented_kevin))
+    assert @settings.push_notification_enabled_for?(notifications(:logo_assignment_kevin))
+  end
 end