gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix lint

Browse source
This commit is contained in:
KMY 2023-12-06 13:11:38 +09:00
parent 0199608b87
commit 210b23cfc7
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/parser/custom_emoji_parser.rb
View file

@ -30,7 +30,7 @@ class ActivityPub::Parser::CustomEmojiParser
end end
def is_sensitive # rubocop:disable Naming/PredicateName def is_sensitive # rubocop:disable Naming/PredicateName
(@json['isSensitive'].presence || false) @json['isSensitive'].presence || false
end end
def license def license

2
app/models/admin/sensitive_word.rb
View file

@ -3,7 +3,7 @@
class Admin::SensitiveWord class Admin::SensitiveWord
class << self class << self
def sensitive?(text, spoiler_text) def sensitive?(text, spoiler_text)
exposure_text = (spoiler_text.presence || text) exposure_text = spoiler_text.presence || text
(spoiler_text.blank? && sensitive_words.any? { |word| include?(text, word) }) || (spoiler_text.blank? && sensitive_words.any? { |word| include?(text, word) }) ||
sensitive_words_for_full.any? { |word| include?(exposure_text, word) } sensitive_words_for_full.any? { |word| include?(exposure_text, word) }
end end

4
app/services/activitypub/process_account_service.rb
View file

@ -82,7 +82,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.suspended_at = domain_block.created_at if auto_suspend? @account.suspended_at = domain_block.created_at if auto_suspend?
@account.suspension_origin = :local if auto_suspend? @account.suspension_origin = :local if auto_suspend?
@account.silenced_at = domain_block.created_at if auto_silence? @account.silenced_at = domain_block.created_at if auto_silence?
@account.searchability = :direct # not null @account.searchability = :direct # not null
set_immediate_protocol_attributes! set_immediate_protocol_attributes!
@ -448,7 +448,7 @@ class ActivityPub::ProcessAccountService < BaseService
shortcode = tag['name'].delete(':') shortcode = tag['name'].delete(':')
image_url = tag['icon']['url'] image_url = tag['icon']['url']
uri = tag['id'] uri = tag['id']
sensitive = (tag['isSensitive'].presence || false) sensitive = tag['isSensitive'].presence || false
license = tag['license'] license = tag['license']
updated = tag['updated'] updated = tag['updated']
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain) emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)

2
app/views/filters/_filter_fields.html.haml
View file

@ -10,7 +10,7 @@
%hr.spacer/ %hr.spacer/
.fields-group .fields-group
= f.input :filter_action, as: :radio_buttons, collection: %i(warn hide), include_blank: false, wrapper: :with_block_label, label_method: ->(action) { filter_action_label(action) }, hint: t('simple_form.hints.filters.action'), required: true = f.input :filter_action, as: :radio_buttons, collection: %i(half_warn warn hide), include_blank: false, wrapper: :with_block_label, label_method: ->(action) { filter_action_label(action) }, hint: t('simple_form.hints.filters.action'), required: true
.fields-group .fields-group
= f.input :exclude_follows, wrapper: :with_label, kmyblue: true, label: t('simple_form.labels.filters.options.exclude_follows') = f.input :exclude_follows, wrapper: :with_label, kmyblue: true, label: t('simple_form.labels.filters.options.exclude_follows')