diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-26 16:10:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 16:10:35 +0200 |
| commit | 884b085f534b02c664bcddd3a2fefcad6d4e5cc4 (patch) | |
| tree | 78adcba8be64dd9ca35fd34498c92c6c85af1bc9 /app/lib/activitypub/activity | |
| parent | 2a2698e4501094ca52b8b166c2c51fab26ce7427 (diff) | |
Use Tombstone and _:atomUri in Delete activities as fallback (#4704)
Diffstat (limited to 'app/lib/activitypub/activity')
| -rw-r--r-- | app/lib/activitypub/activity/delete.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index 23f3430fb..a1598dfd3 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -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) |