diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-04 11:07:01 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-04 11:07:01 -0600 |
| commit | d9800a5647cbc57db7679094b2271f8eb5ec328b (patch) | |
| tree | f9210c465de5f9d80e294d9ffa8536f98f9c466e /app/models/notification.rb | |
| parent | 1c74ede69e7a9916c19da6f05daa215231eba81c (diff) | |
| parent | f2f2f1032082d6212771bd0307136484f671d37e (diff) | |
Merge branch 'gs-master' into glitch-theme
Diffstat (limited to 'app/models/notification.rb')
| -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 |