1 files changed, 31 insertions, 12 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b066cd87a..9d076ad41 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -5,6 +5,7 @@ class Notification < ApplicationRecord
   include Cacheable
 
   belongs_to :account
+  belongs_to :from_account, class_name: 'Account'
   belongs_to :activity, polymorphic: true
 
   belongs_to :mention,   foreign_type: 'Mention',   foreign_key: 'activity_id'
@@ -16,10 +17,12 @@ class Notification < ApplicationRecord
 
   STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :media_attachments, :tags, mentions: :account]].freeze
 
-  cache_associated status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account
+  scope :cache_ids, -> { select(:id, :updated_at, :activity_type, :activity_id) }
 
-  def activity
-    send(activity_type.downcase)
+  cache_associated :from_account, status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account
+
+  def activity(eager_loaded = true)
+    eager_loaded ? send(activity_type.downcase) : super
   end
 
   def type
@@ -31,15 +34,6 @@ class Notification < ApplicationRecord
     end
   end
 
-  def from_account
-    case type
-    when :mention
-      activity.status.account
-    when :follow, :favourite, :reblog
-      activity.account
-    end
-  end
-
   def target_status
     case type
     when :reblog
@@ -48,4 +42,29 @@ class Notification < ApplicationRecord
       activity.status
     end
   end
+
+  class << self
+    def reload_stale_associations!(cached_items)
+      account_ids = cached_items.map(&:from_account_id).uniq
+      accounts    = Account.where(id: account_ids).map { |a| [a.id, a] }.to_h
+
+      cached_items.each do |item|
+        item.from_account = accounts[item.from_account_id]
+      end
+    end
+  end
+
+  after_initialize :set_from_account
+  before_validation :set_from_account
+
+  private
+
+  def set_from_account
+    case activity_type
+    when 'Status', 'Follow', 'Favourite'
+      self.from_account_id = activity(false)&.account_id
+    when 'Mention'
+      self.from_account_id = activity(false)&.status&.account_id
+    end
+  end
 end