Revert "Redo StatusReaction set_custom_emoji to be similar to AnnouncementReaction"

This reverts commit b8774d3b5d, to address a regression when trying to react with non-local custom emoji.
This commit is contained in:
Jeremy Kescher 2023-05-11 12:39:24 +02:00
parent 7f571db254
commit 4252c6fe1e
No known key found for this signature in database
GPG key ID: 80A419A7A613DFA4
2 changed files with 2 additions and 2 deletions

View file

@ -27,6 +27,6 @@ class StatusReaction < ApplicationRecord
private private
def set_custom_emoji def set_custom_emoji
self.custom_emoji = CustomEmoji.find_by(disabled: false, shortcode: name, domain: account.domain) if name.present? self.custom_emoji = CustomEmoji.find_by(shortcode: name, domain: account.domain) if name.blank?
end end
end end

View file

@ -25,7 +25,7 @@ module Mastodon
end end
def suffix_version def suffix_version
'+1.1.2' '+1.1.3'
end end
def to_a def to_a