about summary refs log tree commit diff
path: root/app/lib/ostatus/atom_serializer.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-09 17:43:30 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-10 00:03:28 +0200
commit1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch)
treeccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /app/lib/ostatus/atom_serializer.rb
parent143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff)
parentac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff)
Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
Diffstat (limited to 'app/lib/ostatus/atom_serializer.rb')
-rw-r--r--app/lib/ostatus/atom_serializer.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
index 7c66f2066..698f2ee22 100644
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -368,6 +368,7 @@ class OStatus::AtomSerializer
       append_element(entry, 'link', nil, rel: :enclosure, type: media.file_content_type, length: media.file_file_size, href: full_asset_url(media.file.url(:original, false)))
     end
 
+    append_element(entry, 'category', nil, term: 'nsfw') if status.sensitive? && status.media_attachments.any?
     append_element(entry, 'mastodon:scope', status.visibility)
 
     status.emojis.each do |emoji|