Merge commit '77c6121503' into kb_migration

This commit is contained in:
KMY 2023-06-13 18:27:48 +09:00
commit f17a9211e5
3 changed files with 7 additions and 1 deletions

View file

@ -388,7 +388,7 @@ class Status < ApplicationRecord
return searchability if account.local? && !searchability.nil?
return 'direct' if account.local? || [:public, :private, :direct, :limited].exclude?(account.searchability.to_sym)
Status.searchabilities[[Account.searchabilities[account.searchability] || 0, Status.searchabilities[searchability || 'direct'] || 0].max] || 'direct'
Status.searchabilities[[Account.searchabilities[account.searchability] || 3, Status.searchabilities[searchability.nil? ? 'direct' : searchability] || 3].max] || 'direct'
end
def compute_searchability_activitypub

View file

@ -11,6 +11,7 @@ class EmojiReactService < BaseService
# @param [string] name
# @return [Favourite]
def call(account, status, name)
status = status.reblog if status.reblog? && !status.reblog.nil?
authorize_with account, status, :emoji_reaction?
emoji_reaction = EmojiReaction.find_by(account: account, status: status, name: name)

View file

@ -7,6 +7,7 @@ class EmojiReactionValidator < ActiveModel::Validator
return if emoji_reaction.name.blank?
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)
end
private
@ -14,4 +15,8 @@ class EmojiReactionValidator < ActiveModel::Validator
def unicode_emoji?(name)
SUPPORTED_EMOJIS.include?(name)
end
def disabled_custom_emoji?(custom_emoji)
custom_emoji.nil? ? false : custom_emoji.disabled
end
end