Fix: 一部サーバーの投稿が参照引用できない問題・参照引用時、フェッチを基本しないよう変更
This commit is contained in:
parent
acdf1ef2c9
commit
7b847f4eb3
7 changed files with 105 additions and 11 deletions
|
@ -6,16 +6,15 @@ class ResolveURLService < BaseService
|
|||
|
||||
USERNAME_STATUS_RE = %r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}
|
||||
|
||||
def call(url, on_behalf_of: nil, fetch_remote: true, local_only: false)
|
||||
def call(url, on_behalf_of: nil)
|
||||
@url = url
|
||||
@on_behalf_of = on_behalf_of
|
||||
@fetch_remote = fetch_remote
|
||||
|
||||
if local_url?
|
||||
process_local_url
|
||||
elsif !local_only && fetch_remote && !fetched_resource.nil?
|
||||
elsif !fetched_resource.nil?
|
||||
process_url
|
||||
elsif !local_only
|
||||
else
|
||||
process_url_from_db
|
||||
end
|
||||
end
|
||||
|
@ -38,7 +37,7 @@ class ResolveURLService < BaseService
|
|||
return account unless account.nil?
|
||||
end
|
||||
|
||||
return unless @on_behalf_of.present? && (!@fetch_remote || [401, 403, 404].include?(fetch_resource_service.response_code))
|
||||
return unless @on_behalf_of.present? && [401, 403, 404].include?(fetch_resource_service.response_code)
|
||||
|
||||
# It may happen that the resource is a private toot, and thus not fetchable,
|
||||
# but we can return the toot if we already know about it.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue