post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix: #416 フィルターでhalf_warnを指定した時の代替値指定ミス (#423)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-01-05 09:07:48 +09:00 • committed by GitHub
parent 98753287ac
commit 2c5c068365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/rest/filter_serializer.rb
View file

@ -14,7 +14,7 @@ class REST::FilterSerializer < ActiveModel::Serializer
end end
def filter_action def filter_action
return :hide if object.half_warn_action? return :warn if object.half_warn_action?
object.filter_action object.filter_action
end end

2
streaming/index.js
View file

@ -837,7 +837,7 @@ const startServer = async () => {
// representing a value in an enum defined by Ruby on Rails: // representing a value in an enum defined by Ruby on Rails:
// //
// enum { warn: 0, hide: 1, half_warn: 2 } // 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], filter_action_ex: ['warn', 'hide', 'half_warn'][filter.filter_action],
with_quote: filter.with_quote, with_quote: filter.with_quote,
excludeFollows: filter.exclude_follows, excludeFollows: filter.exclude_follows,