From 4252c6fe1e06e6af994936b86f2dc5ea79cca126 Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Thu, 11 May 2023 12:39:24 +0200 Subject: [PATCH] Revert "Redo StatusReaction set_custom_emoji to be similar to AnnouncementReaction" This reverts commit b8774d3b5d91ede7d49aa7f54347a758e0df8f5c, to address a regression when trying to react with non-local custom emoji. --- app/models/status_reaction.rb | 2 +- lib/mastodon/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/status_reaction.rb b/app/models/status_reaction.rb index 9597423772..a54d03a309 100644 --- a/app/models/status_reaction.rb +++ b/app/models/status_reaction.rb @@ -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 diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 9cd7cd0af1..688afde716 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -25,7 +25,7 @@ module Mastodon end def suffix_version - '+1.1.2' + '+1.1.3' end def to_a