diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-19 15:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-19 15:17:12 +0000 |
| commit | a36a2c17964ee4cb3b1d6471769e765db0d9f90d (patch) | |
| tree | 8766f192e2ce8c3eac4312490bad7b33f5a2623b /app/models | |
| parent | e45cb0837bcefecfecf3ef39bbdee721a47a79fd (diff) | |
| parent | 2bcc81700c586a543e849e222c640df89da7fcb0 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/notification.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb index a3ffb1f45..976963528 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -24,7 +24,7 @@ class Notification < ApplicationRecord favourite: 'Favourite', }.freeze - STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :media_attachments, :tags, mentions: :account]].freeze + STATUS_INCLUDES = [:account, :application, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :application, :media_attachments, :tags, mentions: :account]].freeze belongs_to :account belongs_to :from_account, class_name: 'Account' @@ -55,9 +55,11 @@ class Notification < ApplicationRecord def target_status case type when :reblog - activity&.reblog - when :favourite, :mention - activity&.status + status&.reblog + when :favourite + favourite&.status + when :mention + mention&.status end end |