Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-05 22:17:12 +00:00
parent f41b33eb01 10f6793fd0
commit f6adb409fd
14 changed files with 69 additions and 10 deletions
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -46,6 +46,8 @@ class FetchAtomService < BaseService
      json = body_to_json(@response.to_s)
      if supported_context?(json) && json['type'] == 'Person' && json['inbox'].present?
        [json['id'], { prefetched_body: @response.to_s, id: true }, :activitypub]
+      elsif supported_context?(json) && json['type'] == 'Note'
+        [json['id'], { prefetched_body: @response.to_s, id: true }, :activitypub]
      else
        @unsupported_activity = true
        nil