diff options
author | ThibG <thib@sitedethib.com> | 2019-05-23 20:49:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-23 20:49:18 +0200 |
commit | c394d3cb25ad39f169fbf45d18153a51d34c43ad (patch) | |
tree | 11d01b48950d43991005ae1ba7190165edfd2c2b /app/controllers/api/v1/notifications_controller.rb | |
parent | 0744d6e57186292e751026fbb749728d56a8ed2d (diff) | |
parent | a1143a19c076c55bf97b3429796db93dd96e0812 (diff) |
Merge pull request #1065 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/notifications_controller.rb')
-rw-r--r-- | app/controllers/api/v1/notifications_controller.rb | 6 |
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 |