|
@@ -2,8 +2,8 @@
|
|
|
|
|
|
class ActivityPub::Activity::Announce < ActivityPub::Activity
|
|
|
def perform
|
|
|
- original_status = status_from_uri(object_uri)
|
|
|
- original_status = ActivityPub::FetchRemoteStatusService.new.call(object_uri) if original_status.nil?
|
|
|
+ original_status = status_from_uri(object_uri)
|
|
|
+ original_status ||= fetch_remote_original_status
|
|
|
|
|
|
return if original_status.nil? || delete_arrived_first?(@json['id'])
|
|
|
|
|
@@ -11,4 +11,14 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
|
|
|
distribute(status)
|
|
|
status
|
|
|
end
|
|
|
+
|
|
|
+ private
|
|
|
+
|
|
|
+ def fetch_remote_original_status
|
|
|
+ if object_uri.start_with?('http')
|
|
|
+ ActivityPub::FetchRemoteStatusService.new.call(object_uri)
|
|
|
+ elsif @object['url'].present?
|
|
|
+ ::FetchRemoteStatusService.new.call(@object['url'])
|
|
|
+ end
|
|
|
+ end
|
|
|
end
|