post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add block emoji_reaction settings

Browse source
This commit is contained in:
KMY 2023-07-20 18:24:14 +09:00
parent ccfa297d7b
commit a783f195f4
10 changed files with 86 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/services/notify_service.rb
View file

@ -51,6 +51,18 @@ class NotifyService < BaseService
@recipient.user.settings['interactions.must_be_following'] && !following_sender?
end
def optional_non_follower_emoji_reaction?
emoji_reaction? && @recipient.user.settings['emoji_reactions.must_be_follower'] && !@notification.from_account.following?(@recipient)
end
def optional_non_following_emoji_reaction?
emoji_reaction? && @recipient.user.settings['emoji_reactions.must_be_following'] && !following_sender?
end
def emoji_reaction?
@notification.type == :emoji_reaction
end
def message?
@notification.type == :mention
end
@ -120,6 +132,8 @@ class NotifyService < BaseService
blocked ||= optional_non_follower?
blocked ||= optional_non_following?
blocked ||= optional_non_following_and_direct?
blocked ||= optional_non_follower_emoji_reaction?
blocked ||= optional_non_following_emoji_reaction?
blocked ||= conversation_muted?
blocked ||= blocked_mention? if @notification.type == :mention
blocked