他サーバーからきた投稿の参照を同期的に取得
This commit is contained in:
parent
72f3f95221
commit
c4568be616
3 changed files with 10 additions and 2 deletions
|
@ -486,7 +486,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
||||||
def process_references!
|
def process_references!
|
||||||
references = @object['references'].nil? ? [] : ActivityPub::FetchReferencesService.new.call(@status, @object['references'])
|
references = @object['references'].nil? ? [] : ActivityPub::FetchReferencesService.new.call(@status, @object['references'])
|
||||||
|
|
||||||
ProcessReferencesService.perform_worker_async(@status, [], references, [quote].compact)
|
ProcessReferencesService.call_service_without_error(@status, [], references, [quote].compact)
|
||||||
end
|
end
|
||||||
|
|
||||||
def quote_local?
|
def quote_local?
|
||||||
|
|
|
@ -255,7 +255,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
|
||||||
references = @json['references'].nil? ? [] : ActivityPub::FetchReferencesService.new.call(@status, @json['references'])
|
references = @json['references'].nil? ? [] : ActivityPub::FetchReferencesService.new.call(@status, @json['references'])
|
||||||
quote = @json['quote'] || @json['quoteUrl'] || @json['quoteURL'] || @json['_misskey_quote']
|
quote = @json['quote'] || @json['quoteUrl'] || @json['quoteURL'] || @json['_misskey_quote']
|
||||||
|
|
||||||
ProcessReferencesService.perform_worker_async(@status, [], references, [quote].compact)
|
ProcessReferencesService.call_service_without_error(@status, [], references, [quote].compact)
|
||||||
end
|
end
|
||||||
|
|
||||||
def expected_type?
|
def expected_type?
|
||||||
|
|
|
@ -58,6 +58,14 @@ class ProcessReferencesService < BaseService
|
||||||
ProcessReferencesService.new.call(status, reference_parameters || [], urls: urls || [], fetch_remote: false, quote_urls: quote_urls)
|
ProcessReferencesService.new.call(status, reference_parameters || [], urls: urls || [], fetch_remote: false, quote_urls: quote_urls)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.call_service_without_error(status, reference_parameters, urls, quote_urls = [])
|
||||||
|
begin
|
||||||
|
call_service(status, reference_parameters, urls, quote_urls)
|
||||||
|
rescue
|
||||||
|
true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def references
|
def references
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue