A platform for community discussion. Free, open, simple.
FIX: Restore custom emoji endpoint (#42460)
Sam8cf0e3665552
diff --git a/lib/application_layout_preloader.rb b/lib/application_layout_preloader.rbindex 51d7a2b2a98..1a79d1c06aa 100644--- a/lib/application_layout_preloader.rb+++ b/lib/application_layout_preloader.rb@@ -70,6 +70,11 @@ class ApplicationLayoutPreloaderMultiJson.dump(data)end+ def custom_emoji+ serializer = ActiveModel::ArraySerializer.new(Emoji.custom, each_serializer: EmojiSerializer)+ MultiJson.dump(serializer)+ end+privatedef preload_current_user_data@@ -159,9 +164,4 @@ class ApplicationLayoutPreloaderendendend-- def custom_emoji- serializer = ActiveModel::ArraySerializer.new(Emoji.custom, each_serializer: EmojiSerializer)- MultiJson.dump(serializer)- endenddiff --git a/spec/requests/site_controller_spec.rb b/spec/requests/site_controller_spec.rbindex 365bf560854..184074981de 100644--- a/spec/requests/site_controller_spec.rb+++ b/spec/requests/site_controller_spec.rb@@ -153,6 +153,19 @@ RSpec.describe SiteController doendend+ describe "#emoji" do+ fab!(:custom_emoji)++ it "returns the custom emoji" do+ get "/site/emoji.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body).to contain_exactly(+ a_hash_including("name" => custom_emoji.name, "url" => custom_emoji.upload.url),+ )+ end+ end+describe "#statistics" doafter { DiscoursePluginRegistry.reset! }