Add: カスタム絵文字の専用編集画面／Fix: リモートの絵文字をローカルにコピー時、ライセンス情報が消失する問題 (#133)

* Add: カスタム絵文字の専用編集画面

* 新規作成画面に項目追加、編集画面に画像表示、旧テキストボックス削除

* Fix: カスタム絵文字のコピー処理で、コピーされていないプロパティがあった

app/controllers/admin/custom_emojis_controller.rb

@@ -2,6 +2,8 @@
 
 module Admin
   class CustomEmojisController < BaseController
+    before_action :set_custom_emoji, only: [:edit, :update]
+
     def index
       authorize :custom_emoji, :index?
 
@@ -15,6 +17,10 @@ module Admin
       @custom_emoji = CustomEmoji.new
     end
 
+    def edit
+      authorize :custom_emoji, :create?
+    end
+
     def create
       authorize :custom_emoji, :create?
 
@@ -28,6 +34,19 @@ module Admin
       end
     end
 
+    def update
+      authorize :custom_emoji, :create?
+
+      @custom_emoji.assign_attributes(update_params)
+
+      if @custom_emoji.save
+        log_action :create, @custom_emoji
+        redirect_to admin_custom_emojis_path(filter_params), notice: I18n.t('admin.custom_emojis.updated_msg')
+      else
+        render :new
+      end
+    end
+
     def batch
       authorize :custom_emoji, :index?
 
@@ -43,8 +62,16 @@ module Admin
 
     private
 
+    def set_custom_emoji
+      @custom_emoji = CustomEmoji.find(params[:id])
+    end
+
     def resource_params
-      params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker)
+      params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker, :aliases_raw, :license)
+    end
+
+    def update_params
+      params.require(:custom_emoji).permit(:visible_in_picker, :aliases_raw, :license)
     end
 
     def filtered_custom_emojis
@@ -74,7 +101,7 @@ module Admin
     end
 
     def form_custom_emoji_batch_params
-      params.require(:form_custom_emoji_batch).permit(:action, :category_id, :category_name, :aliases_raw, custom_emoji_ids: [])
+      params.require(:form_custom_emoji_batch).permit(:action, :category_id, :category_name, custom_emoji_ids: [])
     end
   end
 end

app/models/custom_emoji.rb

@@ -70,7 +70,13 @@ class CustomEmoji < ApplicationRecord
   end
 
   def copy!
-    copy = self.class.find_or_initialize_by(domain: nil, shortcode: shortcode)
+    copy = self.class.find_or_initialize_by(
+      domain: nil,
+      shortcode: shortcode,
+      license: license,
+      aliases: aliases,
+      is_sensitive: is_sensitive
+    )
     copy.image = image
     copy.tap(&:save!)
   end

app/models/form/custom_emoji_batch.rb

@@ -6,7 +6,7 @@ class Form::CustomEmojiBatch
   include AccountableConcern
 
   attr_accessor :custom_emoji_ids, :action, :current_account,
-                :category_id, :category_name, :aliases_raw, :visible_in_picker
+                :category_id, :category_name, :visible_in_picker
 
   def save
     case action
@@ -43,8 +43,7 @@ class Form::CustomEmojiBatch
                end
 
     custom_emojis.each do |custom_emoji|
-      new_aliases_raw = (aliases_raw.presence || custom_emoji.aliases_raw)
-      custom_emoji.update(category_id: category&.id, aliases_raw: new_aliases_raw)
+      custom_emoji.update(category_id: category&.id)
       log_action :update, custom_emoji
     end
   end

app/views/admin/custom_emojis/_custom_emoji.html.haml

@@ -7,11 +7,16 @@
 
     .batch-table__row__content__text
       %samp= ":#{custom_emoji.shortcode}:"
+      = link_to safe_join([fa_icon('pencil'), t('admin.custom_emojis.edit.label')]), edit_admin_custom_emoji_path(custom_emoji, local: params[:local], remote: params[:remote], shortcode: params[:shortcode], by_domain: params[:by_domain]), method: :get, class: 'table-action-link'
 
       - if custom_emoji.local?
         %span.information-badge= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized')
+      - if custom_emoji.aliases_raw.present?
         %br/
-        %span= custom_emoji.aliases_raw
+        %span.neutral-hint= custom_emoji.aliases_raw
+      - if custom_emoji.license.present?
+        %br/
+        %span= custom_emoji.license
 
     .batch-table__row__content__extra
       - if custom_emoji.local?

app/views/admin/custom_emojis/edit.html.haml

@@ -0,0 +1,42 @@
+- content_for :page_title do
+  = t('.title')
+
+= simple_form_for @custom_emoji, url: admin_custom_emoji_path(@custom_emoji.id), method: :put do |f|
+  = render 'shared/error_messages', object: @custom_emoji
+  - CustomEmojiFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
+
+  .fields-group
+    = custom_emoji_tag(@custom_emoji)
+
+  %h4= t('admin.custom_emojis.shortcode')
+
+  .fields-group
+    %samp= @custom_emoji.shortcode
+
+  - if !@custom_emoji.local?
+    %h4= t('admin.custom_emojis.domain')
+
+    .fields-group
+      %samp= @custom_emoji.domain
+
+  - if @custom_emoji.local?
+    %h4= t('admin.custom_emojis.edit.label')
+
+    .fields-group
+      = f.input :visible_in_picker, as: :boolean, wrapper: :with_label, label: t('admin.custom_emojis.visible_in_picker')
+
+    .fields-group
+      = f.input :aliases_raw, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.aliases'), hint: t('admin.custom_emojis.aliases_hint')
+
+    .fields-group
+      = f.input :license, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.license'), hint: t('admin.custom_emojis.license_hint')
+
+    .actions
+      = f.button :button, t('generic.save_changes'), type: :submit
+
+  - elsif @custom_emoji.license.present?
+    %h4= t('admin.custom_emojis.license')
+
+    .fields-group
+      %p= @custom_emoji.license

app/views/admin/custom_emojis/index.html.haml

@@ -75,12 +75,6 @@
               .label_input
                 = f.text_field :category_name, class: 'string optional', placeholder: t('admin.custom_emojis.create_new_category'), 'aria-label': t('admin.custom_emojis.create_new_category')
 
-        .fields-row
-          .fields-group.fields-row__column
-            .input.string.optional
-              .label_input
-                = f.text_field :aliases_raw, class: 'string optional', placeholder: 'Alias names', 'aria-label': 'Alias names'
-
     .batch-table__body
       - if @custom_emojis.empty?
         = nothing_here 'nothing-here--under-tabs'

app/views/admin/custom_emojis/new.html.haml

@@ -6,8 +6,18 @@
 
   .fields-group
     = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
+
   .fields-group
     = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(' ') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
 
+  .fields-group
+    = f.input :visible_in_picker, as: :boolean, wrapper: :with_label, label: t('admin.custom_emojis.visible_in_picker')
+
+  .fields-group
+    = f.input :aliases_raw, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.aliases'), hint: t('admin.custom_emojis.aliases_hint')
+
+  .fields-group
+    = f.input :license, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.license'), hint: t('admin.custom_emojis.license_hint')
+
   .actions
     = f.button :button, t('admin.custom_emojis.upload'), type: :submit