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/models/notification.rb | |
parent | 0744d6e57186292e751026fbb749728d56a8ed2d (diff) | |
parent | a1143a19c076c55bf97b3429796db93dd96e0812 (diff) |
Merge pull request #1065 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/notification.rb')
-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] |