diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-05-06 20:51:20 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:23 -0500 |
| commit | 6c374b51537126a2cba29f3eaf74faf1fc64ba96 (patch) | |
| tree | 776239f0aaf7a0abed2d09440eccbb1d6d53a7a2 /app/lib/activitypub/activity | |
| parent | 6e8ec7f0a538b5383da49c4435835b78c61da0bc (diff) | |
Drop OStatus support. Fix some of the Rspec tests.
Diffstat (limited to 'app/lib/activitypub/activity')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/delete.rb | 1 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/undo.rb | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index d52ec0e86..df735a7bf 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -47,8 +47,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def find_existing_status status = status_from_uri(object_uri) - status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present? - status end def process_status_params diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index 4236af071..bf530ac49 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -27,7 +27,6 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity end @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? return if @status.nil? diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb index 599823c6e..271f4e2b5 100644 --- a/app/lib/activitypub/activity/undo.rb +++ b/app/lib/activitypub/activity/undo.rb @@ -22,7 +22,6 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity return if object_uri.nil? 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) |