luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 13:17:13 +00:00
Code Issues Projects Releases Wiki Activity

When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196)

Browse source
This commit is contained in:
ThibG 2018-01-05 22:42:50 +01:00 committed by Eugen Rochko
parent 95bd85d9e8
commit a594139115
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/fetch_atom_service.rb
View file

@ -46,6 +46,8 @@ class FetchAtomService < BaseService
json = body_to_json(@response.to_s) json = body_to_json(@response.to_s)
if supported_context?(json) && json['type'] == 'Person' && json['inbox'].present? if supported_context?(json) && json['type'] == 'Person' && json['inbox'].present?
[json['id'], { prefetched_body: @response.to_s, id: true }, :activitypub] [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 else
@unsupported_activity = true @unsupported_activity = true
nil nil