diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
index 5d9144be7b27caab2ac2d9f3cf2e14b32fc26111..cbd7abe958b39a62e65cdd394378ec0251280c63 100644
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@@ -22,6 +22,14 @@ module Admin
end
end
+ def update
+ if @custom_emoji.update(resource_params)
+ redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.updated_msg')
+ else
+ redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.update_failed_msg')
+ end
+ end
+
def destroy
@custom_emoji.destroy
redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.destroyed_msg')
@@ -56,7 +64,7 @@ module Admin
end
def resource_params
- params.require(:custom_emoji).permit(:shortcode, :image)
+ params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker)
end
def filtered_custom_emojis
diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index 71944128cd7e2320ea09e4d4c0de867423cd7462..699687c698cd3441ebe33350e19724d8673d10b2 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -46,7 +46,7 @@ const getFrequentlyUsedEmojis = createSelector([
const getCustomEmojis = createSelector([
state => state.get('custom_emojis'),
-], emojis => emojis.sort((a, b) => {
+], emojis => emojis.filter(e => e.get('visible_in_picker')).sort((a, b) => {
const aShort = a.get('shortcode').toLowerCase();
const bShort = b.get('shortcode').toLowerCase();
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 65d9840d567f84a901317937d8163a7bdd413061..28b6a2b0bcec1b4bb9ecbe1fdef35ca980b010e3 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -15,6 +15,7 @@
# disabled :boolean default(FALSE), not null
# uri :string
# image_remote_url :string
+# visible_in_picker :boolean default(TRUE), not null
#
class CustomEmoji < ApplicationRecord
diff --git a/app/serializers/rest/custom_emoji_serializer.rb b/app/serializers/rest/custom_emoji_serializer.rb
index b958e6a5db03ff32bc167b9c4f7bdd8f01c2aa43..65686a86668d2fc450a73bf4fe9bacdfd325dcc6 100644
--- a/app/serializers/rest/custom_emoji_serializer.rb
+++ b/app/serializers/rest/custom_emoji_serializer.rb
@@ -3,7 +3,7 @@
class REST::CustomEmojiSerializer < ActiveModel::Serializer
include RoutingHelper
- attributes :shortcode, :url, :static_url
+ attributes :shortcode, :url, :static_url, :visible_in_picker
def url
full_asset_url(object.image.url)
diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml
index 1fa64908c02484c7f884ef30986c8d0254896b4b..399d13bbd60fa72a04f732723b655995dce5bad2 100644
--- a/app/views/admin/custom_emojis/_custom_emoji.html.haml
+++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml
@@ -9,7 +9,12 @@
- else
= custom_emoji.domain
%td
- - unless custom_emoji.local?
+ - if custom_emoji.local?
+ - if custom_emoji.visible_in_picker
+ = table_link_to 'eye', t('admin.custom_emojis.listed'), admin_custom_emoji_path(custom_emoji, custom_emoji: { visible_in_picker: false }), method: :patch
+ - else
+ = table_link_to 'eye-slash', t('admin.custom_emojis.unlisted'), admin_custom_emoji_path(custom_emoji, custom_emoji: { visible_in_picker: true }), method: :patch
+ - else
= table_link_to 'copy', t('admin.custom_emojis.copy'), copy_admin_custom_emoji_path(custom_emoji, page: params[:page]), method: :post
%td
- if custom_emoji.disabled?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 45929e97dd7423e7e99e76300d48b3905aedc8eb..2d821550af2d5971e8af65544b210519d52c6156 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,11 +130,15 @@ en:
enable: Enable
enabled_msg: Successfully enabled that emoji
image_hint: PNG up to 50KB
+ listed: Listed
new:
title: Add new custom emoji
shortcode: Shortcode
shortcode_hint: At least 2 characters, only alphanumeric characters and underscores
title: Custom emojis
+ unlisted: Unlisted
+ update_failed_msg: Could not update that emoji
+ updated_msg: Emoji successfully updated!
upload: Upload
domain_blocks:
add_new: Add new
diff --git a/config/routes.rb b/config/routes.rb
index 5a6351f7795a5aaf00b04719c23aab0af8e39681..bdfcdaff6984d9035b2d7faf326b7bbea429017d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -140,7 +140,7 @@ Rails.application.routes.draw do
resource :two_factor_authentication, only: [:destroy]
end
- resources :custom_emojis, only: [:index, :new, :create, :destroy] do
+ resources :custom_emojis, only: [:index, :new, :create, :update, :destroy] do
member do
post :copy
post :enable
diff --git a/db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb b/db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb
new file mode 100644
index 0000000000000000000000000000000000000000..60a28710159624866c98d12b341a22c85e22ddd6
--- /dev/null
+++ b/db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb
@@ -0,0 +1,7 @@
+class AddVisibleInPickerToCustomEmoji < ActiveRecord::Migration[5.1]
+ def change
+ safety_assured {
+ add_column :custom_emojis, :visible_in_picker, :boolean, default: true, null: false
+ }
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f9722ccda0f958655708d3acb8295e46222587a5..697a7f374bad69feca30b34b0c5f4e02e81f89aa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20171010025614) do
+ActiveRecord::Schema.define(version: 20171020084748) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -111,6 +111,7 @@ ActiveRecord::Schema.define(version: 20171010025614) do
t.boolean "disabled", default: false, null: false
t.string "uri"
t.string "image_remote_url"
+ t.boolean "visible_in_picker", default: true, null: false
t.index ["shortcode", "domain"], name: "index_custom_emojis_on_shortcode_and_domain", unique: true
end