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

Change: #326 ドメインブロックで「制限」を行っているサーバーからのスタンプは、ローカルフォロワーの投稿に対するもののみ受け入れる (#328)

Browse source
This commit is contained in:
KMY（雪あすか） 2023-12-04 12:59:46 +09:00 • committed by GitHub
parent 780426db31
commit c73b173f09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 108 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/lib/activitypub/activity/like.rb
View file

@ -34,6 +34,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
def process_emoji_reaction
return if !@original_status.account.local? && !Setting.receive_other_servers_emoji_reaction
return if silence_domain? && (!@original_status.local? || !@original_status.account.following?(@account))
# custom emoji
emoji = nil
@ -125,13 +126,20 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
end
def skip_download?(domain)
DomainBlock.reject_media?(domain)
return true if DomainBlock.reject_media?(domain)
return false if @account.domain == domain
DomainBlock.blocked?(domain) || (DomainBlock.silence?(domain) && !@original_status.account.following?(@account))
end
def block_domain?
DomainBlock.blocked?(@account.domain)
end
def silence_domain?
DomainBlock.silence?(@account.domain)
end
def misskey_favourite?
misskey_shortcode = @json['_misskey_reaction']&.delete(':')