about summary refs log tree commit diff
path: root/app/controllers/api
diff options
context:
space:
mode:
authorPaul Woolcock <paul@woolcock.us>2019-05-21 07:28:49 -0400
committermultiple creatures <dev@multiple-creature.party>2019-11-19 13:20:27 -0600
commitecbcebb917da2171acd81c8edac6f93c30fefed2 (patch)
tree5cd91ba2a7542fd5ec484968ffbe311dfa782e5b /app/controllers/api
parent98d4ac4eee16b660f84150228e8ffbe128180730 (diff)
Add `account_id` param to `GET /api/v1/notifications` (#10796)
* Add `from_account` to notifications API

this adds the ability to filter notifications by the account they
originated from

* passing a non-existent user should cause none to be returned

* Fix codeclimate warnings

* fix more codeclimate warnings

* make requested changes:

* use account id instead of user@domain
* name the param `account_id` instead of `from_account`

* Don't use `return` in a lambda
Diffstat (limited to 'app/controllers/api')
-rw-r--r--app/controllers/api/v1/notifications_controller.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 3b492c516..c91753ae7 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -53,7 +53,7 @@ class Api::V1::NotificationsController < Api::BaseController
   end
 
   def browserable_account_notifications
-    current_account.notifications.browserable(exclude_types)
+    current_account.notifications.browserable(exclude_types, from_account)
   end
 
   def target_statuses_from_notifications
@@ -90,6 +90,10 @@ class Api::V1::NotificationsController < Api::BaseController
     val
   end
 
+  def from_account
+    params[:account_id]
+  end
+
   def pagination_params(core_params)
     params.slice(:limit, :exclude_types).permit(:limit, exclude_types: []).merge(core_params)
   end