Connect emoji_reaction block settings and show settings
This commit is contained in:
parent
4863ac50a0
commit
58137b227c
5 changed files with 36 additions and 32 deletions
|
@ -350,7 +350,7 @@ class Status < ApplicationRecord
|
|||
end
|
||||
|
||||
def emoji_reactions_grouped_by_name(account = nil)
|
||||
return [] if self.account.emoji_reaction_policy == :block_and_hide
|
||||
return [] if account.present? && !self.account.show_emoji_reaction?(account)
|
||||
|
||||
(Oj.load(status_stat&.emoji_reactions || '', mode: :strict) || []).tap do |emoji_reactions|
|
||||
if account.present?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue