diff options
author | Starfall <us@starfall.systems> | 2020-07-23 16:25:17 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2020-07-23 16:25:17 -0500 |
commit | e3d96a9bc62f57d60dc21906b4b803e346b0a738 (patch) | |
tree | 7506b93ec2c20bf068f2b57c31d0a05e0485aed5 /app/lib/activitypub | |
parent | 57c448d9e2d71be819552092dd4688488152776c (diff) |
Revert "[Federation] Dereference object URIs in Create and Update messages"
This reverts commit 57c448d9e2d71be819552092dd4688488152776c. Implementation was merged upstream; removing the duplicate change.
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r-- | app/lib/activitypub/activity.rb | 32 | ||||
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 | ||||
-rw-r--r-- | app/lib/activitypub/activity/update.rb | 2 |
3 files changed, 0 insertions, 36 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index d6e17ba5d..0ce279d28 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -157,38 +157,6 @@ class ActivityPub::Activity fetch_remote_original_status end - def dereference_object! - return unless @object.is_a?(String) && object_uri.start_with?('https://', 'http://') - return if ActivityPub::TagManager.instance.local_uri?(object_uri) - - object = fetch_resource(@object, true, signed_fetch_account) - return unless object.present? && object.is_a?(Hash) && supported_context?(object) && equals_or_includes_any?(object['type'], SUPPORTED_TYPES + CONVERTED_TYPES) - - actor_id = value_or_id(first_of_value(object['attributedTo'])) - return if actor_id.nil? || object['id'].nil? - return unless Addressable::URI.parse(object['id']).normalized_host.casecmp(Addressable::URI.parse(actor_id).normalized_host).zero? - - @object = object - end - - def signed_fetch_account - first_mentioned_local_account || first_local_follower - end - - def first_mentioned_local_account - audience = (as_array(@json['to']) + as_array(@json['cc'])).uniq - local_usernames = audience.select { |uri| ActivityPub::TagManager.instance.local_uri?(uri) } - .map { |uri| ActivityPub::TagManager.instance.uri_to_local_id(uri, :username) } - - return if local_usernames.empty? - - Account.local.where(username: local_usernames).first - end - - def first_local_follower - @account.followers.local.first - end - def follow_request_from_object @follow_request ||= FollowRequest.find_by(target_account: @account, uri: object_uri) unless object_uri.nil? end diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 08dd98e94..e81452e3c 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -2,8 +2,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def perform - dereference_object! - case @object['type'] when 'EncryptedMessage' create_encrypted_message diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb index 018e2df54..70035325b 100644 --- a/app/lib/activitypub/activity/update.rb +++ b/app/lib/activitypub/activity/update.rb @@ -4,8 +4,6 @@ class ActivityPub::Activity::Update < ActivityPub::Activity SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze def perform - dereference_object! - if equals_or_includes_any?(@object['type'], SUPPORTED_TYPES) update_account elsif equals_or_includes_any?(@object['type'], %w(Question)) |