From 2c5c0683656c3d965fcf9eb7bd82e1cbd694e3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Fri, 5 Jan 2024 09:07:48 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20#416=20=E3=83=95=E3=82=A3=E3=83=AB?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=81=A7half=5Fwarn=E3=82=92=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=97=E3=81=9F=E6=99=82=E3=81=AE=E4=BB=A3=E6=9B=BF?= =?UTF-8?q?=E5=80=A4=E6=8C=87=E5=AE=9A=E3=83=9F=E3=82=B9=20(#423)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/serializers/rest/filter_serializer.rb | 2 +- streaming/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/serializers/rest/filter_serializer.rb b/app/serializers/rest/filter_serializer.rb index 2750b81417..e4deae9d3d 100644 --- a/app/serializers/rest/filter_serializer.rb +++ b/app/serializers/rest/filter_serializer.rb @@ -14,7 +14,7 @@ class REST::FilterSerializer < ActiveModel::Serializer end def filter_action - return :hide if object.half_warn_action? + return :warn if object.half_warn_action? object.filter_action end diff --git a/streaming/index.js b/streaming/index.js index 5804ad3070..aaf37534fc 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -837,7 +837,7 @@ const startServer = async () => { // representing a value in an enum defined by Ruby on Rails: // // enum { warn: 0, hide: 1, half_warn: 2 } - filter_action: ['warn', 'hide', 'half_warn'][Math.min(filter.filter_action, 1)], + filter_action: filter.filter_action === 2 ? 'warn' : ['warn', 'hide', 'half_warn'][filter.filter_action], filter_action_ex: ['warn', 'hide', 'half_warn'][filter.filter_action], with_quote: filter.with_quote, excludeFollows: filter.exclude_follows,