about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-04-22 22:09:03 +0200
committerGitHub <noreply@github.com>2018-04-22 22:09:03 +0200
commit75c4ab9d12d3a2f3de52c51b5006fe9d5d9afae4 (patch)
tree0153790700fc3d161d57a056a7917c97ce9e0936 /app
parent4ca2f73b126de89a917680d60f40cae7f589f55f (diff)
Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048)
Fix #7011
Diffstat (limited to 'app')
-rw-r--r--app/lib/ostatus/atom_serializer.rb2
-rw-r--r--app/services/process_hashtags_service.rb2
2 files changed, 0 insertions, 4 deletions
diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
index 055b4649c..7c66f2066 100644
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -364,8 +364,6 @@ class OStatus::AtomSerializer
       append_element(entry, 'category', nil, term: tag.name)
     end
 
-    append_element(entry, 'category', nil, term: 'nsfw') if status.sensitive?
-
     status.media_attachments.each do |media|
       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
diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb
index 990e01a4b..5b45c865f 100644
--- a/app/services/process_hashtags_service.rb
+++ b/app/services/process_hashtags_service.rb
@@ -7,7 +7,5 @@ class ProcessHashtagsService < BaseService
     tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |tag|
       status.tags << Tag.where(name: tag).first_or_initialize(name: tag)
     end
-
-    status.update(sensitive: true) if tags.include?('nsfw')
   end
 end