gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-09 05:06:14 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

oh right ruby uses double && for logical and

Browse Source
This commit is contained in:
sneakers-the-rat 2025-05-02 22:40:42 -07:00
parent dd81abf389
commit 890157170e
No known key found for this signature in database
GPG Key ID: 6DCB96EF1E4D232D
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/json_ld_helper.rb
View File

@ -232,8 +232,8 @@ module JsonLdHelper
while collection.is_a?(Hash) while collection.is_a?(Hash)
items.concat(as_array(collection_page_items(collection))) items.concat(as_array(collection_page_items(collection)))
break if !max_items.nil? & items.size >= max_items break if !max_items.nil? && items.size >= max_items
break if !max_pages.nil? & n_pages >= max_pages break if !max_pages.nil? && n_pages >= max_pages
collection = collection['next'].present? ? fetch_collection(collection['next'], reference_uri: reference_uri, on_behalf_of: on_behalf_of) : nil collection = collection['next'].present? ? fetch_collection(collection['next'], reference_uri: reference_uri, on_behalf_of: on_behalf_of) : nil
n_pages += 1 n_pages += 1
@ -264,7 +264,7 @@ module JsonLdHelper
# @return [Hash, nil] # @return [Hash, nil]
def fetch_collection(collection_or_uri, reference_uri: nil, on_behalf_of: nil) def fetch_collection(collection_or_uri, reference_uri: nil, on_behalf_of: nil)
return collection_or_uri if collection_or_uri.is_a?(Hash) return collection_or_uri if collection_or_uri.is_a?(Hash)
return if !reference_uri.nil? & non_matching_uri_hosts?(reference_uri, collection_or_uri) return if !reference_uri.nil? && non_matching_uri_hosts?(reference_uri, collection_or_uri)
# NOTE: For backward compatibility reasons, Mastodon signs outgoing # NOTE: For backward compatibility reasons, Mastodon signs outgoing
# queries incorrectly by default. # queries incorrectly by default.

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

@ -8,11 +8,11 @@ class ActivityPub::FetchRepliesService < BaseService
def call(reference_uri, collection_or_uri, max_pages: 1, allow_synchronous_requests: true, request_id: nil) def call(reference_uri, collection_or_uri, max_pages: 1, allow_synchronous_requests: true, request_id: nil)
@reference_uri = reference_uri @reference_uri = reference_uri
return if !allow_synchronous_requests & !collection_or_uri.is_a?(Hash) return if !allow_synchronous_requests && !collection_or_uri.is_a?(Hash)
# if given a prefetched collection while forbidding synchronous requests, # if given a prefetched collection while forbidding synchronous requests,
# process it and return without fetching additional pages # process it and return without fetching additional pages
max_pages = 1 if !allow_synchronous_requests & collection_or_uri.is_a?(Hash) max_pages = 1 if !allow_synchronous_requests && collection_or_uri.is_a?(Hash)
@items, n_pages = collection_items(collection_or_uri, max_pages: max_pages, max_items: MAX_REPLIES, reference_uri: @reference_uri) @items, n_pages = collection_items(collection_or_uri, max_pages: max_pages, max_items: MAX_REPLIES, reference_uri: @reference_uri)
return if @items.nil? return if @items.nil?