diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 1a3ffceccd..5e75096716 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -42,7 +42,7 @@ class NotificationMailer < ApplicationMailer end def reaction - return unless @user.functional? && @status.present? + return if @status.blank? locale_for_account(@me) do mail subject: default_i18n_subject(name: @account.acct) diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index b5b2d043f4..b7489c5e8a 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -131,6 +131,7 @@ class InitialStateSerializer < ActiveModel::Serializer trends_as_landing_page: Setting.trends_as_landing_page, trends_enabled: Setting.trends, version: instance_presenter.version, + visible_reactions: Setting.visible_reactions, } end