Fix: 投稿編集時にハッシュタグ拒否のドメインブロックが動作しない問題 (#519)

This commit is contained in:
KMY(雪あすか) 2024-02-05 09:07:51 +09:00 committed by GitHub
parent a686391169
commit 64a149b338
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 38 additions and 1 deletions

View file

@ -193,7 +193,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
as_array(@json['tag']).each do |tag|
if equals_or_includes?(tag['type'], 'Hashtag')
@raw_tags << tag['name'] if tag['name'].present?
@raw_tags << tag['name'] if !ignore_hashtags? && tag['name'].present?
elsif equals_or_includes?(tag['type'], 'Mention')
@raw_mentions << tag['href'] if tag['href'].present?
elsif equals_or_includes?(tag['type'], 'Emoji')
@ -298,6 +298,12 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
@skip_download ||= DomainBlock.reject_media?(@account.domain)
end
def ignore_hashtags?
return @ignore_hashtags if defined?(@ignore_hashtags)
@ignore_hashtags ||= DomainBlock.reject_hashtag?(@account.domain)
end
def unsupported_media_type?(mime_type)
mime_type.present? && !MediaAttachment.supported_mime_types.include?(mime_type)
end