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

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

4
app/lib/activitypub/activity/create.rb
View file

@ -143,9 +143,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
def valid_status?
valid = !Admin::NgWord.reject?("#{@params[:spoiler_text]}\n#{@params[:text]}") && !Admin::NgWord.hashtag_reject?(@tags.size)
valid = !Admin::NgWord.reject?("#{@params[:spoiler_text]}\n#{@params[:text]}", uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?) && !Admin::NgWord.hashtag_reject?(@tags.size)
valid = !Admin::NgWord.stranger_mention_reject?("#{@params[:spoiler_text]}\n#{@params[:text]}") if valid && mention_to_local_but_not_followed?
valid = !Admin::NgWord.stranger_mention_reject?("#{@params[:spoiler_text]}\n#{@params[:text]}", uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?) if valid && mention_to_local_but_not_followed?
valid
end

4
app/lib/activitypub/parser/status_parser.rb
View file

@ -92,6 +92,10 @@ class ActivityPub::Parser::StatusParser
end
end
def distributable_visibility?
%i(public public_unlisted unlisted login).include?(visibility)
end
def searchability
from_audience = searchability_from_audience
return from_audience if from_audience