sunoru/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve unknown status from Add activity, skip Remove if unknown (#7526)

Browse source 
Fix #7518
This commit is contained in:
Eugen Rochko 2018-05-18 11:33:56 +02:00 • committed by GitHub
parent dafd7afc5e
commit 57b503d4ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/lib/activitypub/activity/add.rb
View file

@ -4,9 +4,10 @@ class ActivityPub::Activity::Add < ActivityPub::Activity
def perform
return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url
status = status_from_uri(object_uri)
status = status_from_uri(object_uri)
status ||= fetch_remote_original_status
return unless status.account_id == @account.id && !@account.pinned?(status)
return unless !status.nil? && status.account_id == @account.id && !@account.pinned?(status)
StatusPin.create!(account: @account, status: status)
end