* Remove: #955 フィルターのアクション`half_warn` * Add: 「フィルター対象投稿の投稿者名やアイコンを表示する」設定 * Fix test
This commit is contained in:
parent
22bf14e9f0
commit
67064de265
19 changed files with 49 additions and 45 deletions
|
@ -123,6 +123,10 @@ module User::HasSettings
|
|||
settings['web.show_relationships']
|
||||
end
|
||||
|
||||
def setting_show_avatar_on_filter
|
||||
settings['web.show_avatar_on_filter']
|
||||
end
|
||||
|
||||
def setting_allow_quote
|
||||
settings['allow_quote']
|
||||
end
|
||||
|
|
|
@ -38,7 +38,7 @@ class CustomFilter < ApplicationRecord
|
|||
include Expireable
|
||||
include Redisable
|
||||
|
||||
enum :action, { warn: 0, hide: 1, half_warn: 2 }, suffix: :action
|
||||
enum :action, { warn: 0, hide: 1 }, suffix: :action
|
||||
|
||||
belongs_to :account
|
||||
has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
|
||||
|
|
|
@ -83,6 +83,7 @@ class UserSettings
|
|||
setting :hide_status_reference_unavailable_server, default: false
|
||||
setting :hide_favourite_menu, default: false
|
||||
setting :hide_emoji_reaction_count, default: false
|
||||
setting :show_avatar_on_filter, default: true
|
||||
|
||||
setting_inverse_alias :'web.show_blocking_quote', :'web.hide_blocking_quote'
|
||||
setting_inverse_alias :'web.show_emoji_reaction_count', :'web.hide_emoji_reaction_count'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue