From 293972f716476933df2b665ad755cafe4d29d82d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 23 Sep 2017 01:57:23 +0200
Subject: New API: GET /api/v1/custom_emojis to get a server's custom emojis
 (#5051)

---
 app/controllers/admin/custom_emojis_controller.rb  | 2 +-
 app/controllers/api/v1/custom_emojis_controller.rb | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/api/v1/custom_emojis_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
index 572ad1ac2..d70514d9a 100644
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@@ -3,7 +3,7 @@
 module Admin
   class CustomEmojisController < BaseController
     def index
-      @custom_emojis = CustomEmoji.where(domain: nil)
+      @custom_emojis = CustomEmoji.local
     end
 
     def new
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
new file mode 100644
index 000000000..4dd77fb55
--- /dev/null
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Api::V1::CustomEmojisController < Api::BaseController
+  respond_to :json
+
+  def index
+    render json: CustomEmoji.local, each_serializer: REST::CustomEmojiSerializer
+  end
+end
-- 
cgit