Browse Source

Fix handling of ActivityPub activities lacking some attributes (#8864)

pull/4/head
ThibG 5 years ago
committed by Eugen Rochko
parent
commit
ba444797d2
4 changed files with 6 additions and 2 deletions
  1. +1
    -1
      app/lib/activitypub/activity/accept.rb
  2. +2
    -0
      app/lib/activitypub/activity/delete.rb
  3. +1
    -1
      app/lib/activitypub/activity/reject.rb
  4. +2
    -0
      app/lib/activitypub/activity/undo.rb

+ 1
- 1
app/lib/activitypub/activity/accept.rb View File

@ -26,7 +26,7 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
end
def relay
@relay ||= Relay.find_by(follow_activity_id: object_uri)
@relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil?
end
def relay_follow?

+ 2
- 0
app/lib/activitypub/activity/delete.rb View File

@ -17,6 +17,8 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
end
def delete_note
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?

+ 1
- 1
app/lib/activitypub/activity/reject.rb View File

@ -28,7 +28,7 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
end
def relay
@relay ||= Relay.find_by(follow_activity_id: object_uri)
@relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil?
end
def relay_follow?

+ 2
- 0
app/lib/activitypub/activity/undo.rb View File

@ -19,6 +19,8 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
private
def undo_announce
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?

Loading…
Cancel
Save