diff options
author | ThibG <thib@sitedethib.com> | 2018-08-21 19:54:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 19:54:21 +0200 |
commit | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (patch) | |
tree | 51f194442d2ec7ab760b443b98c7685f64481ca7 /app/models/notification.rb | |
parent | c78918162642649ce294d89effbf2e815c2aa327 (diff) | |
parent | 8b4abaa90d8dff64525d92c3ba1c750356608240 (diff) |
Merge pull request #660 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/notification.rb')
-rw-r--r-- | app/models/notification.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb index 4f6ec8e8e..b9bec0808 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -39,8 +39,6 @@ class Notification < ApplicationRecord validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] } validates :activity_type, inclusion: { in: TYPE_CLASS_MAP.values } - scope :cache_ids, -> { select(:id, :updated_at, :activity_type, :activity_id) } - scope :browserable, ->(exclude_types = []) { types = TYPE_CLASS_MAP.values - activity_types_from_types(exclude_types + [:follow_request]) where(activity_type: types) @@ -68,6 +66,10 @@ class Notification < ApplicationRecord end class << self + def cache_ids + select(:id, :updated_at, :activity_type, :activity_id) + end + def reload_stale_associations!(cached_items) account_ids = (cached_items.map(&:from_account_id) + cached_items.map { |item| item.target_status&.account_id }.compact).uniq |