diff options
| author | Paul Woolcock <paul@woolcock.us> | 2019-05-21 07:28:49 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-21 13:28:49 +0200 |
| commit | 0c933c1b8ca18d5856ee4b24cee1744f1137c516 (patch) | |
| tree | ff632c7f62490fff4fb5f1848bc3530be57e0a42 /app/models | |
| parent | 4d65740663bf7c4a14318bd35f62ccfa52ac6a02 (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/models')
| -rw-r--r-- | app/models/notification.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb index 300269e24..498673ff1 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -41,9 +41,13 @@ class Notification < ApplicationRecord validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] } validates :activity_type, inclusion: { in: TYPE_CLASS_MAP.values } - scope :browserable, ->(exclude_types = []) { + scope :browserable, ->(exclude_types = [], account_id = nil) { types = TYPE_CLASS_MAP.values - activity_types_from_types(exclude_types + [:follow_request]) - where(activity_type: types) + if account_id.nil? + where(activity_type: types) + else + where(activity_type: types, from_account_id: account_id) + end } cache_associated :from_account, status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account, poll: [status: STATUS_INCLUDES] |