From e573bb0990ece4b1a521ccf8a4c7bec5972d3538 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 30 Mar 2018 15:44:54 +0200
Subject: [PATCH] Fix compatibility with PeerTube (#6968)

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

* Ignore invalid hashtags
---
 app/lib/activitypub/activity/create.rb | 2 ++
 app/services/fetch_atom_service.rb     | 6 +++++-
 app/services/resolve_url_service.rb    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index afee8a268a..45c0e91cb0 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -79,6 +79,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     hashtag = Tag.where(name: hashtag).first_or_initialize(name: hashtag)
 
     status.tags << hashtag
+  rescue ActiveRecord::RecordInvalid
+    nil
   end
 
   def process_mention(tag, status)
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index 62dea8298a..87076cc077 100644
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -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)
 
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb
index 1f2b24524a..9499dc286e 100644
--- a/app/services/resolve_url_service.rb
+++ b/app/services/resolve_url_service.rb
@@ -19,7 +19,7 @@ class ResolveURLService < BaseService
     case type
     when 'Person'
       FetchRemoteAccountService.new.call(atom_url, body, protocol)
-    when 'Note'
+    when 'Note', 'Article', 'Image', 'Video'
       FetchRemoteStatusService.new.call(atom_url, body, protocol)
     end
   end