tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2017-11-19 15:17:12 +00:00
parent e45cb0837b 2bcc81700c
commit a36a2c1796
3 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/notification.rb
View File

@@ -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

2
app/services/activitypub/fetch_remote_status_service.rb
View File

@@ -18,7 +18,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id, id: true) if actor.nil? || needs_update(actor)
return if actor.suspended?
return if actor.nil? || actor.suspended?
ActivityPub::Activity.factory(activity_json, actor).perform
end