autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compatibility with PeerTube (#6968)

Browse Source 
* Support fetching objects of convertible types by URL (fixes #6924)

* Ignore invalid hashtags
This commit is contained in:
ThibG
2018-03-30 15:44:54 +02:00
committed by Eugen Rochko
parent a6c129ddbd
commit e573bb0990
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/fetch_atom_service.rb
View File

@ -44,7 +44,7 @@ class FetchAtomService < BaseService
json = body_to_json(body)
if supported_context?(json) && json['type'] == 'Person' && json['inbox'].present?
[json['id'], { prefetched_body: body, id: true }, :activitypub]
elsif supported_context?(json) && json['type'] == 'Note'
elsif supported_context?(json) && expected_type?(json)
[json['id'], { prefetched_body: body, id: true }, :activitypub]
else
@unsupported_activity = true
@ -61,6 +61,10 @@ class FetchAtomService < BaseService
end
end
def expected_type?(json)
(ActivityPub::Activity::Create::SUPPORTED_TYPES + ActivityPub::Activity::Create::CONVERTED_TYPES).include? json['type']
end
def process_html(response)
page = Nokogiri::HTML(response.body_with_limit)