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

Add: スタンプにブロック・アカウントドメインブロックを反映 (#256)

Browse source 
* Add: スタンプにブロック・アカウントドメインブロックを反映

* Fix: 条件
This commit is contained in:
KMY（雪あすか） 2023-11-08 13:32:14 +09:00 • committed by GitHub
parent cea042e7c9
commit a7dec3c59b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
write_stream(reaction)
NotifyService.new.call(@original_status.account, :emoji_reaction, reaction) if @original_status.account.local?
rescue Seahorse::Client::NetworkingError
rescue Seahorse::Client::NetworkingError, ActiveRecord::RecordInvalid
nil
end

13
app/validators/emoji_reaction_validator.rb
View file

@ -9,6 +9,7 @@ class EmojiReactionValidator < ActiveModel::Validator
emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.blank? && !unicode_emoji?(emoji_reaction.name)
emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.present? && disabled_custom_emoji?(emoji_reaction.custom_emoji)
emoji_reaction.errors.add(:name, I18n.t('reactions.errors.banned')) if deny_emoji_reactions?(emoji_reaction)
emoji_reaction.errors.add(:name, I18n.t('reactions.errors.banned')) if blocking?(emoji_reaction) || domain_blocking?(emoji_reaction)
end
private
@ -24,4 +25,16 @@ class EmojiReactionValidator < ActiveModel::Validator
def deny_emoji_reactions?(emoji_reaction)
!emoji_reaction.status.account.allow_emoji_reaction?(emoji_reaction.account)
end
def blocking?(emoji_reaction)
return false if !emoji_reaction.status.local? || emoji_reaction.status.account == emoji_reaction.account
emoji_reaction.status.account.blocking?(emoji_reaction.account)
end
def domain_blocking?(emoji_reaction)
return false unless !emoji_reaction.account.local? && emoji_reaction.status.local?
emoji_reaction.status.account.domain_blocking?(emoji_reaction.account.domain)
end
end