luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 00:05:20 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity/create.rb
View file

@ -79,6 +79,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
hashtag = Tag.where(name: hashtag).first_or_initialize(name: hashtag) hashtag = Tag.where(name: hashtag).first_or_initialize(name: hashtag)
status.tags << hashtag status.tags << hashtag
rescue ActiveRecord::RecordInvalid
nil
end end
def process_mention(tag, status) def process_mention(tag, status)

6
app/services/fetch_atom_service.rb
View file

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

2
app/services/resolve_url_service.rb
View file

@ -19,7 +19,7 @@ class ResolveURLService < BaseService
case type case type
when 'Person' when 'Person'
FetchRemoteAccountService.new.call(atom_url, body, protocol) FetchRemoteAccountService.new.call(atom_url, body, protocol)
when 'Note' when 'Note', 'Article', 'Image', 'Video'
FetchRemoteStatusService.new.call(atom_url, body, protocol) FetchRemoteStatusService.new.call(atom_url, body, protocol)
end end
end end