From f40c6dbc9325eac1d75959b4b78666efdb82a735 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Thu, 15 Aug 2019 23:22:43 -0500 Subject: handle custom cws when a filter has the `entire thread` option set --- app/serializers/rest/status_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/serializers/rest') 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 -- cgit