tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove instance variables from helper usage (#24203)

Browse Source
This commit is contained in:
Matt Jankowski
2023-04-23 16:35:54 -04:00
committed by GitHub
parent e1b4eeb636
commit 0a5f0a8b20
19 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/activitypub/fetch_featured_collection_service.rb
View File

@@ -31,7 +31,7 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
def fetch_collection(collection_or_uri)
return collection_or_uri if collection_or_uri.is_a?(Hash)
return if invalid_origin?(collection_or_uri)
return if non_matching_uri_hosts?(@account.uri, collection_or_uri)
fetch_resource_without_id_validation(collection_or_uri, local_follower, true)
end
@@ -46,7 +46,7 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
next unless item.is_a?(String) || item['type'] == 'Note'
uri = value_or_id(item)
next if ActivityPub::TagManager.instance.local_uri?(uri) || invalid_origin?(uri)
next if ActivityPub::TagManager.instance.local_uri?(uri) || non_matching_uri_hosts?(@account.uri, uri)
status = ActivityPub::FetchRemoteStatusService.new.call(uri, on_behalf_of: local_follower, expected_actor_uri: @account.uri, request_id: @options[:request_id])
next unless status&.account_id == @account.id