From e56e3d187f8ddd3db72fc90c5d200f552d5c1c04 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Thu, 17 Sep 2020 12:05:45 -0500 Subject: [Filters] Merge thread muting and hiding into a single action --- app/serializers/rest/status_serializer.rb | 9 --------- 1 file changed, 9 deletions(-) (limited to 'app/serializers') diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index c172a37af..39d812185 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -22,7 +22,6 @@ class REST::StatusSerializer < ActiveModel::Serializer attribute :published if :local? attribute :hidden, if: :current_user? - attribute :conversation_hidden, if: :current_user? attribute :notify, if: :locally_owned? attribute :title?, key: :article attribute :article_content, if: :title? @@ -140,14 +139,6 @@ class REST::StatusSerializer < ActiveModel::Serializer end end - def conversation_hidden - if instance_options && instance_options[:relationships] - instance_options[:relationships].hidden_conversations_map[object.conversation_id] || false - else - current_user.account.hiding_conversation?(object.conversation) - end - end - def hidden if instance_options && instance_options[:relationships] instance_options[:relationships].hidden_statuses_map[object.id] || false -- cgit