Merge branch 'main' into glitch-soc/merge-upstream

2022-02-12 11:12:41 +01:00
parent 28ec7def58 79b167f01a
commit d9379f5331
18 changed files with 112 additions and 13 deletions
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@ -26,6 +26,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
        mention: alerts_enabled,
        poll: alerts_enabled,
        status: alerts_enabled,
+        update: alerts_enabled,
      },
    }

@ -61,6 +62,15 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
  end

  def data_params
-    @data_params ||= params.require(:data).permit(:policy, alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll, :status])
+    @data_params ||= params.require(:data).permit(:policy, alerts: [
+      :follow,
+      :follow_request,
+      :favourite,
+      :reblog,
+      :mention,
+      :poll,
+      :status,
+      :update,
+    ])
  end
 end