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_replies_service.rb
View File

@@ -35,7 +35,7 @@ class ActivityPub::FetchRepliesService < BaseService
def fetch_collection(collection_or_uri)
return collection_or_uri if collection_or_uri.is_a?(Hash)
return unless @allow_synchronous_requests
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, nil, true)
end
@@ -45,6 +45,6 @@ class ActivityPub::FetchRepliesService < BaseService
# amplification attacks.
# Also limit to 5 fetched replies to limit potential for DoS.
@items.map { |item| value_or_id(item) }.reject { |uri| invalid_origin?(uri) }.take(5)
@items.map { |item| value_or_id(item) }.reject { |uri| non_matching_uri_hosts?(@account.uri, uri) }.take(5)
end
end