about summary refs log tree commit diff
path: root/app/serializers
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-08-15 23:22:43 -0500
committermultiple creatures <dev@multiple-creature.party>2019-08-15 23:22:43 -0500
commitf40c6dbc9325eac1d75959b4b78666efdb82a735 (patch)
treea1aa50696900206cac1e5e1e76a75a563c398c59 /app/serializers
parent14cf223041031731d8ee48ec0e5bef5f26868bd2 (diff)
handle custom cws when a filter has the `entire thread` option set
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/rest/status_serializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index d41d1ba43..86c63e772 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -58,7 +58,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   end
 
   def spoiler_text
-    redis.hget("custom_cw:#{current_user&.account_id}", object.id) || object.spoiler_text
+    redis.hget("custom_cw:#{current_user&.account_id}", object.id) || redis.hget("custom_cw:#{current_user&.account_id}", "c#{object.conversation_id}") || object.spoiler_text
   end
 
   def visibility