diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
commit | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (patch) | |
tree | a3bb67479db79ca9777cf2d6c1b767ad0f0f53d2 /app/models/notification.rb | |
parent | 3405ea6dd9fde38ba1044933fec2ec7fa909ea8c (diff) | |
parent | 1167c6dbf8d5b8411d9924350b2b9735da6d9d26 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/notification.rb')
-rw-r--r-- | app/models/notification.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb index 733f89cf7..7f8dae5ec 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -69,7 +69,7 @@ class Notification < ApplicationRecord class << self def reload_stale_associations!(cached_items) - account_ids = cached_items.map(&:from_account_id).uniq + account_ids = (cached_items.map(&:from_account_id) + cached_items.map { |item| item.target_status&.account_id }.compact).uniq return if account_ids.empty? @@ -77,6 +77,7 @@ class Notification < ApplicationRecord cached_items.each do |item| item.from_account = accounts[item.from_account_id] + item.target_status.account = accounts[item.target_status.account_id] if item.target_status end end |