techhub/mastodon
2
0
Fork 0
Code Activity

Use Tombstone and _:atomUri in Delete activities as fallback (#4704)

Browse Source
This commit is contained in:
Eugen Rochko
2017-08-26 16:10:35 +02:00
committed by GitHub
parent 2a2698e450
commit 884b085f53
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/lib/activitypub/activity/delete.rb
View File

@@ -2,7 +2,8 @@
class ActivityPub::Activity::Delete < ActivityPub::Activity
def perform
status = Status.find_by(uri: object_uri, account: @account)
status = Status.find_by(uri: object_uri, account: @account)
status ||= Status.find_by(uri: @object['_:atomUri'], account: @account) if @object.is_a?(Hash) && @object['_:atomUri'].present?
if status.nil?
delete_later!(object_uri)