about summary refs log tree commit diff
path: root/app/controllers/api/v1/push
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-12-01 17:25:29 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-12-01 17:25:29 +0100
commit911cc144815babf83ddf99f2daa3682021d401b8 (patch)
tree89aea40737437ba1d2e89bb86472d54217d12256 /app/controllers/api/v1/push
parentf60cd97638c9de9cbc4714cfbc87a321324fe9ff (diff)
Add follow_request notification type (#12198)
* Add follow_request notification type

The notification type already existed in the backend but was never pushed
to the front-end. This also means translation strings were also available
for the backend, from the notification mailer.

Unlike other notification types, these are off by default, to match what
I remember of Gargron's view on the topic: that follow requests should not
clutter notifications and should instead be reviewed at the user's own
leisure in the dedicated column.

Since follow requests have their own column, I've deemed it unnecessary to
add a specific tab for them in the notification quick filter.

* Show follow request link in single-column if there are pending requests, even if account isn't locked

* Push follow requests from notifications to the follow_requests list

* Offer to accept or reject follow request from the notification

* Redesign follow request notification
Diffstat (limited to 'app/controllers/api/v1/push')
-rw-r--r--app/controllers/api/v1/push/subscriptions_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index 1b658f870..1cbc92b93 100644
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -51,6 +51,6 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
 
   def data_params
     return {} if params[:data].blank?
-    params.require(:data).permit(alerts: [:follow, :favourite, :reblog, :mention, :poll])
+    params.require(:data).permit(alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll])
   end
 end