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

Add: #43 フォローしていないアカウントからのリプライのNGワード (#148)

Browse source 
* Add: フォローしていないアカウントからのリプライのNGワード

* Test: ハッシュタグ使用量
This commit is contained in:
KMY（雪あすか） 2023-10-19 12:12:00 +09:00 • committed by GitHub
parent da662d2f84
commit 3a2030dfc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 223 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return nil unless valid_status?
return nil if (reply_to_local? || reply_to_local_account? || reply_to_local_from_tags?) && reject_reply_to_local?
return nil if (!reply_to_local_account_following? || !reply_to_local_status_following? || !reply_to_local_from_tags_following?) && reject_reply_exclude_followers?
return nil if mention_to_local_but_not_followed? && reject_reply_exclude_followers?
ApplicationRecord.transaction do
@status = Status.create!(@params)
@ -139,7 +139,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
def valid_status?
!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]}") && !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
end
def accounts_in_audience
@ -418,11 +422,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
def reply_to_local_from_tags?
(@mentions.present? && @mentions.any? { |m| m.account.local? })
@mentions.present? && @mentions.any? { |m| m.account.local? }
end
def reply_to_local_from_tags_following?
(@mentions.present? && @mentions.none? { |m| m.account.local? && !m.account.following?(@account) })
@mentions.nil? || @mentions.none? { |m| m.account.local? && !m.account.following?(@account) }
end
def reply_to_local?
@ -433,6 +437,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
!reply_to_local? || replied_to_status.account.following?(@account)
end
def mention_to_local_but_not_followed?
!reply_to_local_account_following? || !reply_to_local_status_following? || !reply_to_local_from_tags_following?
end
def reject_reply_to_local?
@reject_reply_to_local ||= DomainBlock.reject_reply?(@account.domain)
end