Merge commit '563fc88821' into kb_migration

This commit is contained in:
KMY 2023-07-25 15:02:53 +09:00
commit 5233e68f13
20 changed files with 183 additions and 22 deletions

View file

@ -88,6 +88,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
process_tags
process_audience
return unless valid_status?
ApplicationRecord.transaction do
@status = Status.create!(@params)
attach_tags(@status)
@ -139,6 +141,10 @@ 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)
end
def reply_to_local_account?
accounts_in_audience.any?(&:local?)
end