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

Add: #545 NGワード指定で実際に除外された投稿のログ (#561)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-02-16 17:52:59 +09:00 • committed by GitHub
parent 0ca2a73fd2
commit 7421c89431
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 262 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,8 @@ class ActivityPub::ProcessAccountService < BaseService
def valid_account?
display_name = @json['name'] || ''
note = @json['summary'] || ''
!Admin::NgWord.reject?(display_name) && !Admin::NgWord.reject?(note)
!Admin::NgWord.reject?(display_name, uri: @uri, target_type: :account_name) &&
!Admin::NgWord.reject?(note, uri: @uri, target_type: :account_note)
end
def set_fetchable_key!

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

@ -161,11 +161,11 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
end
def valid_status?
!Admin::NgWord.reject?("#{@status_parser.spoiler_text}\n#{@status_parser.text}") && !Admin::NgWord.hashtag_reject?(@raw_tags.size)
!Admin::NgWord.reject?("#{@status_parser.spoiler_text}\n#{@status_parser.text}", uri: @status.uri, target_type: :status) && !Admin::NgWord.hashtag_reject?(@raw_tags.size)
end
def validate_status_mentions!
raise AbortError if mention_to_stranger? && Admin::NgWord.stranger_mention_reject?("#{@status.spoiler_text}\n#{@status.text}")
raise AbortError if mention_to_stranger? && Admin::NgWord.stranger_mention_reject?("#{@status.spoiler_text}\n#{@status.text}", uri: @status.uri, target_type: :status)
end
def mention_to_stranger?