mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 07:53:41 +01:00
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:
parent
7f571db254
commit
4252c6fe1e
2 changed files with 2 additions and 2 deletions
|
@ -27,6 +27,6 @@ class StatusReaction < ApplicationRecord
|
|||
private
|
||||
|
||||
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
|
||||
|
|
|
@ -25,7 +25,7 @@ module Mastodon
|
|||
end
|
||||
|
||||
def suffix_version
|
||||
'+1.1.2'
|
||||
'+1.1.3'
|
||||
end
|
||||
|
||||
def to_a
|
||||
|
|
Loading…
Reference in a new issue