From 09a94b575e90dc7f6e179a1ec717156e725f915a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 19 Sep 2017 03:52:38 +0200
Subject: Admin interface for listing, adding and removing custom emojis
 (#5002)

* Admin interface for listing, adding and removing custom emojis

* Only display local ones in the list
---
 app/controllers/admin/custom_emojis_controller.rb | 34 +++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 app/controllers/admin/custom_emojis_controller.rb

(limited to 'app/controllers/admin/custom_emojis_controller.rb')

diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
new file mode 100644
index 000000000..616a279b3
--- /dev/null
+++ b/app/controllers/admin/custom_emojis_controller.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Admin
+  class CustomEmojisController < BaseController
+    def index
+      @custom_emojis = CustomEmoji.where(uri: nil)
+    end
+
+    def new
+      @custom_emoji = CustomEmoji.new
+    end
+
+    def create
+      @custom_emoji = CustomEmoji.new(resource_params)
+
+      if @custom_emoji.save
+        redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.created_msg')
+      else
+        render :new
+      end
+    end
+
+    def destroy
+      CustomEmoji.find(params[:id]).destroy
+      redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.destroyed_msg')
+    end
+
+    private
+
+    def resource_params
+      params.require(:custom_emoji).permit(:shortcode, :image)
+    end
+  end
+end
-- 
cgit 


From 1664e52cbb5ec08db896127640bd0554cee1d384 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 19 Sep 2017 12:06:13 +0900
Subject: Fix custom emojis index (#5006)

---
 app/controllers/admin/custom_emojis_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/admin/custom_emojis_controller.rb')

diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
index 616a279b3..572ad1ac2 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(uri: nil)
+      @custom_emojis = CustomEmoji.where(domain: nil)
     end
 
     def new
-- 
cgit